default config; make vpn config file; copy other needed files

.gitignore

@@ -1,5 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 .idea
+/vpngen.json
+/out
 
 ### Python template
 # Byte-compiled / optimized / DLL files

vpngen-cli.py

@@ -11,8 +11,20 @@ def eprint(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
 
 
-def remove_vpn(vpng, vpn_name, force):
-    return 0
+def create_variables(variables, defaults):
+    variables_set = {}
+    for variable in variables:
+        if variable == 'name':
+            continue
+        default = defaults[variable] if variable in defaults else ''
+        print("Enter a value for '%s' ['%s']: " % (variable, default), end='', flush=True)
+        value = sys.stdin.readline()
+        value = value[:-1]
+        if value == '':
+            value = default
+        variables_set[variable] = value
+    return variables_set
+
 
 def main():
     parser = argparse.ArgumentParser(description='Manage OpenVPN VPNs')
@@ -40,10 +52,11 @@ def main():
     if client_name is not None:
         client_name = config['clientPrefix'] + client_name + config['clientSuffix']
 
-    vpng = vpngen.VpnGen()
+    vpng = vpngen.VpnGen(config['defaultConfigPath'], config['ovpnConfigPath'])
 
     if args.create:
-        res = vpng.create_vpn(vpn_name)
+        variables = create_variables(vpng.get_vpn_vars(), config['defaults']['vpn'])
+        res = vpng.create_vpn(vpn_name, variables)
         if res == vpngen.VpnGenError.Success:
             print("VPN %s created successfully" % vpn_name)
         else:
@@ -57,7 +70,8 @@ def main():
             eprint("Failed to remove VPN %s: %s" % (vpn_name, res))
             exit(1)
     elif args.create_client:
-        res = vpng.create_client(vpn_name, client_name)
+        variables = create_variables(vpng.get_vpn_vars(), config['defaults']['vpn'])
+        res = vpng.create_client(vpn_name, client_name, variables)
         if res == vpngen.VpnGenError.Success:
             print("Client %s created successfully on VPN %s" % (client_name, vpn_name))
         else:

vpngen.py

@@ -1,4 +1,8 @@
 from enum import Enum
+import os
+import os.path
+import re
+import shutil
 
 
 class VpnGenError(Enum):
@@ -10,13 +14,60 @@ class VpnGenError(Enum):
 
 
 class VpnGen:
-    def create_vpn(self, vpn_name):
-        return VpnGenError.ClientDoesNotExists
+    default_config_base_dir = ""
+    default_config_file = ""
+    ovpn_config_path = ""
+
+    def __init__(self, default_config_path, ovpn_config_path):
+        self.default_config_base_dir = default_config_path
+        self.default_config_file = "%s.conf" % default_config_path
+        self.ovpn_config_path = ovpn_config_path
+
+    def f7(self, seq):
+        seen = set()
+        seen_add = seen.add
+        return [x for x in seq if not (x in seen or seen_add(x))]
+
+    def _find_vars(self, content):
+        variables = re.findall('\$\{([^}]+)}', content)
+        variables = self.f7(variables)
+        return variables
+
+    def get_vpn_vars(self):
+        with open(self.default_config_file, "r") as f:
+            default_config = f.read()
+        variables = self._find_vars(default_config)
+        variables += ["KEY_COUNTRY", "KEY_PROVINCE", "KEY_CITY", "KEY_ORG", "KEY_EMAIL"]
+        return variables
+
+    def create_vpn(self, vpn_name, variables):
+        base_dir = "%s%s%s" % (self.ovpn_config_path, os.sep, vpn_name)
+        conf_file = "%s.conf" % base_dir
+        if os.path.exists(base_dir) or os.path.exists(conf_file):
+            return VpnGenError.VpnAlreadyExists
+
+        with open(self.default_config_file, "r") as f:
+            default_config = f.read()
+
+        variables['name'] = vpn_name
+        for variable in variables:
+            default_config = default_config.replace("${%s}" % variable, variables[variable])
+
+        os.makedirs(base_dir)
+        with open(conf_file, "w") as f:
+            f.write(default_config)
+
+        os.rmdir(base_dir)
+        shutil.copytree(self.default_config_base_dir, base_dir)
+
+
+
+        return VpnGenError.Success
 
     def remove_vpn(self, vpn_name):
         return VpnGenError.ClientDoesNotExists
 
-    def create_client(self, vpn_name, client_name):
+    def create_client(self, vpn_name, client_name, variables):
         return VpnGenError.ClientDoesNotExists
 
     def remove_client(self, vpn_name, client_name):

vpngen/default.conf

@@ -1,29 +1,29 @@
 # Server TCP/443
 mode server
 proto tcp-server
-port %%VPNPORT%%
-dev tun
+port ${port}
+dev ${dev}
 client-to-client
 
 # Keys and certificates
-ca /etc/openvpn/%%VPNNAME%%/ca.crt
-cert /etc/openvpn/%%VPNNAME%%/server.crt
-key /etc/openvpn/%%VPNNAME%%/server.key
-dh /etc/openvpn/%%VPNNAME%%/dh1024.pem
-tls-auth /etc/openvpn/%%VPNNAME%%/ta.key 1
+ca /etc/openvpn/${name}/ca.crt
+cert /etc/openvpn/${name}/server.crt
+key /etc/openvpn/${name}/server.key
+dh /etc/openvpn/${name}/dh1024.pem
+tls-auth /etc/openvpn/${name}/ta.key 1
 
 key-direction 0
 cipher AES-256-CBC
-crl-verify /etc/openvpn/%%VPNNAME%%/easy-rsa/keys/crl.pem
-client-config-dir /etc/openvpn/%%VPNNAME%%/clientsconf
+crl-verify /etc/openvpn/${name}/easy-rsa/keys/crl.pem
+client-config-dir /etc/openvpn/${name}/clientsconf
 
 # Network
-server %%VPNIPRANGE%% 255.255.255.0
+server ${net} ${mask}
 keepalive 10 120
 
 # Uncomment this to redirect client internet traffic trough VPN
-# You'll also need to add iptables rules like
-# iptables -t nat -s %%internal_subnet%%/24 -A POSTROUTING -j SNAT --to %%out_ip%%
+# You'll also need to add iptables rules like:
+# iptables -t nat -s $internal_subnet/24 -A POSTROUTING -j SNAT --to $out_ip
 #push "redirect-gateway def1 bypass-dhcp"
 
 # Security
@@ -36,5 +36,5 @@ comp-lzo
 # Log
 verb 1
 mute 20
-status /var/vpn/status-%%VPNNAME%%
-log-append /var/log/openvpn-%%VPNNAME%%.log
+status /var/vpn/status-${name}
+log-append /var/log/openvpn-${name}.log

vpngen/vpngen.json

@@ -1,8 +1,31 @@
 {
   "vpnPrefix": "vpn_",
   "vpnSuffix": "",
+
   "clientPrefix": "",
   "clientSuffix": "",
 
-  "defaultConfigPath": "/etc/vpngen/default"
+  "defaultConfigPath": "/etc/vpngen/default",
+
+  "ovpnConfigPath": "/etc/openvpn",
+
+  "defaults": {
+    "vpn": {
+      "name": "my_vpn",
+      "port": "4242",
+      "hostname": "vpn.example.com",
+      "net": "10.0.0.0",
+      "mask": "255.255.255.0",
+      "dev": "tap",
+
+      "KEY_COUNTRY": "COUNTRY",
+      "KEY_PROVINCE": "state",
+      "KEY_CITY": "City",
+      "KEY_ORG": "example",
+      "KEY_EMAIL": "root@example.com"
+    },
+    "client": {
+
+    }
+  }
 }