revsuine/gpgmymail
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: revsuine:f5a0d3fddec589cc7ac96fa1252373b7fc174ecb
Branches Tags
revsuine:master
revsuine:same-encoding-as-orig
..
compare: revsuine:3ca2cca4697e13674a646e7bf92f5e2632167de9
Branches Tags
revsuine:master
revsuine:same-encoding-as-orig

No commits in common. "f5a0d3fddec589cc7ac96fa1252373b7fc174ecb" and "3ca2cca4697e13674a646e7bf92f5e2632167de9" have entirely different histories.
f5a0d3fdde ... 3ca2cca469

1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gpgmymail
View file

@ -223,8 +223,7 @@ def encrypt(
*, *,
unconditionally_encrypt: bool = False, unconditionally_encrypt: bool = False,
encoding: str = DEFAULT_ENCODING, encoding: str = DEFAULT_ENCODING,
ignore_errors: bool = False, ignore_errors: bool = False
decode_before_encrypting: bool = False
) -> str: ) -> str:
"""Encrypt given message """Encrypt given message
@ -263,7 +262,6 @@ def encrypt(
# make necessary changes to message # make necessary changes to message
# this function is quite clunky and seems to throw exceptions from time to # this function is quite clunky and seems to throw exceptions from time to
# time; if we can't make the necessary changes we want to just continue # time; if we can't make the necessary changes we want to just continue
if decode_before_encrypting:
try: try:
message = decode_email(message) message = decode_email(message)
except Exception as e: except Exception as e:
@ -307,6 +305,10 @@ def encrypt(
if key.lower() not in headers_not_to_override: if key.lower() not in headers_not_to_override:
encmsg[key] = value encmsg[key] = value
# mark as confirming to pEp: https://blog.jak-linux.org/2019/06/13/encrypted-email-storage/#pretty-easy-privacy-pp
set_email_header(encmsg, 'Subject', PEP_SUBJECT)
set_email_header(encmsg, 'X-pEp-Version', '2.1')
# we have encrypted the email, set our gpgmymail header appropriately # we have encrypted the email, set our gpgmymail header appropriately
set_email_header(encmsg, 'X-gpgmymail-Status', 'encrypted') set_email_header(encmsg, 'X-gpgmymail-Status', 'encrypted')
@ -333,8 +335,6 @@ def main() -> None:
help="Encrypt mail unconditionally. By default, mail is not encrypted if it is already encrypted.") help="Encrypt mail unconditionally. By default, mail is not encrypted if it is already encrypted.")
parser.add_argument('--ignore-errors', action="store_true", parser.add_argument('--ignore-errors', action="store_true",
help="Ignore errors at certain error-prone points of the script.") help="Ignore errors at certain error-prone points of the script.")
parser.add_argument('--decode', action="store_true",
"Attempt to decode quoted-printable and base64 parts to latin-1 before encrypting a message")
parser.add_argument('recipient', nargs='*', parser.add_argument('recipient', nargs='*',
help="Key ID or email of keys to encrypt for") help="Key ID or email of keys to encrypt for")
args = parser.parse_args() args = parser.parse_args()
@ -348,8 +348,7 @@ def main() -> None:
args.recipient, args.recipient,
unconditionally_encrypt=args.unconditional, unconditionally_encrypt=args.unconditional,
encoding=args.encoding, encoding=args.encoding,
ignore_errors=args.ignore_errors, ignore_errors=args.ignore_errors
decode_before_encrypting=args.decode
)) ))
if __name__ == '__main__': if __name__ == '__main__':