Skip to content

GitLab

Commit fc5657f6 authored by Petr Špaček's avatar Petr Špaček
Browse files

Merge branch 'kskroll-sentinel' into 'master' 

Test draft-ietf-dnsop-kskroll-sentinel-00#section-2

See merge request !97
parents 387e8845 297d8e06
Pipeline #32103 failed with stage
in 1 minute
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 35 deletions
.gitlab-ci.yml
View file @ fc5657f6
image: cznic/ci-debian-kresd
image: $CI_REGISTRY/knot/knot-resolver/ci:debian-stable
variables:
LC_ALL: C.UTF-8
......
doc/scenario_guide.rst
View file @ fc5657f6
......@@ -416,6 +416,7 @@ Format is list of "key: value" pairs, one pair per line. There is no explicit st
config option default meaning
========================== ======= =====================================================================
do-not-query-localhost on on = queries cannot be sent to 127.0.0.1/8 or ::1/128 addresses
domain-insecure (none) domain name specifying DNS sub-tree with explicitly disabled DNSSEC validation
force-ipv6 off use a IPv6 address as ``stub-addr``
harden-glue on additional checks on glue addresses
query-minimization on RFC 7816 query algorithm enabled; default inherited from QMIN environment variable
......
doc/user_guide.rst
View file @ fc5657f6
......@@ -190,6 +190,7 @@ DNS specifics:
- ``HARDEN_GLUE`` [bool]_ - enables or disables additional checks on glue addresses
- ``QMIN`` [bool]_ - enables or disables query minimization respectively
- ``TRUST_ANCHORS`` - list of trust anchors in form of a DS records, see `scenario guide <doc/scenario_guide.rst>`_
- ``NEGATIVE_TRUST_ANCHORS`` - list of domain names with explicitly disabled DNSSEC validation
.. [bool] boolean expressed as string ``true``/``false``
......
pydnstest/scenario.py
View file @ fc5657f6
......@@ -935,6 +935,7 @@ def parse_config(scn_cfg, qmin, installdir):
sockfamily = 0 # auto-select value for socket.getaddrinfo
trust_anchor_list = []
trust_anchor_files = {}
negative_ta_list = []
stub_addr = None
override_timestamp = None
......@@ -946,9 +947,11 @@ def parse_config(scn_cfg, qmin, installdir):
# Enable selectively for some tests
if k == 'do-not-query-localhost':
do_not_query_localhost = str2bool(v)
if k == 'harden-glue':
elif k == 'domain-insecure':
negative_ta_list.append(v)
elif k == 'harden-glue':
harden_glue = str2bool(v)
if k == 'query-minimization':
elif k == 'query-minimization':
qmin = str2bool(v)
elif k == 'trust-anchor':
trust_anchor = v.strip('"\'')
......@@ -1000,9 +1003,12 @@ def parse_config(scn_cfg, qmin, installdir):
% (v, str(ex)))
elif k == 'force-ipv6' and v.upper() == 'TRUE':
sockfamily = socket.AF_INET6
else:
raise NotImplementedError('unsupported CONFIG key "%s"' % k)
ctx = {
"DO_NOT_QUERY_LOCALHOST": str(do_not_query_localhost).lower(),
"NEGATIVE_TRUST_ANCHORS": negative_ta_list,
"FEATURES": features,
"HARDEN_GLUE": str(harden_glue).lower(),
"INSTALL_DIR": installdir,
......
sets/resolver/iter_badraw.rpl
View file @ fc5657f6
name: "."
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_cname_badauth.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "3 2 1 0 0"
name: "."
; target-fetch-policy: "3 2 1 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_cname_cache.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_cname_double.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_cname_nx.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_cname_qnamecopy.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_cycle.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_cycle_noh.rpl
View file @ fc5657f6
; config options
harden-glue: "no"
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_domain_sale.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_domain_sale_nschange.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_donotq127.rpl
View file @ fc5657f6
; config options
name: "."
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_formerr.rpl
View file @ fc5657f6
; config options
harden-referral-path: no
target-fetch-policy: "0 0 0 0 0"
name: "."
; harden-referral-path: no
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_hint_lame.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
; minimization does not affect priming query
query-minimization: off
......
sets/resolver/iter_lame_aaaa.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
sets/resolver/iter_lame_noaa.rpl
View file @ fc5657f6
; config options
harden-referral-path: no
target-fetch-policy: "0 0 0 0 0"
name: "."
; harden-referral-path: no
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
; test with pre-scripted replies does not make sense with qmin
query-minimization: off
......
sets/resolver/iter_lame_nosoa.rpl
View file @ fc5657f6
; config options
target-fetch-policy: "0 0 0 0 0"
name: "."
; target-fetch-policy: "0 0 0 0 0"
; name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment