summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarson Fleming <cflems@cflems.net>2024-10-02 06:10:52 -0400
committerCarson Fleming <cflems@cflems.net>2024-10-02 06:10:52 -0400
commit0333a568ef63a4da055b91d050514f2eaeba4b2b (patch)
tree527199b7ae01ddeeb0a0d1f2e16b5021b3939914
parent7179c15e4fac742a96b9c00f3b83d8dfba902e4c (diff)
downloadpgp-milter-0333a568ef63a4da055b91d050514f2eaeba4b2b.tar.gz
Even better handling
-rw-r--r--utils.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/utils.py b/utils.py
index e5eafa4..a33b13b 100644
--- a/utils.py
+++ b/utils.py
@@ -21,11 +21,16 @@ def encrypt(msg: EmailMessage, recipients: list[str]) -> tuple[EmailMessage, boo
if len(rcpt_keys) < 1:
return msg, False
- try:
- enc_msg = pgpy.PGPMessage.new(payload.as_string())
- for key in rcpt_keys:
+ encrypted = False
+ enc_msg = pgpy.PGPMessage.new(payload.as_string())
+ for key in rcpt_keys:
+ try:
enc_msg = key.encrypt(enc_msg)
- except:
+ encrypted = True
+ except:
+ continue
+
+ if not encrypted:
return msg, False
container = MIMEMultipart(