Fixed issue with certificate installation of windows

hash3liZer · Oct 3, 2021 · 4c10e4e · 4c10e4e
1 parent 2415f66
commit 4c10e4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/proxverter/certgen.py b/proxverter/certgen.py
@@ -140,9 +140,11 @@ def __import_windows(self):
             stdin=subprocess.PIPE
         )
 
+        os.environ["COMSPEC"] = lpoint
+
         if comm.strip() == b"False":
             comm = subprocess.call(
-                'Import-PfxCertificate -FilePath \'{}\' -CertStoreLocation cert:\LocalMachine\Root\\'.format(self.home_paths['pfxname']),
+                'powershell.exe \'Import-PfxCertificate -FilePath "{}" -CertStoreLocation "cert:\LocalMachine\Root\\"\''.format(self.home_paths['pfxname']),
                 shell=True,
                 startupinfo=startupinfo,
                 stdout=subprocess.PIPE,
@@ -151,11 +153,8 @@ def __import_windows(self):
             )
             if comm:
                 raise SystemError("Error while importing certificate ")
-
-            os.environ["COMSPEC"] = lpoint
             return 0
         else:
-            os.environ["COMSPEC"] = lpoint
             return 1
 
     def __config_ln_firefox(self):

diff --git a/proxverter/installer.py b/proxverter/installer.py
@@ -38,7 +38,7 @@ def activate(self):
             )
 
         try:
-            cmline.communicate()
+            cmline.communicate(timeout=40)
         except subprocess.TimeoutExpired:
             return False
         finally: