wip

Author: edewata

base/common/python/pki/keyring.py

@@ -63,8 +63,7 @@ def put_password(self, key_name, password):
 
         p = subprocess.Popen(cmd,
                              stdin=subprocess.PIPE,
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.STDOUT)
+                             stdout=subprocess.PIPE)
 
         return p.communicate(input=password)
 

base/common/python/pki/nssdb.py

@@ -339,6 +339,7 @@ def run(self,
 
         if capture_output:
             logger.debug('stdout: %s', stdout)
+            logger.debug('stderr: %s', stderr)
 
         return result
 
@@ -549,7 +550,7 @@ def module_exists(self, name):
             '-rawlist'
         ]
 
-        result = self.run(cmd, capture_output=True, check=True)
+        result = self.run(cmd, stdout=subprocess.PIPE, check=True)
         output = result.stdout.decode('utf-8')
 
         pattern = re.compile(r' name="%s"' % name)
@@ -641,7 +642,7 @@ def find_keys(self, nickname=None, token=None):
         elif logger.isEnabledFor(logging.INFO):
             cmd.append('--verbose')
 
-        result = self.run(cmd, capture_output=True, check=True, text=True)
+        result = self.run(cmd, stdout=subprocess.PIPE, check=True, text=True)
 
         return json.loads(result.stdout)
 
@@ -707,7 +708,7 @@ def create_key(
         elif logger.isEnabledFor(logging.INFO):
             cmd.append('--verbose')
 
-        result = self.run(cmd, capture_output=True, check=True, text=True,
+        result = self.run(cmd, stdout=subprocess.PIPE, check=True, text=True,
                           runas=True)
 
         return json.loads(result.stdout)

base/server/python/pki/server/deployment/pkihelper.py

@@ -878,7 +878,6 @@ def execute_using_pki(
         return subprocess.run(
             command,
             stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
             check=True,
             universal_newlines=True)
 

base/server/python/pki/server/subsystem.py

@@ -461,7 +461,6 @@ def validate_system_cert(self, tag):
             subprocess.run(
                 cmd,
                 stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
                 check=True,
                 universal_newlines=True)
 
@@ -1297,8 +1296,7 @@ def grant_database_access(
 
         self.run(
             cmd,
-            as_current_user=as_current_user,
-            capture_output=True)
+            as_current_user=as_current_user)
 
     def revoke_database_access(
             self,
@@ -1318,7 +1316,7 @@ def revoke_database_access(
         self.run(
             cmd,
             as_current_user=as_current_user,
-            capture_output=True)
+            stdout=subprocess.PIPE)
 
     def enable_replication(
             self,
@@ -1861,7 +1859,7 @@ def find_group_members(self, group_id, as_current_user=False):
         result = self.run(
             cmd,
             as_current_user=as_current_user,
-            capture_output=True)
+            stdout=subprocess.PIPE)
 
         return json.loads(result.stdout.decode())
 
@@ -1915,7 +1913,7 @@ def find_users(self, see_also=None, as_current_user=False):
         result = self.run(
             cmd,
             as_current_user=as_current_user,
-            capture_output=True)
+            stdout=subprocess.PIPE)
 
         return json.loads(result.stdout.decode())
 
@@ -1934,7 +1932,7 @@ def get_user(self, user_id, as_current_user=False):
         result = self.run(
             cmd,
             as_current_user=as_current_user,
-            capture_output=True)
+            stdout=subprocess.PIPE)
 
         return json.loads(result.stdout.decode())
 
@@ -2013,8 +2011,7 @@ def add_user(self,
 
             self.run(
                 cmd,
-                as_current_user=as_current_user,
-                capture_output=True)
+                as_current_user=as_current_user)
 
         finally:
             shutil.rmtree(tmpdir)
@@ -2054,8 +2051,7 @@ def modify_user(
 
         self.run(
             cmd,
-            as_current_user=as_current_user,
-            capture_output=True)
+            as_current_user=as_current_user)
 
     def remove_user(self, user_id, as_current_user=False):
 
@@ -2071,8 +2067,7 @@ def remove_user(self, user_id, as_current_user=False):
 
         self.run(
             cmd,
-            as_current_user=as_current_user,
-            capture_output=True)
+            as_current_user=as_current_user)
 
     def find_user_certs(
             self,
@@ -2124,8 +2119,7 @@ def add_user_cert(self, user_id,
         self.run(
             cmd,
             input=cert_data,
-            as_current_user=as_current_user,
-            capture_output=True)
+            as_current_user=as_current_user)
 
     def remove_user_cert(self, user_id, cert_id):
 
@@ -2202,6 +2196,8 @@ def remove_user_role(
     def run(self,
             args,
             input=None,  # pylint: disable=W0622
+            stdout=None,
+            stderr=None
             as_current_user=False,
             capture_output=False):
 
@@ -2255,9 +2251,6 @@ def run(self,
         if capture_output:
             stdout = subprocess.PIPE
             stderr = subprocess.PIPE
-        else:
-            stdout = None
-            stderr = None
 
         try:
             return subprocess.run(
@@ -2434,7 +2427,7 @@ def create_cert(
 
             result = self.run(
                 cmd,
-                capture_output=True)
+                stdout=subprocess.PIPE)
 
         finally:
             shutil.rmtree(tmpdir)
@@ -2571,7 +2564,7 @@ def import_cert_request(
         result = self.run(
             cmd,
             input=request_data.encode('utf-8'),
-            capture_output=True)
+            stdout=subprocess.PIPE)
 
         return json.loads(result.stdout.decode('utf-8'))