Revize 89aa967d

Re #8705 - Review updates.

src/controllers/certificates_controller.py

@@ -132 +132 @@
                                 return E_WRONG_PASSWORD, C_BAD_REQUEST
                             key = self.key_service.wrap_custom_key(key_pem, passphrase=None)
                         else:
-                            key = self.key_service.create_new_key()                 # if "key" exists but is empty
+                            return E_WRONG_PARAMETERS, C_BAD_REQUEST                # if "key" exists but is empty
                 else:
                     return E_WRONG_PARAMETERS, C_BAD_REQUEST
             else:
                 key = self.key_service.create_new_key()                             # if "key" does not exist
-                                                                                    # TODO Honza: line 134 / 138, should
-                                                                                    #   they both be allowed? I say one
-                                                                                    #   of those branches should return
-                                                                                    #   wrong params bad request (mby).
 
             if CA not in body or body[CA] is None:                                  # if issuer omitted (legal) or none
                 cert = self.certificate_service.create_root_ca(                     # create a root CA
@@ -167 +163 @@
                 f = self.certificate_service.create_ca if CA_ID in usages_dict and usages_dict[CA_ID] else \
                     self.certificate_service.create_end_cert
 
-                try:
-                    # noinspection PyTypeChecker
-                    cert = f(                                                           # create inter CA or end cert
-                        key,                                                            # according to whether 'CA' is among
-                        subject,                                                        # the usages' fields
-                        issuer,
-                        issuer_key,
-                        usages=usages_dict,
-                        days=body[VALIDITY_DAYS]
-                    )
-                except CryptographyException as e:
-                    return {"success": False, "data": e.message}, C_BAD_REQUEST
+                # noinspection PyTypeChecker
+                cert = f(                                                           # create inter CA or end cert
+                    key,                                                            # according to whether 'CA' is among
+                    subject,                                                        # the usages' fields
+                    issuer,
+                    issuer_key,
+                    usages=usages_dict,
+                    days=body[VALIDITY_DAYS]
+                )
 
             if cert is not None:
                 return {"success": True,