From 517386866dce232ef7ad65238e0217ecf7bb2074 Mon Sep 17 00:00:00 2001 From: Aram Sargsyan Date: Tue, 11 Mar 2025 14:29:22 +0000 Subject: [PATCH] Test -T cookiealwaysvalid Add a check in the "cookie" system test to make sure that the new '-T cookiealwaysvalid' option works. (cherry picked from commit 4e75a20b6a63c3840559accc9df2af2d50a747f6) --- bin/tests/system/cookie/tests.sh | 17 +++++++++++++++++ bin/tests/system/cookie/tests_sh_cookie.py | 1 + 2 files changed, 18 insertions(+) diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh index ff42b78bd4..fdb3306c03 100755 --- a/bin/tests/system/cookie/tests.sh +++ b/bin/tests/system/cookie/tests.sh @@ -338,6 +338,23 @@ grep "status: NOERROR," dig.out.test$n >/dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status + ret)) +n=$((n + 1)) +echo_i "Restart NS4 with -T cookiealwaysvalid ($n)" +stop_server ns4 +touch ns4/named.cookiealwaysvalid +start_server --noclean --restart --port ${PORT} ns4 || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + +n=$((n + 1)) +echo_i "test NS6 cookie on NS4 with -T cookiealwaysvalid (expect success) ($n)" +ret=0 +$DIG $DIGOPTS +cookie=$ns6cookie -b 10.53.0.4 +nobadcookie soa . @10.53.0.4 >dig.out.test$n || ret=1 +grep "; COOKIE:.*(good)" dig.out.test$n >/dev/null || ret=1 +grep "status: NOERROR," dig.out.test$n >/dev/null || ret=1 +if [ $ret != 0 ]; then echo_i "failed"; fi +status=$((status + ret)) + n=$((n + 1)) echo_i "check that test server is correctly configured ($n)" ret=0 diff --git a/bin/tests/system/cookie/tests_sh_cookie.py b/bin/tests/system/cookie/tests_sh_cookie.py index 768f8601ed..1c9e8280f5 100644 --- a/bin/tests/system/cookie/tests_sh_cookie.py +++ b/bin/tests/system/cookie/tests_sh_cookie.py @@ -19,6 +19,7 @@ pytestmark = pytest.mark.extra_artifacts( "ans*/ans.run", "ans*/query.log", "ns1/named_dump.db*", + "ns4/named.cookiealwaysvalid", ] )