upstream/knot-dns
1
0
Fork 0
mirror of https://gitlab.nic.cz/knot/knot-dns.git synced 2026-02-03 18:49:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xxx

Browse source
This commit is contained in:
Libor Peltan 2024-08-22 14:24:48 +02:00
parent 60c5ed71b5
commit 30e087c4de
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests-extra/tests/dnssec/add_remove/data/example.zone
View file

@ -26,3 +26,5 @@ xx.example. 3600 IN AAAA 2001:db8::f00:baaa
x.w.example. 3600 IN MX 1 xx.example.
*.to-apex.example. 3600 IN CNAME example. ; Wildcard expansion leading to apex
*.to-nxdomain.example. 3600 IN CNAME nxdomain.example. ; Wildcard expansion leading to nonexistent name
non-apex 3600 IN DNSKEY 256 3 5 AwEAAbs0AlA6xWQn/lECfGt3S6TaeEmgJfEVVEMh06iNMNWMRHOfbqLF h3N52Ob7trmzlrzGlGLPnAZJvMB8lsFGC5CtaLUBD+4xCh5tl5QifZ+y o+MJvPGlVQI2cs7aMWV9CyFrRmuRcJaSZU2uBz9KFJ955UCq/WIy5KqS 7qaKLzzN
non-apex 3600 IN DNSKEY 257 3 5 BQEAAAABt3LenoCVTV0okqKYPDnnVJqvwCD9MKJNXg8fcOCdLQYncyoe hpwM5RK2UkZDcDxWkMo7yMa35ej+Mhpaji9si4xXD+Syl4Q06LFiFkdN /5GlVlrIdE3GW7zC7Z4sS14Vz8FbYfcRmhsh19Ob718jGZneGfw2UPbv kyxUR8wD7mguZn02fQ6tjj/Ktp4uSW9tpz3bjGMo2rX+iZk4xgbPaesA OlR/AaHdatGZsWC9CPon8mnLZeu6czm8CBDgBmnf3PE8c5+uyWj1Pw4p p0VQmnX5UrnuGpErg7qXhJm7wY2CRVRMcLX3zmjVWXW1uT9JFh2G+/pZ zxnASfKKltZpuw== ; added non-apex DNSKEYs

2
tests-extra/tests/dnssec/add_remove/test.py
View file

@ -40,7 +40,7 @@ def do_steps(master, slave, zone):
t = Test()
# Create NSEC and NSEC3 servers
nsec_master = t.server("knot")
nsec_master = t.server("bind")
nsec3_master = t.server("knot")
nsec_slave = t.server("bind")
nsec3_slave = t.server("bind")

7
tests-extra/tools/dnstest/server.py
View file

@ -1286,10 +1286,13 @@ class Knot(Server):
assert(0)
bind_keydir = self.zones[zone_name].zfile.key_dir_bind
assert(zone_name.endswith("."))
for pkey_path in glob.glob("%s/K*.private" % glob.escape(bind_keydir)):
for pkey_path in glob.glob("%s/K*.key" % glob.escape(bind_keydir)):
pkey = os.path.basename(pkey_path)
m = re.match(r'K(?P<name>[^+]+)\+(?P<algo>\d+)\+(?P<tag>\d+)\.private', pkey)
m = re.match(r'K(?P<name>[^+]+)\+(?P<algo>\d+)\+(?P<tag>\d+)\.key', pkey)
if m and m.group("name") == zone_name.lower():
print(pkey)
with open(pkey_path, 'r') as f:
print(f.read())
dnstest.keys.Keymgr.run_check(self.confile, zone_name, "import-bind", pkey_path)
def _on_str_hex(self, conf, name, value):