From 64fa90839cb881f814f9fbd75806b7e44bfd5b35 Mon Sep 17 00:00:00 2001 From: YX Hao Date: Fri, 19 Jan 2024 19:11:03 +0800 Subject: [PATCH] CI tests the unregistered domain for solid NS answer And formats. --- .ci/ci-test.sh | 12 ++++++------ .ci/cloaking-rules.txt | 10 +++++----- .ci/test3-dnscrypt-proxy.toml | 4 +--- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.ci/ci-test.sh b/.ci/ci-test.sh index 495ba74d..ba058ac3 100755 --- a/.ci/ci-test.sh +++ b/.ci/ci-test.sh @@ -66,11 +66,11 @@ t || dig -p${DNS_PORT} +dnssec darpa.mil @127.0.0.1 2>&1 | grep -Fvq 'RRSIG' || t || dig -p${DNS_PORT} +dnssec www.darpa.mil @127.0.0.1 2>&1 | grep -Fvq 'RRSIG' || fail section -t || dig -p${DNS_PORT} +short cloaked.com @127.0.0.1 | grep -Eq '1.1.1.1|1.0.0.1' || fail -t || dig -p${DNS_PORT} +short MX cloaked.com @127.0.0.1 | grep -Fq 'locally blocked' || fail +t || dig -p${DNS_PORT} +short cloakedunregistered.com @127.0.0.1 | grep -Eq '1.1.1.1|1.0.0.1' || fail +t || dig -p${DNS_PORT} +short MX cloakedunregistered.com @127.0.0.1 | grep -Fq 'locally blocked' || fail t || dig -p${DNS_PORT} +short MX example.com @127.0.0.1 | grep -Fvq 'locally blocked' || fail -t || dig -p${DNS_PORT} NS cloaked.com @127.0.0.1 | grep -Fiq 'gtld-servers.net' || fail -t || dig -p${DNS_PORT} +short www.cloaked2.com @127.0.0.1 | grep -Eq '1.1.1.1|1.0.0.1' || fail +t || dig -p${DNS_PORT} NS cloakedunregistered.com @127.0.0.1 | grep -Fiq 'gtld-servers.net' || fail +t || dig -p${DNS_PORT} +short www.cloakedunregistered2.com @127.0.0.1 | grep -Eq '1.1.1.1|1.0.0.1' || fail t || dig -p${DNS_PORT} +short www.dnscrypt-test @127.0.0.1 | grep -Fq '192.168.100.100' || fail t || dig -p${DNS_PORT} a.www.dnscrypt-test @127.0.0.1 | grep -Fq 'NXDOMAIN' || fail t || dig -p${DNS_PORT} +short ptr 101.100.168.192.in-addr.arpa. @127.0.0.1 | grep -Eq 'www.dnscrypt-test.com' || fail @@ -122,8 +122,8 @@ t || grep -Eq 'invalid.*SYNTH' query.log || fail t || grep -Eq '168.192.in-addr.arpa.*SYNTH' query.log || fail t || grep -Eq 'darpa.mil.*FORWARD' query.log || fail t || grep -Eq 'www.darpa.mil.*FORWARD' query.log || fail -t || grep -Eq 'cloaked.com.*CLOAK' query.log || fail -t || grep -Eq 'www.cloaked2.com.*CLOAK' query.log || fail +t || grep -Eq 'cloakedunregistered.com.*CLOAK' query.log || fail +t || grep -Eq 'www.cloakedunregistered2.com.*CLOAK' query.log || fail t || grep -Eq 'www.dnscrypt-test.*CLOAK' query.log || fail t || grep -Eq 'a.www.dnscrypt-test.*NXDOMAIN' query.log || fail t || grep -Eq 'telemetry.example.*REJECT' query.log || fail diff --git a/.ci/cloaking-rules.txt b/.ci/cloaking-rules.txt index 78a1823e..af64f95c 100644 --- a/.ci/cloaking-rules.txt +++ b/.ci/cloaking-rules.txt @@ -1,5 +1,5 @@ -cloaked.* one.one.one.one -*.cloaked2.* one.one.one.one # inline comment -=www.dnscrypt-test 192.168.100.100 -=www.dnscrypt-test.com 192.168.100.101 -=ipv6.dnscrypt-test.com fd02::1 \ No newline at end of file +cloakedunregistered.* one.one.one.one +*.cloakedunregistered2.* one.one.one.one # inline comment +=www.dnscrypt-test 192.168.100.100 +=www.dnscrypt-test.com 192.168.100.101 +=ipv6.dnscrypt-test.com fd02::1 diff --git a/.ci/test3-dnscrypt-proxy.toml b/.ci/test3-dnscrypt-proxy.toml index 52228ab9..0355cfd4 100644 --- a/.ci/test3-dnscrypt-proxy.toml +++ b/.ci/test3-dnscrypt-proxy.toml @@ -13,9 +13,7 @@ cache = true [query_log] file = 'query.log' - - [static] [static.'myserver'] - stamp = 'sdns://AQcAAAAAAAAADjIxMi40Ny4yMjguMTM2IOgBuE6mBr-wusDOQ0RbsV66ZLAvo8SqMa4QY2oHkDJNHzIuZG5zY3J5cHQtY2VydC5mci5kbnNjcnlwdC5vcmc' \ No newline at end of file + stamp = 'sdns://AQcAAAAAAAAADjIxMi40Ny4yMjguMTM2IOgBuE6mBr-wusDOQ0RbsV66ZLAvo8SqMa4QY2oHkDJNHzIuZG5zY3J5cHQtY2VydC5mci5kbnNjcnlwdC5vcmc'