Revize 932420d8

Re #8705 - Added wrapping methods and the `verify_key` method to KeyService.

src/services/key_service.py

@@ -25 +25 @@
         # generate a new private key
         private_key_pem = self.cryptography_service.create_private_key(passphrase)
 
+        # store the private key
+        private_key = self.wrap_and_store_key(passphrase, private_key_pem)
+
+        return private_key
+
+    def wrap_and_store_key(self, passphrase, private_key_pem):
+        """
+        Stores a previously unknown PK PEM/passphrase tuple in a PK repository while wrapping the tuple in a PrivateKey
+        wrapper.
+        :param passphrase: PK passphrase
+        :param private_key_pem: PK PEM
+        :return: a new PrivateKey wrapper
+        """
+        Logger.debug("Function launched.")
+
         # store generated PK and the passphrase in a wrapper
         private_key = PrivateKey(-1, private_key_pem, passphrase)
-
         # store the wrapper in the PK repository
         private_key_id = self.private_key_repository.create(private_key)
-
         # assign the generated ID to the wrapper
         private_key.private_key_id = private_key_id
+        return private_key
+
+    def wrap_custom_key(self, key_pem, passphrase):
+        """
+        Checks whether a supplied PEM/passphrase tuple is already known and tries to fetch it from a PK repository,
+        if not, stores it in a PK repository. Returns a wrapped PEM/passphrase tuple in a PrivateKey instance together
+        with its associated ID.
+        :param key_pem: target PEM
+        :param passphrase: corresponding passphrase
+        :return: PrivateKey instance
+        """
+        Logger.debug("Function launched.")
+
+        # check if the supplied key is already known
+        private_key = self.private_key_repository.find_pk(key_pem)
+
+        # if not
+        if private_key is None:
+            # store as new
+            private_key = self.wrap_and_store_key(passphrase, key_pem)
 
         return private_key
 
@@ -86 +119 @@
 
         return self.cryptography_service.extract_public_key_from_private_key(private_key.private_key,
                                                                              private_key.password)
+
+    def verify_key(self, key, passphrase):
+        """
+        Verifies whether the provided key is encrypted by the provided passphrase. If passphrase is none, verifies
+        that the provided key is unencrypted.
+        Simply calls the namesake CryptographyService method.
+        :param key: target key
+        :param passphrase: target passphrase or None
+        :return: True if the condition is fulfilled, else False
+        """
+        return self.cryptography_service.verify_key(key, passphrase)