Cleaning up the revoke client function and starting on the create client function...

diff --git a/src/controllers/vpn.controller.js b/src/controllers/vpn.controller.js
index a2d464396d7e64c2570dc581c0c1b4bfe05aad4d..25d012770432d761ef52cef4342c34fa287ad6b6 100644 (file)
--- a/src/controllers/vpn.controller.js
+++ b/src/controllers/vpn.controller.js
@@ -56,7 +56,29 @@ module.exports = {
 
     const conn = new Client();
     conn.on( 'ready', () => {
-      const commands = [`cd /etc/openvpn/easy-rsa`, `./easyrsa build-client-full ${ clientName } nopass`, `mkdir -p /etc/openvpn/client-configs`, staticIp ? `echo "ifconfig-push ${ staticIp } 255.255.255.0" > /etc/openvpn/client-configs/${ clientName }.ccd` : 'true', `/usr/share/easy-rsa/pkitool ${ clientName }`, `openssl pkcs12 -export -in pki/issued/${ clientName }.crt -inkey pki/private/${ clientName }.key -certfile pki/ca.crt -out /etc/openvpn/client-configs/${ clientName }.p12 -passout pass:`, `openvpn --genkey --secret /etc/openvpn/client-configs/${ clientName }.tls-auth`, `cat /etc/openvpn/client-template.txt | sed "s/CLIENT_NAME/${ clientName }/" > /etc/openvpn/client-configs/${ clientName }.ovpn`, `echo "<ca>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `cat pki/ca.crt >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `echo "</ca>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `echo "<cert>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `cat pki/issued/${ clientName }.crt >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `echo "</cert>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `echo "<key>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `cat pki/private/${ clientName }.key >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `echo "</key>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `echo "<tls-auth>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `cat /etc/openvpn/client-configs/${ clientName }.tls-auth >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `echo "</tls-auth>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`, `cat /etc/openvpn/client-configs/${ clientName }.ovpn`,];
+      const commands = [
+        `cd /etc/openvpn/easy-rsa`,
+        `./easyrsa build-client-full ${ clientName } nopass`,
+        `mkdir -p /etc/openvpn/client-configs`,
+        staticIp ? `echo "ifconfig-push ${ staticIp } 255.255.255.0" > /etc/openvpn/client-configs/${ clientName }.ccd` :
+          'true', `/usr/share/easy-rsa/pkitool ${ clientName }`,
+        `openssl pkcs12 -export -in pki/issued/${ clientName }.crt -inkey pki/private/${ clientName }.key -certfile pki/ca.crt -out /etc/openvpn/client-configs/${ clientName }.p12 -passout pass:`,
+        `openvpn --genkey --secret /etc/openvpn/client-configs/${ clientName }.tls-auth`,
+        `cat /etc/openvpn/client-template.txt | sed "s/CLIENT_NAME/${ clientName }/" > /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `echo "<ca>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `cat pki/ca.crt >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `echo "</ca>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `echo "<cert>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `cat pki/issued/${ clientName }.crt >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `echo "</cert>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `echo "<key>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `cat pki/private/${ clientName }.key >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `echo "</key>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `echo "<tls-auth>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `cat /etc/openvpn/client-configs/${ clientName }.tls-auth >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `echo "</tls-auth>" >> /etc/openvpn/client-configs/${ clientName }.ovpn`,
+        `cat /etc/openvpn/client-configs/${ clientName }.ovpn`,
+      ];
 
       console.log( commands );
       console.log( [...commands].join( ' && ' ) );
@@ -97,7 +119,14 @@ module.exports = {
     const conn = new Client();
     conn.on( 'ready', () => {
       logger.warn('ready')
-      const commands = [`cd /etc/openvpn/easy-rsa`, `./easyrsa revoke ${ clientName }`, `./easyrsa gen-crl`, `cp pki/crl.pem /etc/openvpn/crl.pem`, `rm -f /etc/openvpn/client-configs/${ clientName }.ccd`, `systemctl restart openvpn@server`,];
+      const commands = [
+        `cd /etc/openvpn/easy-rsa`,
+        `./easyrsa --batch revoke ${ clientName }`,
+        `./easyrsa gen-crl`,
+        `cp pki/crl.pem /etc/openvpn/crl.pem`,
+        `rm -rf /home/charles/clients/${ clientName }.ovpn`,
+        `rm -f /etc/openvpn/ccd/${ clientName }`,
+        `sudo systemctl restart openvpn@server`,];
 
       logger.warn( commands );
       logger.warn( [...commands].join( ' && ' ) );