Add test for colons in FakeBasicAuth user certificate

Update gencert to do a better job parsing arguments so I can
pass in a --test flag to generate a special test-only user
certificate to test colons in the DN.

2 files changed, 13 insertions, 1 deletions

diff --git a/test/setup.sh b/test/setup.sh
index 33cf4f6..f1d4a43 100755
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -43,7 +43,7 @@ cp ../.libs/libmodnss.so ${test_root}/lib
 cp ../nss_pcache ${test_root}/bin
 
 echo "Generating a new certificate database..."
-bash ../gencert ${DBPREFIX}${test_root}/alias $SNI > /dev/null 2>&1
+bash ../gencert ${DBPREFIX}${test_root}/alias --sni $SNI --test > /dev/null 2>&1
 echo internal:httptest > ${test_root}/conf/password.conf
 
 # Export the CA cert
@@ -59,6 +59,9 @@ openssl pkcs12  -in alpha.p12 -nocerts -nodes -out alpha.key -passin pass:`cat p
 pk12util -o beta.p12 -d ${DBPREFIX}${test_root}/alias -n beta -w pw -k dbpw
 openssl pkcs12  -in beta.p12 -clcerts -nokeys -out beta.crt -passin pass:`cat pw`
 openssl pkcs12  -in beta.p12 -nocerts -nodes -out beta.key -passin pass:`cat pw`
+pk12util -o colon.p12 -d ${DBPREFIX}${test_root}/alias -n colon -w pw -k dbpw
+openssl pkcs12  -in colon.p12 -clcerts -nokeys -out colon.crt -passin pass:`cat pw`
+openssl pkcs12  -in colon.p12 -nocerts -nodes -out colon.key -passin pass:`cat pw`
 /bin/rm -f pw dbpw
 cd -
 
diff --git a/test/test.py b/test/test.py
index c471fdb..90b969d 100644
--- a/test/test.py
+++ b/test/test.py
@@ -162,6 +162,15 @@ class test_suite1(Declarative):
         ),
 
         dict(
+            desc='FakeBasicAuth, certificate with colon',
+            request=('/acl/aclS03.html', {
+                      'key_file': 'work/httpd/colon.key',
+                      'cert_file': 'work/httpd/colon.crt',}
+            ),
+            expected=403,
+        ),
+
+        dict(
             desc='Secret key size',
             request=('/secret-test.html', {}),
             expected=200,