]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
projects / thirdparty / unbound.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4953daa)
- Fix unit tests for spurious empty messages.
authorW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Thu, 9 Feb 2023 09:38:55 +0000 (10:38 +0100)
committerW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Thu, 9 Feb 2023 09:38:55 +0000 (10:38 +0100)
doc/Changelog patch | blob | blame | history
testdata/iter_ranoaa_lame.rpl patch | blob | blame | history
testdata/ratelimit.tdir/ratelimit.testns patch | blob | blame | history
testdata/stream_ssl.tdir/stream_ssl.serv.conf patch | blob | blame | history
testdata/subnet_derived.crpl patch | blob | blame | history
testdata/subnet_format_ip4.crpl patch | blob | blame | history
testdata/subnet_not_whitelisted.crpl patch | blob | blame | history
testdata/subnet_without_validator.crpl patch | blob | blame | history

diff --git a/doc/Changelog b/doc/Changelog
index 9893e7846847266bb9040aecb08b6139ffed4040..7c252a96dc1e319763aacc612394303374999eff 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
          This turns completely empty responses, a type of noerror/nodata into
          a servfail, but they do not conform to RFC2308, and the retry can
          fetch improved content.
+       - Fix unit tests for spurious empty messages.
 
 8 February 2023: Wouter
        - Fix #841: Unbound won't build with aaaa-filter-iterator.patch.
diff --git a/testdata/iter_ranoaa_lame.rpl b/testdata/iter_ranoaa_lame.rpl
index 0e6d9877858e2c8743ef2478ac7a7196f25b4a44..8ee82415abc165161c1580270a0adc06d46eab9e 100644 (file)
--- a/testdata/iter_ranoaa_lame.rpl
+++ b/testdata/iter_ranoaa_lame.rpl
@@ -198,6 +198,8 @@ REPLY QR NOERROR
 SECTION QUESTION
 ns.example.com. IN AAAA
 SECTION ANSWER
+SECTION AUTHORITY
+example.com. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
 ENTRY_END
 
 RANGE_END
@@ -235,6 +237,8 @@ REPLY QR NOERROR
 SECTION QUESTION
 ns.example.com. IN AAAA
 SECTION ANSWER
+SECTION AUTHORITY
+example.com. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
 ENTRY_END
 
 ENTRY_BEGIN
@@ -243,6 +247,8 @@ ADJUST copy_id
 REPLY QR NOERROR
 SECTION QUESTION
 ns.example.net. IN AAAA
+SECTION AUTHORITY
+example.net. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
 ENTRY_END
 
 ; the lame response.
diff --git a/testdata/ratelimit.tdir/ratelimit.testns b/testdata/ratelimit.tdir/ratelimit.testns
index 673bd15a598be7fd1ec48429f4deddd6f320e582..563c1db6a1f2f74d989bed80020f2f421c663c6d 100644 (file)
--- a/testdata/ratelimit.tdir/ratelimit.testns
+++ b/testdata/ratelimit.tdir/ratelimit.testns
@@ -10,4 +10,6 @@ SECTION QUESTION
 wild   IN      A
 SECTION ANSWER
 wild   IN      A       10.20.30.40
+SECTION AUTHORITY
+example.com. IN NS ns.example.com.
 ENTRY_END
diff --git a/testdata/stream_ssl.tdir/stream_ssl.serv.conf b/testdata/stream_ssl.tdir/stream_ssl.serv.conf
index a5dfcf364ec315d2d60ab8dd9aca74846039d5a6..840334f1edb85184dd8360ae7a6c89c5be24deb6 100644 (file)
--- a/testdata/stream_ssl.tdir/stream_ssl.serv.conf
+++ b/testdata/stream_ssl.tdir/stream_ssl.serv.conf
@@ -9,9 +9,15 @@ server:
        chroot: ""
        username: ""
        do-not-query-localhost: yes
+       local-zone: "example.com" static
+       local-zone: "server" static
+       local-zone: "host" static
        local-data: "www.example.com. IN A 10.20.30.40"
        local-data: "unbound.server. IN A 127.0.0.1"
        local-data: "test.host. IN A 1.2.3.4"
+       local-data: "example.com. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600"
+       local-data: "server. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600"
+       local-data: "host. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600"
        ssl-port: @SERVPORT@
        ssl-service-key: "unbound_server.key"
        ssl-service-pem: "unbound_server.pem"
