rebuild clients

TODO

@@ -1,5 +1,3 @@
 Remove client
 
-Check if client has benn revoked
-
-Rebuild client(s) config(s)
+Check if client has benn revoked

vpngen-cli.py

@@ -113,12 +113,15 @@ def main():
         default_variables = config['defaults'].copy()
         default_variables.update(vpng.get_server_variables(vpn_name))
 
-        res = vpng.rebuild_clients(vpn_name)
-        if res == vpngen.VpnGenError.Success:
-            print("Clients configurations rebuilt successfully on VPN %s" % vpn_name)
-        else:
-            eprint("Failed to rebuild clients configuration on VPN %s: %s" % (vpn_name, res))
-            exit(1)
+        for client_name in vpng.get_client_list(vpn_name):
+            variables = default_variables.copy()
+            variables.update(vpng.get_client_variables(vpn_name, client_name))
+            res = vpng.rebuild_client(vpn_name, client_name, variables)
+            if res == vpngen.VpnGenError.Success:
+                print("Client %s configuration rebuilt successfully on VPN %s" % (client_name, vpn_name))
+            else:
+                eprint("Failed to rebuild client %s configuration on VPN %s: %s" % (client_name, vpn_name, res))
+                exit(1)
 
 
 main()

vpngen.py

@@ -135,6 +135,17 @@ class VpnGen:
         with open(self.get_client_variables_path(vpn_name, client_name), "r") as f:
             return json.load(f)['variables']
 
+    def get_client_list(self, vpn_name):
+        base_dir = self.get_base_dir(vpn_name)
+        files_paths = glob.glob("%sclients%s*" % (base_dir, os.sep))
+        files_names = list(map(lambda file_path: os.path.basename(file_path), files_paths))
+
+        clients = []
+        for file_name in files_names:
+            if file_name != 'client.conf' and not file_name.endswith(".tar.bz2"):
+                clients.append(file_name[0:len(file_name) - len(vpn_name) - 1])
+        return clients
+
     def setup_vars(self, vpn_name, variables):
         easyrsadir = self.get_easy_rsa_dir(vpn_name)
 
@@ -283,7 +294,6 @@ class VpnGen:
         files_names = glob.glob("%s%s*" % (client_dir, os.sep))
         files_names = list(map(lambda file_path: os.path.basename(file_path), files_names))
 
-
         call(["tar", "cfj", self.get_client_tarball_path(vpn_name, client_name),
               "-C", client_dir] + files_names)