Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use pgpy as fallback for gpg

This commit is contained in:
Son NK 2020-10-28 17:07:53 +01:00
parent 6c816d51d6
commit 0307793666
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
email_handler.py
View File

@ -420,27 +420,16 @@ def prepare_pgp_message(orig_msg: Message, pgp_fingerprint: str, public_key: str
second.add_header("Content-Disposition", 'inline; filename="encrypted.asc"')
# encrypt original message
# ABTest between pgpy and python-gnupg
x = random.randint(0, 9)
if x >= 5:
LOG.d("encrypt using python-gnupg")
try:
encrypted_data = pgp_utils.encrypt_file(
BytesIO(orig_msg.as_bytes()), pgp_fingerprint
)
second.set_payload(encrypted_data)
except PGPException:
LOG.exception("Cannot encrypt using python-gnupg, use pgpy")
encrypted_data = pgp_utils.encrypt_file_with_pgpy(
orig_msg.as_bytes(), public_key
)
second.set_payload(str(encrypted_data))
else:
LOG.d("encrypt using pgpy")
encrypted_data = pgp_utils.encrypt_file_with_pgpy(
orig_msg.as_bytes(), public_key
# use pgpy as fallback
try:
encrypted_data = pgp_utils.encrypt_file(
BytesIO(orig_msg.as_bytes()), pgp_fingerprint
)
second.set_payload(str(encrypted_data))
second.set_payload(encrypted_data)
except PGPException:
LOG.exception("Cannot encrypt using python-gnupg, use pgpy")
encrypted = pgp_utils.encrypt_file_with_pgpy(orig_msg.as_bytes(), public_key)
second.set_payload(str(encrypted))
msg.attach(second)