diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2013-10-20 13:33:21 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2013-10-20 13:33:21 +0000 |
commit | 11cd4959d673c5c58d9a952d25425c3ca4ba4b3e (patch) | |
tree | e65c770c76fecfa20ad2d7eb09d302cb2a64cb3e /src | |
parent | da48d9ee19cbc96a3e0df0c870d9453e87cff4e4 (diff) | |
download | gnunet-11cd4959d673c5c58d9a952d25425c3ca4ba4b3e.tar.gz gnunet-11cd4959d673c5c58d9a952d25425c3ca4ba4b3e.zip |
-revocation
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/Makefile.am | 2 | ||||
-rw-r--r-- | src/gns/test_gns_lookup.conf | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_ns_lookup.sh | 10 | ||||
-rwxr-xr-x | src/gns/test_gns_revocation.sh | 32 |
4 files changed, 47 insertions, 0 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index b0cc6a0eb..d2dc3179e 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -227,6 +227,8 @@ check_SCRIPTS = \ | |||
227 | test_gns_plus_lookup.sh\ | 227 | test_gns_plus_lookup.sh\ |
228 | test_gns_zkey_lookup.sh\ | 228 | test_gns_zkey_lookup.sh\ |
229 | test_gns_rel_expiration.sh\ | 229 | test_gns_rel_expiration.sh\ |
230 | test_gns_soa_lookup.sh\ | ||
231 | test_gns_revocation.sh\ | ||
230 | test_gns_cname_lookup.sh | 232 | test_gns_cname_lookup.sh |
231 | 233 | ||
232 | if ENABLE_TEST_RUN | 234 | if ENABLE_TEST_RUN |
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf index 89007c279..c4be10eb8 100644 --- a/src/gns/test_gns_lookup.conf +++ b/src/gns/test_gns_lookup.conf | |||
@@ -20,3 +20,6 @@ DEFAULT_LOOKUP_TIMEOUT = 15 s | |||
20 | RECORD_PUT_INTERVAL = 1 h | 20 | RECORD_PUT_INTERVAL = 1 h |
21 | ZONE_PUBLISH_TIME_WINDOW = 1 h | 21 | ZONE_PUBLISH_TIME_WINDOW = 1 h |
22 | DNS_ROOT=6KT43HD94T0C7R43JSE1U5G982BOHT9RCENEV7HT1207APDBQIT5RLLK2LCSC0PL2ICNRFPPQ834TIVOKK421TP1T1NNUKG43OHKPV8 | 22 | DNS_ROOT=6KT43HD94T0C7R43JSE1U5G982BOHT9RCENEV7HT1207APDBQIT5RLLK2LCSC0PL2ICNRFPPQ834TIVOKK421TP1T1NNUKG43OHKPV8 |
23 | |||
24 | [revocation] | ||
25 | WORKBITS = 1 | ||
diff --git a/src/gns/test_gns_ns_lookup.sh b/src/gns/test_gns_ns_lookup.sh index 8c77a54c6..878d2aad4 100755 --- a/src/gns/test_gns_ns_lookup.sh +++ b/src/gns/test_gns_ns_lookup.sh | |||
@@ -6,6 +6,7 @@ TEST_DOMAIN_ALT="homepage.gnu" | |||
6 | TEST_DOMAIN_ALT2="uk.homepage.gnu" | 6 | TEST_DOMAIN_ALT2="uk.homepage.gnu" |
7 | TEST_IP_ALT2="81.187.252.184" | 7 | TEST_IP_ALT2="81.187.252.184" |
8 | TEST_IP="131.159.74.67" | 8 | TEST_IP="131.159.74.67" |
9 | TEST_IP6="2001:4ca0:2001:42:225:90ff:fe6b:d60" | ||
9 | TEST_IP_GNS2DNS="184.172.157.218" | 10 | TEST_IP_GNS2DNS="184.172.157.218" |
10 | TEST_RECORD_NAME="homepage" | 11 | TEST_RECORD_NAME="homepage" |
11 | TEST_RECORD_GNS2DNS="gnunet.org" | 12 | TEST_RECORD_GNS2DNS="gnunet.org" |
@@ -14,6 +15,7 @@ gnunet-identity -C testego -c test_gns_lookup.conf | |||
14 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t A -V $TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf | 15 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t A -V $TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf |
15 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf | 16 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf |
16 | RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t A -c test_gns_lookup.conf) | 17 | RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t A -c test_gns_lookup.conf) |
18 | RES_IP6=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t AAAA -c test_gns_lookup.conf) | ||
17 | RES_IP_ALT=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT -t A -c test_gns_lookup.conf) | 19 | RES_IP_ALT=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT -t A -c test_gns_lookup.conf) |
18 | RES_IP_ALT2=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT2 -t A -c test_gns_lookup.conf) | 20 | RES_IP_ALT2=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT2 -t A -c test_gns_lookup.conf) |
19 | gnunet-namestore -z testego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 21 | gnunet-namestore -z testego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
@@ -29,6 +31,14 @@ else | |||
29 | exit 1 | 31 | exit 1 |
30 | fi | 32 | fi |
31 | 33 | ||
34 | if [ "$RES_IP6" == "$TEST_IP6" ] | ||
35 | then | ||
36 | echo "PASS: Resolved $TEST_DOMAIN to $RES_IP6." | ||
37 | else | ||
38 | echo "Failed to resolve to proper IP for $TEST_DOMAIN, got $RES_IP6, wanted $TEST_IP6." | ||
39 | exit 1 | ||
40 | fi | ||
41 | |||
32 | if [ "$RES_IP_ALT" == "$TEST_IP" ] | 42 | if [ "$RES_IP_ALT" == "$TEST_IP" ] |
33 | then | 43 | then |
34 | echo "PASS: Resolved $TEST_DOMAIN_ALT to $RES_IP_ALT." | 44 | echo "PASS: Resolved $TEST_DOMAIN_ALT to $RES_IP_ALT." |
diff --git a/src/gns/test_gns_revocation.sh b/src/gns/test_gns_revocation.sh new file mode 100755 index 000000000..5c2840798 --- /dev/null +++ b/src/gns/test_gns_revocation.sh | |||
@@ -0,0 +1,32 @@ | |||
1 | #!/bin/bash | ||
2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT | ||
3 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | ||
4 | rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f` | ||
5 | |||
6 | TEST_IP="127.0.0.1" | ||
7 | gnunet-arm -s -c test_gns_lookup.conf | ||
8 | gnunet-identity -C delegatedego -c test_gns_lookup.conf | ||
9 | DELEGATED_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep delegatedego | awk '{print $3}') | ||
10 | gnunet-identity -C testego -c test_gns_lookup.conf | ||
11 | gnunet-namestore -p -z testego -a -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | ||
12 | gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | ||
13 | RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf` | ||
14 | gnunet-revocation -R delegatedego -p -c test_gns_lookup.conf | ||
15 | RES_IP_REV=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf` | ||
16 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | ||
17 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | ||
18 | gnunet-arm -e -c test_gns_lookup.conf | ||
19 | |||
20 | if [ "$RES_IP" != "$TEST_IP" ] | ||
21 | then | ||
22 | echo "Failed to resolve to proper IP, got $RES_IP." | ||
23 | exit 1 | ||
24 | fi | ||
25 | |||
26 | if [ "$RES_IP_REV" == " " ] | ||
27 | then | ||
28 | exit 0 | ||
29 | else | ||
30 | echo "Failed to revoke zone, got $RES_IP." | ||
31 | exit 1 | ||
32 | fi | ||