Checks for updated gpg entry

config.example.yml

@@ -29,8 +29,8 @@ gpg: # optional
       "<p><strong>Note: This email was sent without end-to-end encryption.</strong><br>
       This mail server supports automatic PGP encryption.<br>
       Consider setting up a PGP key and publishing it to keys.openpgp.org.</p>"
-    # either text, html or both
+    # either text, html or 
+  email_http_keyserver: "https://keys.openpgp.org/vks/v1/by-email/"
 
 id_domain: "mytest" # For Message ids
 
-email_http_keyserver: "https://keys.openpgp.org/vks/v1/by-email/"

proxy.py

@@ -427,43 +427,39 @@ class EmailProxy:
 
 
     def fetch_pgp_key(self, email: str) -> bool:
-        """Checks if a PGP key exists locally or fetches it from the keyserver."""
+        """Checks if a PGP key exists locally or fetches it from the keyserver, removing old keys if necessary."""
 
-        # Check if the key exists locally
-        keys = gpg.list_keys(keys=email)
-        if keys:
-            logger.info(f"✅ PGP key for {email} found locally.")
-            return True  # Key exists locally
-
-        # Key does not exist locally, so try fetching from the keyserver
         logger.info(f"🔍 Looking up PGP key for {email} on keyserver...")
 
         # Request the key from the keyserver API
-        key_url = f"{get_conf("KEYSERVER_URL")}{email}"
+        key_url = f"{get_conf('KEYSERVER_URL')}{email}"
         try:
             response = requests.get(key_url)
 
             if response.status_code == 200:
                 key_data = response.text
-                logger.info(
-                    f"✅ Successfully retrieved PGP key for {email} from keyserver."
-                )
+                logger.info(f"✅ Successfully retrieved PGP key for {email} from keyserver.")
 
-                # Import the key into GPG
+                # Check if the key exists locally
+                existing_keys = gpg.list_keys()
+                for key in existing_keys:
+                    if email in key['uids']:
+                        logger.info(f"🔑 Found existing key for {email}, removing it...")
+                        # Remove the existing key
+                        gpg.delete_keys(key['fingerprint'], True)
+                        logger.info(f"✅ Existing key for {email} removed.")
+
+                # Import the new key into GPG
                 import_result = gpg.import_keys(key_data)
 
                 if import_result.count > 0:
-                    logger.info(
-                        f"✅ PGP key for {email} successfully imported into GPG."
-                    )
+                    logger.info(f"✅ PGP key for {email} successfully imported into GPG.")
                     return True
                 else:
                     logger.warning(f"❌ Failed to import PGP key for {email}.")
                     return False
             else:
-                logger.warning(
-                    f"❌ No PGP key found for {email}. HTTP status code: {response.status_code}"
-                )
+                logger.warning(f"❌ No PGP key found for {email}. HTTP status code: {response.status_code}")
                 return False
         except requests.exceptions.RequestException as e:
             logger.error(f"❌ Error while contacting keyserver: {e}")