teach/peret
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Sometimes gpgmail fails, so let the legacy code handle the message

Browse Source
This commit is contained in:
nemunaire 2021-09-24 10:46:55 +02:00
parent d13d93c39c
commit 8f7d6e79c5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
check.py
View File

@ -40,7 +40,7 @@ def gen_checks(gpgmail, submissions_dir, check_content=False, check_submission_h
else: else:
yield signcheck yield signcheck
if not gpgmail.valid: if gpgmail is None or not gpgmail.valid:
yield (envelope.check, [GNUPG_DIRECTORY, not skip_public_key, BETA]) yield (envelope.check, [GNUPG_DIRECTORY, not skip_public_key, BETA])
yield (signature.check, [GNUPG_DIRECTORY]) yield (signature.check, [GNUPG_DIRECTORY])
else: else:
@ -188,7 +188,10 @@ def readmail(fp):
import gnupg_mail import gnupg_mail
theEMail = fp.read() theEMail = fp.read()
try:
gpgmail = gnupg_mail.Message(theEMail.decode(), settings=gnupg_mail.Settings(log_level='debug',require_signed=True), gpg=gnupg.GPG(gnupghome=GNUPG_DIRECTORY)) gpgmail = gnupg_mail.Message(theEMail.decode(), settings=gnupg_mail.Settings(log_level='debug',require_signed=True), gpg=gnupg.GPG(gnupghome=GNUPG_DIRECTORY))
except:
gpgmail = None
cnt = email.message_from_bytes(theEMail, policy=email.policy.default) cnt = email.message_from_bytes(theEMail, policy=email.policy.default)
frm = cnt.get("From") or "someone" frm = cnt.get("From") or "someone"