Revize cc51ca2c

Re #8472 - Finished implementation of parse_cert_pem method that parses a subject out of a PEM formatted certificate

Added few unit tests testing this method.

src/services/cryptography.py

@@ -2 +2 @@
 import re
 
 # encryption method to be used when generating private keys
+from src.model.subject import Subject
 from src.utils.temporary_file import TemporaryFile
 
 PRIVATE_KEY_ENCRYPTION_METHOD = "-aes256"
@@ -227 +228 @@
             raise CryptographyException(OPENSSL_EXECUTABLE, args, err.decode())
 
     def parse_cert_pem(self, cert_pem):
+        """
+        Parses the given certificate in PEM format and returns the subject of the certificate
+        :param cert_pem: a certificated in a PEM format to be parsed
+        :return: a subject stored within the supplied certificate
+        """
+        # run openssl x509 to view certificate content
         args = ["x509", "-noout", "-text", "-in", "-"]
-
         result = self.__run_for_output(args, proc_input=bytes(cert_pem, encoding="utf-8")).decode()
+
+        # find the line containing the subject
         match = re.search(r"Subject:\s(.*)", result)
-        pass
-        # TODO use logger
         if match is None:
+            # TODO use logger
             print(f"Could not find subject to parse: {result}")
+            return None
         else:
-            found = re.findall(r"\s?([^=\s]+)\s?=\s?([^,\n]+)", match)
-            print(found)
-            for pair in found:
-                print(pair)
-
+            # find all attributes (key = value
+            found = re.findall(r"\s?([^c=\s]+)\s?=\s?([^,\n]+)", match.group())
+            subj = Subject()
+            for key, value in found:
+                if key == "C":
+                    subj.country = value
+                elif key == "ST":
+                    subj.state = value
+                elif key == "L":
+                    subj.locality = value
+                elif key == "O":
+                    subj.organization = value
+                elif key == "OU":
+                    subj.organization_unit = value
+                elif key == "CN":
+                    subj.common_name = value
+                elif key == "emailAddress":
+                    subj.email_address = value
+            return subj
 
 
 class CryptographyException(Exception):