Revize 6c098d6e

Re #8472 - Added make_csr method that makes a CSR

Added 2 unit tests testing the added method.
Moved CryptographyService tests into a separate files

proj/services/cryptography.py

@@ -12 +12 @@
 class CryptographyService:
 
     @staticmethod
-    def _run_for_output(args=None, stdin=None, executable=OPENSSL_EXECUTABLE):
+    def subject_to_param_format(subject):
+        subj_dict = {}
+        if subject.common_name is not None:
+            subj_dict["CN"] = subject.common_name
+        if subject.country is not None:
+            subj_dict["C"] = subject.country
+        if subject.locality is not None:
+            subj_dict["L"] = subject.locality
+        if subject.state is not None:
+            subj_dict["ST"] = subject.state
+        if subject.organization is not None:
+            subj_dict["O"] = subject.organization
+        if subject.organization_unit is not None:
+            subj_dict["OU"] = subject.organization_unit
+        if subject.email_address is not None:
+            subj_dict["emailAddress"] = subject.email_address
+
+        # merge the subject into a "subj" parameter format
+        return "".join([f"/{key}={value}" for key, value in subj_dict.items()])
+
+    @staticmethod
+    def _run_for_output(args=None, proc_input=None, executable=OPENSSL_EXECUTABLE):
         """
         Launches a new process in which the given executable is run. STDIN and process arguments can be set.
         If the process ends with a non-zero then <CryptographyException> is raised.
         :param args: Arguments to be passed to the program.
-        :param stdin: String input to be passed to the stdin of the created process.
+        :param proc_input: String input to be passed to the stdin of the created process.
         :param executable: Executable to be run (defaults to openssl)
         :return: If the process ends with a zero return code then the STDOUT of the process is returned as a byte array.
         """
@@ -28 +49 @@
             args.insert(0, executable)
 
             # create a new process
-            proc = subprocess.Popen(args, stdin=subprocess.PIPE if stdin is not None else None, stdout=subprocess.PIPE,
+            proc = subprocess.Popen(args, stdin=subprocess.PIPE if proc_input is not None else None, stdout=subprocess.PIPE,
                                     stderr=subprocess.PIPE)
 
-            out, err = proc.communicate(stdin)
+            out, err = proc.communicate(proc_input)
 
             if proc.returncode != 0:
                 # if the process did not result in zero result code, then raise an exception
@@ -73 +94 @@
         assert key is not None
         assert subject is not None
 
-        subj_dict = {}
-        if subject.common_name is not None:
-            subj_dict["CN"] = subject.common_name
-        if subject.country is not None:
-            subj_dict["C"] = subject.country
-        if subject.locality is not None:
-            subj_dict["L"] = subject.locality
-        if subject.state is not None:
-            subj_dict["ST"] = subject.state
-        if subject.organization is not None:
-            subj_dict["O"] = subject.organization
-        if subject.organization_unit is not None:
-            subj_dict["OU"] = subject.organization_unit
-        if subject.email_address is not None:
-            subj_dict["emailAddress"] = subject.email_address
-
-        # merge the subject into a "subj" parameter
-        subj = "".join([f"/{key}={value}" for key, value in subj_dict.items()])
+        subj = self.subject_to_param_format(subject)
 
         with TemporaryFile("openssl.conf", config) as conf_path:
             args = ["req", "-x509", "-new", "-subj", subj,
@@ -107 +111 @@
             # if key_passphrase is not None:
             args.extend(["-passin", f"pass:{key_passphrase}"])
 
-            return self._run_for_output(args, stdin=bytes(key, encoding="utf-8")).decode()
+            return self._run_for_output(args, proc_input=bytes(key, encoding="utf-8")).decode()
+
+    def make_csr(self, subject, subject_key, subject_key_pass=None):
+        """
+        Makes a CSR (Certificate Signing Request)
+
+        :param subject: an instance of <Subject> representing the subject to be added to the CSR
+        :param subject_key: the private key of the subject to be used to generate the CSR
+        :param subject_key_pass: passphrase of the subject's private key
+        :return: byte array containing the generated certificate signing request
+        """
+
+        subj_param = self.subject_to_param_format(subject)
+
+        args = ["req", "-new", "-subj", subj_param, "-key", "-"]
+
+        if subject_key_pass is not None:
+            args.extend(["-passin", f"pass:{subject_key_pass}"])
+
+        return self._run_for_output(args, proc_input=bytes(subject_key, encoding="utf-8")).decode()
 
 
 class CryptographyException(Exception):