diff --git a/testdata/subnet_derived.crpl b/testdata/subnet_derived.crpl
index 6ff626abd7cc917c4991aa09c167f76516234856..7acf316fe2eca623d3cda7221f35c72a24359def 100644 (file)
--- a/testdata/subnet_derived.crpl
+++ b/testdata/subnet_derived.crpl
@@ -39,6 +39,7 @@ RANGE_BEGIN 0 100
                SECTION QUESTION
                        a.gtld-servers.net. IN AAAA
                SECTION AUTHORITY
+                       net. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
                SECTION ADDITIONAL
                        HEX_EDNSDATA_BEGIN
                                ;; we expect to receive empty
@@ -111,6 +112,8 @@ RANGE_BEGIN 0 100
                SECTION QUESTION
                        ns.example.com. IN AAAA
                SECTION ANSWER
+               SECTION AUTHORITY
+                       example.com. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
                SECTION ADDITIONAL
                        HEX_EDNSDATA_BEGIN
                                ;; we expect to receive empty
diff --git a/testdata/subnet_format_ip4.crpl b/testdata/subnet_format_ip4.crpl
index cd1c858fd636744bca492db299df189c82787499..1370caee7da45e78999a72365c310a78f7dcac17 100644 (file)
--- a/testdata/subnet_format_ip4.crpl
+++ b/testdata/subnet_format_ip4.crpl
@@ -38,6 +38,7 @@ RANGE_BEGIN 0 100
                SECTION QUESTION
                        a.gtld-servers.net. IN AAAA
                SECTION AUTHORITY
+                       net. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
                SECTION ADDITIONAL
                        HEX_EDNSDATA_BEGIN
                                ;; we expect to receive empty
@@ -108,6 +109,8 @@ RANGE_BEGIN 0 100
                SECTION QUESTION
                        ns.example.com. IN AAAA
                SECTION ANSWER
+               SECTION AUTHORITY
+                       example.com. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
                SECTION ADDITIONAL
                        HEX_EDNSDATA_BEGIN
                                ;; we expect to receive empty
diff --git a/testdata/subnet_not_whitelisted.crpl b/testdata/subnet_not_whitelisted.crpl
index 545b019eda927e088dd7966108fbce3c4f83a6b4..5419a5790f0d0783d5d391567d79ce89bc6a2a89 100644 (file)
--- a/testdata/subnet_not_whitelisted.crpl
+++ b/testdata/subnet_not_whitelisted.crpl
@@ -39,6 +39,7 @@ RANGE_BEGIN 0 100
                SECTION QUESTION
                        a.gtld-servers.net. IN AAAA
                SECTION AUTHORITY
+                       net. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
                SECTION ADDITIONAL
                        HEX_EDNSDATA_BEGIN
                                ;; we expect to receive empty
@@ -109,6 +110,8 @@ RANGE_BEGIN 0 100
                SECTION QUESTION
                        ns.example.com. IN AAAA
                SECTION ANSWER
+               SECTION AUTHORITY
+                       example.com. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
                SECTION ADDITIONAL
                        HEX_EDNSDATA_BEGIN
                                ;; we expect to receive empty
diff --git a/testdata/subnet_without_validator.crpl b/testdata/subnet_without_validator.crpl
index 2fbf24239ecb4dffbd81ff850481a0bcf614ef9a..59c38660f281afc5757635d2d449e6597acda540 100644 (file)
--- a/testdata/subnet_without_validator.crpl
+++ b/testdata/subnet_without_validator.crpl
@@ -38,6 +38,7 @@ RANGE_BEGIN 0 100
                SECTION QUESTION
                        a.gtld-servers.net. IN AAAA
                SECTION AUTHORITY
+                       net. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
                SECTION ADDITIONAL
                        HEX_EDNSDATA_BEGIN
                                ;; we expect to receive empty
@@ -108,6 +109,8 @@ RANGE_BEGIN 0 100
                SECTION QUESTION
                        ns.example.com. IN AAAA
                SECTION ANSWER
+               SECTION AUTHORITY
+                       example.com. IN SOA ns.example.com. root.example.com. 4 14400 3600 604800 3600
                SECTION ADDITIONAL
                        HEX_EDNSDATA_BEGIN
                                ;; we expect to receive empty
Mirror of https://github.com/NLnetLabs/unbound.git