upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 09:49:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Dedup NSEC3 get_next_name function

Browse source 
(cherry picked from commit f9e12a840d)
This commit is contained in:
Petr Špaček 2025-05-07 16:58:08 +02:00
parent 3ae778a3f2
commit 8d7d1a76dc
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bin/tests/system/dnssec/tests_nsec3.py
View file

@ -11,13 +11,12 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
import base64
import os
from pathlib import Path
import pytest
pytest.importorskip("dns", minversion="2.0.0")
pytest.importorskip("dns", minversion="2.5.0")
from dns.dnssectypes import NSEC3Hash
import dns.dnssec
import dns.message
@ -104,23 +103,6 @@ def is_delegated(name, delegations):
return False
def get_next_name(rr: dns.rrset.RRset, origin: dns.name.Name) -> dns.name.Name:
"""
Get the domain name of the next NSEC3, given the NSEC3 record 'rr'.
This fetches the value of the Next Hashed Owner Name field, and
creates the domain name by concatenating the decoded hash and the
origin.
"""
# Conversion copied from dnspython.dnssec.nsec3_hash
b32_conversion = str.maketrans(
"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", "0123456789ABCDEFGHIJKLMNOPQRSTUV"
)
next_hashed = base64.b32encode(rr.next).decode("utf-8")
next_hashed = next_hashed.translate(b32_conversion)
next_name = dns.name.from_text(next_hashed, origin)
return next_name
def nsec3_covers(rrset: dns.rrset.RRset, hashed_name: dns.name.Name) -> bool:
"""
Test if 'hashed_name' is covered by an NSEC3 record in 'rrset'.
@ -128,7 +110,7 @@ def nsec3_covers(rrset: dns.rrset.RRset, hashed_name: dns.name.Name) -> bool:
prev_name = rrset.name
for nsec3 in rrset:
next_name = get_next_name(nsec3, SUFFIX)
next_name = nsec3.next_name(SUFFIX)
# Single name case.
if prev_name == next_name: