diff --git a/tests/Makefile.am b/tests/Makefile.am index 86ea65e1..e2c2cafc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,7 +11,8 @@ EXTRA_DIST = ca-key.pem ca.pem common.sh server-cert.pem server-key.pem test1.co test-cookie-invalidation.config test-enc-key2.config test-enc-key.config \ server-key-ossl.pem server-key-p8.pem proxyproto-unix-test user-cn.pem \ user-cert-testuser.pem test-stress test-user-config.config user-config/testuser \ - test-cookie-rotation.config test-sighup-key-change.config + test-cookie-rotation.config test-sighup-key-change.config user-config/testipnet \ + user-cert-testipnet.pem SUBDIRS = docker-ocserv docker-kerberos diff --git a/tests/test-user-config b/tests/test-user-config index 30bcb888..cfd91ea8 100755 --- a/tests/test-user-config +++ b/tests/test-user-config @@ -33,6 +33,7 @@ TMPFILE1=${srcdir}/test-user-config.tmp TMPFILE2=${srcdir}/test-user-config-2.tmp rm -f ${TMPFILE1} +rm -f ${TMPFILE2} launch_server -d 1 -f -c ${srcdir}/test-user-config.config & PID=$! wait_server $PID @@ -110,6 +111,29 @@ echo ok rm -f ${TMPFILE1} rm -f ${TMPFILE2} +echo -n "Re-connecting to check the ipv4-network... " +$OPENCONNECT -v localhost:$PORT --sslkey "${srcdir}/user-key.pem" -c "${srcdir}/user-cert-testipnet.pem" --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 -s /bin/true ${TMPFILE1} 2>&1 & +kpid1=$! + +echo ok +sleep 3 + +CONTENTS=`cat ${TMPFILE1}|grep X-CSTP-Netmask|grep '255.255.0.0'` +if test -z "$CONTENTS";then + cat ${TMPFILE1}|grep X-CSTP-Netmask + fail $PID "Temporary file contents are not correct; netmask was not the expected (255.255.0.0)" +fi + +CONTENTS=`cat ${TMPFILE1}|grep X-CSTP-Address|grep ' 10.9.'` +if test -z "$CONTENTS";then + cat ${TMPFILE1}|grep X-CSTP-Address + fail $PID "Temporary file contents are not correct; address was not the expected (10.9.)" +fi + + +kill $kpid1 +rm -f ${TMPFILE1} +rm -f ${TMPFILE2} kill $PID wait diff --git a/tests/user-cert-testipnet.pem b/tests/user-cert-testipnet.pem new file mode 100644 index 00000000..a224a6f3 --- /dev/null +++ b/tests/user-cert-testipnet.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDkzCCAkugAwIBAgIIVsxd2gE9XhIwDQYJKoZIhvcNAQELBQAwDTELMAkGA1UE +AxMCQ0EwIBcNMTYwMjIzMTMyNTQ3WhgPOTk5OTEyMzEyMzU5NTlaMCwxDzANBgNV +BAMTBkEgdXNlcjEZMBcGCgmSJomT8ixkAQETCXRlc3RpcG5ldDCCAVIwDQYJKoZI +hvcNAQEBBQADggE/ADCCAToCggExAKtUmPypxhWVnabBlISUkXkeeNstSFGZZQEC +wEBSSV3rcLwm72g5HgSR4tvLb5NARR4ijnFaWIkoeV4aMiU+i507NH8Z+NAvN7di +MrdTpUMsxV3srPk1+hQrNGbx1qeh0IOaVvQZg7y/EXQwLagoW6KresbNnFz4Uemp +DEjbcbuxNHf37t5deMBICjcNZR47KxQDiXLyUu1fAMUGYOqAINBD7Ga80ibb8Ck+ +avliIL5YJkS614xvdqYFIOSYt8Ryel3fTw0j7C6cceww+RRfyHULq2f2fftNdmRK +pdX6tAhQnRPHj8J5sLQ+L4nTMydNn4vTYCQHq7JyPSmlxErsPATSST4mG+x6ED3K +RVqAi00qlmNPLWMoDztHR8p8LBVBMtXgyb6lVSyza0YqVrEb7SkCAwEAAaN2MHQw +DAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAPBgNVHQ8BAf8EBQMD +B6AAMB0GA1UdDgQWBBSLAQlLO5Hs4yG5HeyNa0xdnkCAXjAfBgNVHSMEGDAWgBRI +IzRTCokxOEpa6sq20qbezh0rGDANBgkqhkiG9w0BAQsFAAOCATEAnbDm/LzM3BLz +K+UfFTFGuGAjsWUn5Es0H0ajl5Yax4WlR22OmMFcWRNmZoshFBskk4mxQKll1LBM +m6bqb23iT7GucAk8NdGeIxUDO53GcsCfQAua/xsaDT+qSiu9mSdKk6hooNljMFv8 +f2zlp2LPlGaqz8DjvdGD/dySPgvjF5owoS0Ihy2ZUNK6hQFxWXDj1Scu4itszOgG +2P93fHfIs+ySeD+7efOna8JjfUMeFLN9nJg23DLjUjM/7M/1q2H9LefszTzZ4u2B +ixaQeU1xXTYBMTSrS4Sd26o8+lR7AdXHEmdN2HdWM5TkMC5A2fYg+yVCVmhz27tn +qU0u5P/1i+b0LtTEPcurSNApykB8K+t9/1TYGTV7COWUevLyGEwdRaQ2xl3Q41WE +b+7GJgmybA== +-----END CERTIFICATE----- diff --git a/tests/user-config/testipnet b/tests/user-config/testipnet new file mode 100644 index 00000000..c3041d45 --- /dev/null +++ b/tests/user-config/testipnet @@ -0,0 +1,2 @@ +mobile-dpd = 880 +ipv4-network = 10.9.9.0/16