From f8d3cc51f046128d803a0198c637a4dedf698fc6 Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Sat, 22 Nov 2014 09:11:39 -0500
Subject: [PATCH] [test suite] stronger access.conf test case for AFL fuzzing

---
 .../helpers/fwknopd-parse-access.sh           |  2 +-
 test/afl/fuzzing-wrappers/server-access.sh    |  2 +-
 test/afl/test-cases/server-access/access.conf | 24 ++++++++++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh
index a4ec94f4..e3b4cd89 100755
--- a/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh
+++ b/test/afl/fuzzing-wrappers/helpers/fwknopd-parse-access.sh
@@ -7,4 +7,4 @@ then
     ACCESS_FILE=$@
 fi
 
-LD_LIBRARY_PATH=../../lib/.libs ../../server/.libs/fwknopd -c ../conf/default_fwknopd.conf -a $ACCESS_FILE -A -f -t --exit-parse-config -D
+LD_LIBRARY_PATH=../../lib/.libs ../../server/.libs/fwknopd -c ../conf/ipt_snat_fwknopd.conf -a $ACCESS_FILE -A -f -t --exit-parse-config -D
diff --git a/test/afl/fuzzing-wrappers/server-access.sh b/test/afl/fuzzing-wrappers/server-access.sh
index a0c248f3..cdded281 100755
--- a/test/afl/fuzzing-wrappers/server-access.sh
+++ b/test/afl/fuzzing-wrappers/server-access.sh
@@ -17,6 +17,6 @@ mkdir $OUT_DIR
 ### make sure that parsing the access.conf file works
 ./fuzzing-wrappers/helpers/fwknopd-parse-access.sh || exit
 
-LD_LIBRARY_PATH=$LIB_DIR afl-fuzz -t 1000 -i $IN_DIR -o $OUT_DIR -f $OUT_DIR/afl_access.conf $SERVER -c ../conf/default_fwknopd.conf -a $OUT_DIR/afl_access.conf -A -f -t --exit-parse-config -D
+LD_LIBRARY_PATH=$LIB_DIR afl-fuzz -t 1000 -i $IN_DIR -o $OUT_DIR -f $OUT_DIR/afl_access.conf $SERVER -c ../conf/ipt_snat_fwknopd.conf -a $OUT_DIR/afl_access.conf -A -f -t --exit-parse-config -D
 
 exit
diff --git a/test/afl/test-cases/server-access/access.conf b/test/afl/test-cases/server-access/access.conf
index 77aac5a6..dea3417c 100644
--- a/test/afl/test-cases/server-access/access.conf
+++ b/test/afl/test-cases/server-access/access.conf
@@ -9,8 +9,9 @@ FW_ACCESS_TIMEOUT           2
 
 SOURCE                      ANY
 KEY                         test3
-ACCESS_EXPIRE               3-10-01;  ### comment
-OPEN_PORTS                  tcp/80
+ACCESS_EXPIRE               03/10/2014;  ### comment
+OPEN_PORTS                  tcp/22;
+RESTRICT_PORTS              udp/6001, tcp/45, tcp/80, tcp/12345
 FW_ACCESS_TIMEOUT           3
 ENCRYPTION_MODE             legacy
 
@@ -20,26 +21,27 @@ REQUIRE_USERNAME            nouser
 KEY                         test4
 OPEN_PORTS                  tcp/80
 FORCE_NAT                   192.168.1.123 22
+FORCE_SNAT                  33.3.3.3
 
-SOURCE                      ANY
-KEY                         test5
-HMAC_KEY                    test6
-OPEN_PORTS                  tcp/80
-RESTRICT_PORTS              tcp/34
+SOURCE                      1.2.3.4
+KEY_BASE64                  wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64             Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
+OPEN_PORTS                  tcp/80;  ### also appears in RESTRICT_PORTS
+RESTRICT_PORTS              udp/6001, tcp/22, tcp/80, tcp/12345
 FW_ACCESS_TIMEOUT           3
 ENABLE_CMD_EXEC             Y
 
 SOURCE                  ANY
 KEY                     fwknoptest
 FW_ACCESS_TIMEOUT       3
-GPG_HOME_DIR            conf/server-gpg
-GPG_DECRYPT_ID          361BBAD4
-GPG_DECRYPT_PW          fwknoptest
+GPG_HOME_DIR            ../conf/server-gpg
+GPG_DECRYPT_ID          12341234, DEADBEEF, 361BBAD4, 43214321
+GPG_DECRYPT_PW          fwknoptest, testtest
 GPG_REMOTE_ID           6A3FAD56
 
 SOURCE                      ANY
 FW_ACCESS_TIMEOUT           3
-GPG_HOME_DIR                conf/server-gpg-no-pw
+GPG_HOME_DIR                ../conf/server-gpg-no-pw
 GPG_DECRYPT_ID              361BBAD4
 GPG_ALLOW_NO_PW             Y
 GPG_FINGERPRINT_ID          00CC95F05BC146B6AC4038C9E36F443C6A3FAD56