From: Kees Monshouwer Date: Mon, 14 Apr 2014 06:47:38 +0000 (+0200) Subject: use pdnssec for tsig keys and metadata in tests X-Git-Tag: rec-3.6.0-rc1~61^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9823145ec1a9ca67aa1146fc604c4413c3aa8f9;p=thirdparty%2Fpdns.git use pdnssec for tsig keys and metadata in tests --- diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave index 3af5c7e2f2..76ba3b71c4 100644 --- a/regression-tests/backends/gmysql-slave +++ b/regression-tests/backends/gmysql-slave @@ -4,47 +4,45 @@ [ -z "$GMYSQL2HOST" ] && GMYSQL2HOST=localhost [ -z "$GMYSQL2PASSWD" ] && GMYSQL2PASSWD='' - mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" --force drop "$GMYSQL2DB" \ - || echo ignoring mysqladmin drop failure - mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" create "$GMYSQL2DB" + mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ + --force drop "$GMYSQL2DB" || echo ignoring mysqladmin drop failure + mysqladmin --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ + create "$GMYSQL2DB" mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ "$GMYSQL2DB" < ../modules/gmysqlbackend/schema.mysql.sql + cat > pdns-gmysql2.conf << __EOF__ +launch=gmysql +gmysql-dbname=$GMYSQL2DB +gmysql-user=$GMYSQL2USER +gmysql-host=$GMYSQL2HOST +gmysql-password=$GMYSQL2PASSWD +gmysql-dnssec +__EOF__ + for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) do mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ - "$GMYSQL2DB" \ - -e "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')" + "$GMYSQL2DB" -e "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')" done - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ - -e "INSERT INTO tsigkeys (name, algorithm,secret) VALUES('test', '$ALGORITHM', '$KEY')" - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ - -e "INSERT INTO domainmetadata (domain_id, kind, content) SELECT id, 'AXFR-MASTER-TSIG', 'test' FROM domains WHERE name = 'tsig.com'" - set +e - echo $skipreasons | grep -q nolua - if [ $? -ne 0 ] + ../pdns/pdnssec --config-dir=. --config-name=gmysql2 import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. --config-name=gmysql2 activate-tsig-key tsig.com test master + if [[ $skipreasons != *nolua* ]] then - mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" "$GMYSQL2DB" \ - -e "INSERT INTO domainmetadata (domain_id,kind,content) SELECT id,'AXFR-SOURCE','127.0.0.2' FROM domains WHERE name = 'stest.com'" + ../pdns/pdnssec --config-dir=. --config-name=gmysql2 set-meta stest.com AXFR-SOURCE 127.0.0.2 fi - set -e port=$((port+100)) - $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gmysql --gmysql-dnssec \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --query-cache-ttl=$cachettl --experimental-dname-processing --no-config --slave --retrieval-threads=4 \ - --gmysql-dbname="$GMYSQL2DB" \ - --gmysql-user="$GMYSQL2USER" \ - --gmysql-host="$GMYSQL2HOST" \ - --gmysql-password="$GMYSQL2PASSWD" \ - --config-name=gmysql2 & + $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \ + --config-name=gmysql2 --socket-dir=./ --no-shuffle \ + --send-root-referral --slave --retrieval-threads=4 \ + --slave-cycle-interval=300 --experimental-dname-processing & + echo 'waiting for zones to be slaved' loopcount=0 - while [ $loopcount -lt 20 ] + while [ $loopcount -lt 30 ] do sleep 5 todo=$(mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQl2HOST" \ @@ -58,4 +56,5 @@ if [ $todo -ne 0 ] then echo "AXFR FAILED" >> failed_tests + exit fi diff --git a/regression-tests/backends/goracle-slave b/regression-tests/backends/goracle-slave index 024dad02c4..27b5cacd08 100644 --- a/regression-tests/backends/goracle-slave +++ b/regression-tests/backends/goracle-slave @@ -24,13 +24,10 @@ __EOF__ ../pdns/pdnssec --config-dir=. --config-name=goracle2 import-tsig-key test $ALGORITHM $KEY ../pdns/pdnssec --config-dir=. --config-name=goracle2 activate-tsig-key tsig.com test master - set +e - echo $skipreasons | grep -q nolua - if [ $? -ne 0 ] + if [[ $skipreasons != *nolua* ]] then ../pdns/pdnssec --config-dir=. --config-name=goracle2 set-meta stest.com AXFR-SOURCE 127.0.0.2 fi - set -e port=$((port+100)) @@ -38,10 +35,10 @@ __EOF__ --config-name=goracle2 --socket-dir=./ --no-shuffle \ --send-root-referral --slave --retrieval-threads=4 \ --slave-cycle-interval=300 --experimental-dname-processing & - echo 'waiting for zones to be slaved' + echo 'waiting for zones to be slaved' loopcount=0 - while [ $loopcount -lt 40 ] + while [ $loopcount -lt 30 ] do sleep 5 todo=$(sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe << __EOF__ @@ -59,4 +56,5 @@ __EOF__ if [ $todo -ne 0 ] then echo "AXFR FAILED" >> failed_tests + exit fi diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave index 5e877655a3..1aa3027cab 100644 --- a/regression-tests/backends/gpgsql-slave +++ b/regression-tests/backends/gpgsql-slave @@ -2,8 +2,8 @@ [ -z "$GPGSQ2LDB" ] && GPGSQL2DB=pdnstest2 [ -z "$GPGSQL2USER" ] && GPGSQL2USER=$(whoami) - dropdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring mysqladmin drop failure - createdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring mysqladmin drop failure + dropdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring mysqladmin drop failure + createdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring mysqladmin drop failure psql --user="$GPGSQL2USER" "$GPGSQL2DB" < ../modules/gpgsqlbackend/schema.pgsql.sql cat > pdns-gpgsql2.conf << __EOF__ diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave index ec80b662c3..00f6490791 100644 --- a/regression-tests/backends/gsqlite3-slave +++ b/regression-tests/backends/gsqlite3-slave @@ -1,38 +1,41 @@ context=${context}-presigned-gsqlite3 - rm -f pdns.sqlite31 - sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/schema.sqlite3.sql + rm -f pdns.sqlite32 + sqlite3 pdns.sqlite32 < ../modules/gsqlite3backend/schema.sqlite3.sql + + cat > pdns-gsqlite32.conf << __EOF__ +launch=gsqlite3 +gsqlite3-database=pdns.sqlite32 +gsqlite3-pragma-synchronous=0 +gsqlite3-dnssec +__EOF__ for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) do - sqlite3 pdns.sqlite31 "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port');" + sqlite3 pdns.sqlite32 "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port');" done - sqlite3 pdns.sqlite31 "INSERT INTO tsigkeys (name,algorithm,secret) VALUES('test','$ALGORITHM', '$KEY')" - sqlite3 pdns.sqlite31 "INSERT INTO domainmetadata (domain_id, kind, content) SELECT id, 'AXFR-MASTER-TSIG', 'test' FROM domains WHERE name = 'tsig.com'" - set +e - echo $skipreasons | grep -q nolua - if [ $? -ne 0 ] + ../pdns/pdnssec --config-dir=. --config-name=gsqlite32 import-tsig-key test $ALGORITHM $KEY + ../pdns/pdnssec --config-dir=. --config-name=gsqlite32 activate-tsig-key tsig.com test master + if [[ $skipreasons != *nolua* ]] then - sqlite3 pdns.sqlite31 "INSERT INTO domainmetadata (domain_id,kind,content) SELECT id,'AXFR-SOURCE','127.0.0.2' FROM domains WHERE name = 'stest.com'" + ../pdns/pdnssec --config-dir=. --config-name=gsqlite32 set-meta stest.com AXFR-SOURCE 127.0.0.2 fi - set -e port=$((port+100)) - $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec \ - --fancy-records --send-root-referral \ - --cache-ttl=0 --query-cache-ttl=0 --experimental-dname-processing --no-config --slave --retrieval-threads=4 \ - --gsqlite3-database=pdns.sqlite31 --gsqlite3-pragma-synchronous=0 \ - --config-name=gsqlite32 & + $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --config-dir=. \ + --config-name=gsqlite32 --socket-dir=./ --no-shuffle \ + --send-root-referral --slave --retrieval-threads=4 \ + --slave-cycle-interval=300 --experimental-dname-processing & + echo 'waiting for zones to be slaved' set +e loopcount=0 - while [ $loopcount -lt 20 ] + while [ $loopcount -lt 30 ] do sleep 5 - todo=$(sqlite3 pdns.sqlite31 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL') - if [ $todo -eq 0 ] + todo=$(sqlite3 pdns.sqlite32 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL') + if [ $? -eq 0 ] then if [ $todo = 0 ] then @@ -44,6 +47,7 @@ if [ $todo -ne 0 ] then echo "AXFR FAILED" >> failed_tests + exit fi set -e - sqlite3 pdns.sqlite31 ANALYZE; + sqlite3 pdns.sqlite32 ANALYZE;