rm old scripts; fixed client var not replaced

TODO

@@ -1,3 +1,3 @@
 Remove client
 
-Check if client has benn revoked
+Check if client has been revoked

mkclient

@@ -1,56 +0,0 @@
-#!/bin/bash
-if [ $# -ne 3 ]
-then
-    echo "Usage: mkclient clientname vpn" 1>&2
-    exit 1
-fi
-
-vpn="${2}"
-clientname="${1}-${vpn}"
-vpn="vpn_${vpn}"
-if [ ! -d "/etc/openvpn/${vpn}" ]
-then
-    echo "VPN does not exists" 1>&2
-    exit 2
-fi
-if [ $(echo "${clientname}" | grep -c -E "^[a-zA-Z0-9\._\-]+$") != 1 ]
-then
-    echo "Invalid client name"
-    exit 3
-fi
-cd "/etc/openvpn/${vpn}/easy-rsa/keys"
-clientsdir="/etc/openvpn/${vpn}/clients/"
-clientdir="$clientsdir${clientname}/"
-clientslinkdir="/var/vpn/${vpn}/"
-if [ -a "${clientname}.crt" ] || [ -a "${clientname}.csr" ] || [ -a "${clientname}.key" ] || [ -d $clientdir ]
-then
-    echo "Client ${clientname} already exists or is revoked"
-    exit 4
-fi
-
-cd ..
-source ./vars
-KEY_CN="${clientname}" KEY_NAME="${clientname}" ./pkitool ${clientname}
-ret=$?
-if [ $ret != 0 ]
-then
-    echo "pkitool exited with code $ret"
-    exit 5
-fi
-cd keys
-echo "Copying generated files"
-mkdir -p $clientdir
-cp "${clientname}.crt" "$clientdir/${clientname}-${vpn}.crt"
-cp "${clientname}.key" "$clientdir/${clientname}-${vpn}.key"
-echo "Copying ca and ta"
-cd "/etc/openvpn/${vpn}"
-cp ca.crt "$clientdir/ca-${vpn}.crt"
-cp ta.key "$clientdir/ta-${vpn}.key"
-echo "Creating client-${vpn}.conf"
-cd $clientsdir
-
-sed "s/%%client%%/${clientname}/g" client.conf > "$clientdir/${clientname}.conf"
-echo "Creating ${clientname}.tar.bz2"
-tar cfj "${clientname}.tar.bz2" "${clientname}/"*
-echo "mkclient completed"
-exit 0

mkvpn

@@ -1,62 +0,0 @@
-#! /usr/bin/env sh
-if [ $# -ne 1 ]
-then
-    echo "Usage: $0 vpnname" 1>&2
-    exit 1
-fi
-
-vpn="vpn_$1"
-ovpndir="/etc/openvpn"
-ovpndirconf="${ovpndir}/${vpn}"
-webdir="/var/vpn/${vpn}"
-if [ -d "${ovpndirconf}" ] || [ -d "${webdir}" ]
-then
-    echo "VPN already exists" 1>&2
-    exit 2
-fi
-echo "Creating OpenVPN configuration"
-cd "${ovpndir}"
-echo -n "VPN port: "
-read vpnport
-echo -n "VPN IP range: "
-read vpniprange
-sed "s/%%VPNNAME%%/${vpn}/g" sampleconf > "${vpn}.conf"
-sed "s/%%VPNPORT%%/${vpnport}/g" -i "${vpn}.conf"
-sed "s/%%VPNIPRANGE%%/${vpniprange}/g" -i "${vpn}.conf"
-cp -r sampleconfdir "${ovpndirconf}"
-cd "${ovpndirconf}"
-sed "s/%%VPNNAME%%/${vpn}/g" -i clients/client.conf
-sed "s/%%VPNPORT%%/${vpnport}/g" -i clients/client.conf
-cd "easy-rsa"
-editor vars
-. ./vars
-export KEY_OU="${KEY_ORG}"
-export KEY_CN="${KEY_ORG}"
-export KEY_NAME="${KEY_ORG}"
-./clean-all
-./build-ca
-./build-key-server server
-./build-dh
-openssl ca -gencrl -keyfile keys/ca.key -cert keys/ca.crt -out keys/crl.pem -config openssl.cnf
-unset KEY_OU
-unset KEY_CN
-unset KEY_NAME
-chmod 710 keys
-cd keys
-openvpn --genkey --secret ta.key
-cp dh*.pem ../../
-cp ca.crt ../../
-cp ta.key ../../
-cp server.crt ../../
-cp server.key ../../
-cd "${ovpndir}"
-chown -R root:ovpn-manager "${vpn}" "${vpn}.conf"
-
-echo "Creating web configuration"
-mkdir "${webdir}"
-cd "${webdir}"
-echo "AuthUserFile ${webdir}/.htpasswd" >> .htaccess
-echo "AuthType Basic" >> .htaccess
-echo "AuthName \"${vpn}\"" >> .htaccess
-echo "Require user ovpn-root" >> .htaccess
-cp ../.htpasswd .

rmclient

@@ -1,35 +0,0 @@
-#!/bin/bash
-if [ $# != 1 ]
-then
-	echo "Usage: rmclient clientname"
-	exit 1
-else
-	cd /etc/openvpn/easy-rsa/2.0/keys
-	clientsdir="/etc/openvpn/clients/"
-	clientdir="$clientsdir$1/"
-	clientsrmdir="/etc/openvpn/rmclients/"
-	clientslinkdir="/var/vpn/clients/"
-	if ! [ -a "$1.crt" ] && ! [ -a "$1.csr" ] && ! [ -a "$1.key" ] && ! [ -a $clientslinkdir"$1.tar.bz2" ] && ! [ -d $clientdir ]
-	then
-		echo "Client $1 does not exist"
-		exit 2
-	fi
-
-	cd ..
-	source ./vars
-	./revoke-full "$1"
-	cd keys
-	mkdir -p $clientsrmdir
-
-	if [ -d $clientdir ]
-	then
-		mv $clientdir $clientsrmdir
-	else
-		echo "Client dir does not exist"
-	fi
-
-	htpasswd -D $clientslinkdir'.htpasswd' $1
-
-	echo "rmclient completed"
-	exit 0
-fi

vpngen.py

@@ -147,8 +147,6 @@ class VpnGen:
         return clients
 
     def setup_vars(self, vpn_name, variables):
-        easyrsadir = self.get_easy_rsa_dir(vpn_name)
-
         os.environ["KEY_COUNTRY"] = variables['KEY_COUNTRY']
         os.environ["KEY_PROVINCE"] = variables['KEY_PROVINCE']
         os.environ["KEY_CITY"] = variables['KEY_CITY']
@@ -161,6 +159,10 @@ class VpnGen:
         os.environ["CA_EXPIRE"] = variables['CA_EXPIRE']
         os.environ["KEY_EXPIRE"] = variables['KEY_EXPIRE']
 
+        self.setup_vars_openssl(vpn_name)
+
+    def setup_vars_openssl(self, vpn_name):
+        easyrsadir = self.get_easy_rsa_dir(vpn_name)
         os.environ["EASY_RSA"] = easyrsadir
         os.environ["OPENSSL"] = "openssl"
         os.environ["PKCS11TOOL"] = "pkcs11-tool"
@@ -262,9 +264,21 @@ class VpnGen:
         client_dir = self.get_client_dir(vpn_name, client_name)
         if not os.path.exists(client_dir):
             return VpnGenError.ClientDoesNotExists
+
+        self.setup_vars_openssl(vpn_name)
+
+        curdir = os.curdir
+        easyrsadir = self.get_easy_rsa_dir(vpn_name)
+        os.chdir(easyrsadir)
+
+        call(["./revoke-full", client_name])
+
+        os.chdir(curdir)
+
         return VpnGenError.Success
 
     def rebuild_client(self, vpn_name, client_name, variables):
+        variables["client"] = client_name
         client_dir = self.get_client_dir(vpn_name, client_name)
         client_conf_file = self.get_client_config_path(vpn_name, client_name)
         client_default_config_path = self.get_client_default_config_path(vpn_name)