test: revocation: Minor style clean ups

* Always tear down test server if it exits for any reason.
* Give container + volume unique name.
* Drop iptables commands, these scare me as they are mucking with the
  state of my machine.
* Fix path to cert revocation list, the OpenVPN crl is copied at
  start-up and is a race condition.

Author: kylemanna

test/tests/revocation/run.sh

@@ -3,11 +3,11 @@ set -e
 
 [ -n "${DEBUG+x}" ] && set -x
 
-OVPN_DATA="basic-data"
+OVPN_DATA="ovpn-revoke-test-data"
 CLIENT1="travis-client1"
 CLIENT2="travis-client2"
 IMG="kylemanna/openvpn"
-NAME="ovpn-test"
+NAME="ovpn-revoke-test"
 CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"
 SERV_IP="$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)"
 
@@ -18,18 +18,21 @@ docker volume create --name $OVPN_DATA
 docker run --rm -v $OVPN_DATA:/etc/openvpn $IMG ovpn_genconfig -u udp://$SERV_IP
 docker run --rm -v $OVPN_DATA:/etc/openvpn -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
 
-#
-# Fire up the server.
-#
-sudo iptables -N DOCKER || echo 'Firewall already configured'
-sudo iptables -I FORWARD 1 -j DOCKER
-docker run -d -v $OVPN_DATA:/etc/openvpn --cap-add=NET_ADMIN --privileged -p 1194:1194/udp --name $NAME $IMG
+# Register clean-up function
+function finish {
+    # Stop the server and clean up
+    docker rm -f $NAME
+    docker volume rm $OVPN_DATA
+}
+trap finish EXIT
 
+# Put the server in the background
+docker run -d -v $OVPN_DATA:/etc/openvpn --cap-add=NET_ADMIN -p 1194:1194/udp --name $NAME $IMG
 
 #
 # Test that easy_rsa generate CRLs with 'next publish' set to 3650 days.
 #
-crl_next_update="$(docker exec $NAME openssl crl -nextupdate -noout -in /etc/openvpn/crl.pem | cut -d'=' -f2 | tr -d 'GMT')"
+crl_next_update="$(docker exec $NAME bash -c "openssl crl -nextupdate -noout -in \$EASYRSA_PKI/crl.pem | cut -d'=' -f2 | tr -d 'GMT'")"
 crl_next_update="$(date -u -d "$crl_next_update" "+%s")"
 now="$(docker exec $NAME date "+%s")"
 crl_remain="$(( $crl_next_update - $now ))"
@@ -79,13 +82,6 @@ if docker run --rm -v $CLIENT_DIR:/client --cap-add=NET_ADMIN --privileged --net
     exit 2
 fi
 
-#
-# Stop the server and clean up
-#
-docker kill $NAME && docker rm $NAME
-docker volume rm $OVPN_DATA
-sudo iptables -D FORWARD 1
-
 #
 # Celebrate
 #