Revize 266e1b4d

Moved global error handlers out of the CertificateController to a separate file.
Renamed generic exception handlers.

app.py

@@ -10 +10 @@
 from src.config.connection_provider import ConnectionProvider
 from src.controllers.certificates_controller import CertController
 from src.controllers.crl_ocsp_controller import CrlOcspController
+from src.controllers.exception_handlers import handle_cryptography_exception, handle_database_exception, \
+    handle_generic_exception
 from src.exceptions.database_exception import DatabaseException
 from src.services.cryptography import CryptographyService, CryptographyException
 from src.utils.logger import Logger
@@ -93 +95 @@
 
 
 @app.errorhandler(CryptographyException)
-def cryptography_error(e, certificate_controller: CertController):
-    return certificate_controller.handle_cryptography_error(e)
+def cryptography_error(e):
+    return handle_cryptography_exception(e)
 
 
 @app.errorhandler(DatabaseException)
-def database_error(e, certificate_controller: CertController):
-    return certificate_controller.handle_database_error(e)
+def database_error(e):
+    return handle_database_exception(e)
 
 
 @app.errorhandler(Exception)
-def generic_exception(e, certificate_controller: CertController):
+def generic_exception(e):
     if isinstance(e, HTTPException):
+        # handle HTTPException exceptions here (MethodNotAllowed for example)
         Logger.warning(f""" HTTPException occurred: "{str(e)}" """)
         return str(e), e.code
-    return certificate_controller.handle_generic_exception(e)
+    return handle_generic_exception(e)
 
 
 def initialize_app(application) -> bool:

src/controllers/certificates_controller.py

@@ -65 +65 @@
 E_INVALID_EXTENSIONS = {"success": False, "data": "Error occurred while creating a certificate. "
                                                   "It may be caused by wrong format of extensions."}
 
-E_UNHANDLED_CRYPTOGRAPHY_ERROR = {"success": False, "data": "An unknown error has happened in the cryptography library."}
-E_UNHANDLED_DATABASE_ERROR = {"success": False, "data": "An unknown database error has happened."}
-E_UNHANDLED_ERROR = {"success": False, "data": "An unknown error has happened."}
-
 
 class CertController:
     USAGE_KEY_MAP = {'CA': CA_ID, 'SSL': SSL_ID, 'digitalSignature': SIGNATURE_ID, 'authentication': AUTHENTICATION_ID}
@@ -772 +768 @@
                                                                                           identity_name,
                                                                                           identity_password)
                     return Response(identity_byte_array, mimetype='application/x-pkcs12')
-
-    @staticmethod
-    def handle_cryptography_error(e):
-        Logger.error(f"An unhandled CryptographyException has been raised: {str(e)}")
-        return E_UNHANDLED_CRYPTOGRAPHY_ERROR, C_INTERNAL_SERVER_ERROR
-
-    @staticmethod
-    def handle_database_error(e):
-        Logger.error(f"An unhandled DatabaseException has been raised: {str(e)}")
-        return E_UNHANDLED_DATABASE_ERROR, C_INTERNAL_SERVER_ERROR
-
-    @staticmethod
-    def handle_generic_exception(e):
-        Logger.error(f"An unknown Exception ({type(e)}) has been raised: {str(e)}")
-        return E_UNHANDLED_ERROR, C_INTERNAL_SERVER_ERROR

src/controllers/exception_handlers.py

@@ +1 @@
+from src.controllers.return_codes import C_INTERNAL_SERVER_ERROR
+from src.utils.logger import Logger
+
+E_UNHANDLED_CRYPTOGRAPHY_ERROR = {"success": False,
+                                  "data": "An unknown error has happened in the cryptography library."}
+E_UNHANDLED_DATABASE_ERROR = {"success": False, "data": "An unknown database error has happened."}
+E_UNHANDLED_ERROR = {"success": False, "data": "An unknown error has happened."}
+
+
+def handle_cryptography_exception(e):
+    Logger.error(f"An unhandled CryptographyException has been raised: {str(e)}")
+    return E_UNHANDLED_CRYPTOGRAPHY_ERROR, C_INTERNAL_SERVER_ERROR
+
+
+def handle_database_exception(e):
+    Logger.error(f"An unhandled DatabaseException has been raised: {str(e)}")
+    return E_UNHANDLED_DATABASE_ERROR, C_INTERNAL_SERVER_ERROR
+
+
+def handle_generic_exception(e):
+    Logger.error(f"An unknown Exception ({type(e)}) has been raised: {str(e)}")
+    return E_UNHANDLED_ERROR, C_INTERNAL_SERVER_ERROR

tests/integration_tests/rest_api/certificates_test.py

@@ -3 +3 @@
 # 2->3->4->5->6->7
 # 2->8->9
 from src.controllers.certificates_controller import E_IDENTITY_NAME_NOT_SPECIFIED, E_IDENTITY_PASSWORD_NOT_SPECIFIED, \
-    E_NO_CERTIFICATES_FOUND, E_UNHANDLED_CRYPTOGRAPHY_ERROR, E_UNHANDLED_DATABASE_ERROR, E_UNHANDLED_ERROR
+    E_NO_CERTIFICATES_FOUND
+from src.controllers.exception_handlers import E_UNHANDLED_CRYPTOGRAPHY_ERROR, E_UNHANDLED_DATABASE_ERROR, \
+    E_UNHANDLED_ERROR
 from src.exceptions.database_exception import DatabaseException
 from src.model.certificate import Certificate
 from src.services.cryptography import CryptographyException