Better error handling, configuration hotfix (#16)

app/src/scan.py

@@ -537,11 +537,20 @@ def scan_dkim(
         if opendkim_valid and dkim_implementation_mismatch_callback:
             dkim_implementation_mismatch_callback(message, False, opendkim_valid)
 
-        return DKIMScanResult(
-            valid=False,
-            errors=[e.args[0]],
-            warnings=[],
-        )
+        if e.args[0]:
+            return DKIMScanResult(
+                valid=False,
+                errors=[e.args[0]],
+                warnings=[],
+            )
+        else:
+            LOGGER.exception("Error during DKIM signature validation")
+
+            return DKIMScanResult(
+                valid=False,
+                errors=["An unknown error occured during DKIM signature validation."],
+                warnings=[],
+            )
 
 
 def scan(

app/src/translate.py

@@ -475,6 +475,10 @@
             "h= tag not permitted in ARC-Seal header field",
             "Tag h= nie jest dozwolony w nagłówku ARC-Seal.",
         ),
+        (
+            "An unknown error occured during DKIM signature validation.",
+            "Wystąpił nieznany błąd podczas walidacji podpisu DKIM.",
+        ),
     ]
 }
 

common/config.py

@@ -59,7 +59,7 @@ class Network:
             "1. to mount it into your Docker container,\n"
             "2. to restart the containers if a new one is generated,\n"
             "3. that generated certificates may be symbolic links - their destination must also be mounted.\n\n",
-        ] = decouple.config("SSL_PRIVATE_KEY_PATH", default=None)
+        ] = decouple.config("SSL_CERTIFICATE_PATH", default=None)
 
     class UI:
         LANGUAGE: Annotated[

docker-compose.yml

@@ -28,12 +28,10 @@ services:
       dockerfile: mail_receiver/Dockerfile
     command: python3 /opt/server.py
     environment:
+      DB_URL: postgresql+psycopg2://postgres:postgres@db:5432/mailgoose
       REDIS_URL: redis://redis:6379/0
     env_file:
       - .env
-    volumes:
-      # Mounting the whole /etc/letsencrypt as the key may be a link to ../../archive/
-      - /etc/letsencrypt/:/etc/letsencrypt:ro
     ports:
       - 25:25
       - 587:587