update the acl system test to include a blackhole test case

this ACL was previously untested, which allowed a regression to
go undetected.

(cherry picked from commit e3ee138098897e0f53b2950dfe8a234543ec134e)

diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in
index 4b4e05027aad474bb5f7bc6473ca3e588fb4a81b..7e20bac49dc2f4e9b346fb4b97272ce6cf6e7238 100644 (file)
--- a/bin/tests/system/acl/ns2/named5.conf.in
+++ b/bin/tests/system/acl/ns2/named5.conf.in
@@ -31,6 +31,7 @@ options {
        ixfr-from-differences yes;
        check-integrity no;
        allow-query-on { 10.53.0.2; };
+       blackhole { 10.53.0.8; };
 };
 
 key one {

diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
index fe49a86a0e279d037181501f4d86b5dd537248d8..1717a2e20817120e5094142965d42e3bf3c371a2 100644 (file)
--- a/bin/tests/system/acl/tests.sh
+++ b/bin/tests/system/acl/tests.sh
@@ -144,6 +144,26 @@ $DIG -p ${PORT} +tcp soa example. \
        @10.53.0.2 -b 10.53.0.3 > dig.out.${t}
 grep "status: NOERROR" dig.out.${t} > /dev/null 2>&1 || { echo_i "test $t failed" ; status=1; }
 
+echo_i "testing blackhole ACL processing"
+t=`expr $t + 1`
+ret=0
+$DIG -p ${PORT} +tcp soa example. \
+       @10.53.0.2 -b 10.53.0.3 > dig.out.1.${t}
+grep "status: NOERROR" dig.out.1.${t} > /dev/null 2>&1 || ret=1
+$DIG -p ${PORT} +tcp soa example. \
+       @10.53.0.2 -b 10.53.0.8 > dig.out.2.${t}
+grep "status: NOERROR" dig.out.2.${t} > /dev/null 2>&1 && ret=1
+grep "communications error" dig.out.2.${t} > /dev/null 2>&1 || ret=1
+$DIG -p ${PORT} soa example. \
+       @10.53.0.2 -b 10.53.0.3 > dig.out.3.${t}
+grep "status: NOERROR" dig.out.3.${t} > /dev/null 2>&1 || ret=1
+$DIG -p ${PORT} soa example. \
+       @10.53.0.2 -b 10.53.0.8 > dig.out.4.${t}
+grep "status: NOERROR" dig.out.4.${t} > /dev/null 2>&1 && ret=1
+grep "connection timed out" dig.out.4.${t} > /dev/null 2>&1 || ret=1
+[ $ret -eq 0 ] || echo_i "failed"
+status=`expr $status + $ret`
+
 # AXFR tests against ns3
 
 echo_i "testing allow-transfer ACLs against ns3 (no existing zones)"