From fc08813bdc23a46cc6338432053e0063d4503b8f Mon Sep 17 00:00:00 2001
From: "Piotr F. Mieszkowski" <pfm@disroot.org>
Date: Sat, 9 Dec 2023 19:48:20 +0100
Subject: [PATCH] Improve unencryptable message logs

---
 GnuPG/__init__.py | 23 ++++++++++++++++++-----
 lacre/daemon.py   |  4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/GnuPG/__init__.py b/GnuPG/__init__.py
index 4877f33..3a0beff 100644
--- a/GnuPG/__init__.py
+++ b/GnuPG/__init__.py
@@ -55,7 +55,18 @@ class EncryptionException(Exception):
 
     def __str__(self):
         """Return human-readable string representation."""
-        return f"issue: {self._issue}; to: {self._recipient}; cause: {self._cause}"
+        parts = []
+
+        if self._recipient:
+            parts.append('To: ' + self._recipient)
+
+        if self._issue:
+            parts.append('Issue: ' + self._issue)
+
+        if self._cause:
+            parts.append('Cause: ' + self._cause)
+
+        return '; '.join(parts)
 
 
 def _build_command(key_home, *args, **kwargs):
@@ -337,17 +348,19 @@ def parse_status_lines(lines: list) -> dict:
             continue
 
         if line.startswith(KEY_EXPIRED, STATUS_FD_PREFIX_LEN):
-            result['issue'] = KEY_EXPIRED
+            result['issue'] = 'key expired'
         elif line.startswith(KEY_REVOKED, STATUS_FD_PREFIX_LEN):
-            result['issue'] = KEY_REVOKED
+            result['issue'] = 'key revoked'
         elif line.startswith(NO_RECIPIENTS, STATUS_FD_PREFIX_LEN):
-            result['issue'] = NO_RECIPIENTS
+            result['issue'] = 'no recipients'
         elif line.startswith(KEY_CONSIDERED, STATUS_FD_PREFIX_LEN):
             result['key'] = line.split(b' ')[2]
         elif line.startswith(INVALID_RECIPIENT, STATUS_FD_PREFIX_LEN):
             words = line.split(b' ')
             reason_code = int(words[2])
             result['recipient'] = words[3]
-            result['cause'] = INVALID_RECIPIENT_CAUSES[reason_code]
+
+            if reason_code:
+                result['cause'] = INVALID_RECIPIENT_CAUSES[reason_code]
 
     return result
diff --git a/lacre/daemon.py b/lacre/daemon.py
index a9fb3db..8ae0c71 100644
--- a/lacre/daemon.py
+++ b/lacre/daemon.py
@@ -57,9 +57,9 @@ class MailEncryptionProxy:
                     try:
                         new_message = operation.perform(message)
                         send(new_message, operation.recipients())
-                    except EncryptionException:
+                    except EncryptionException as e:
                         # If the message can't be encrypted, deliver cleartext.
-                        LOG.exception('Unable to encrypt message, delivering in cleartext')
+                        LOG.error('Unable to encrypt message, delivering in cleartext: %s', e)
                         if not isinstance(operation, KeepIntact):
                             self._send_unencrypted(operation, message, envelope, send)
                         else: