Disroot
/
gpg-lacre
9
15
Fork 4
Code Issues 29 Pull Requests 1 Releases 2 Wiki Activity

Prefere keys in keymap over keys in keyring. Could be useful if you have a recipient with two keys.

This commit is contained in:
fkrone 2015-03-29 18:16:58 +02:00
parent d3bbb82072
commit 4283c7ef4d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gpg-mailgate.py
View File

@ -79,16 +79,18 @@ def gpg_encrypt( raw_message, recipients ):
for to in recipients:
# Check if recipient is in keymap
if get_bool_from_cfg('keymap', to):
log("Keymap has key '%s'" % cfg['keymap'][to])
# Check we've got a matching key!
if cfg['keymap'][to] in keys:
gpg_to.append( (to, cfg['keymap'][to]) )
continue
else:
log("Key '%s' in keymap not found in keyring for email address '%s'." % (cfg['keymap'][to], to))
if to in keys.values() and not get_bool_from_cfg('default', 'keymap_only', 'yes'):
gpg_to.append( (to, to) )
elif get_bool_from_cfg('keymap') and to in cfg['keymap']:
log("Keymap has key '%s'" % cfg['keymap'][to] )
# Check we've got a matching key! If not, decline to attempt encryption.
if not cfg['keymap'][to] in keys:
log("Key '%s' in keymap not found in keyring for email address '%s'. Won't encrypt." % (cfg['keymap'][to], to))
ungpg_to.append(to)
else:
gpg_to.append( (to, cfg['keymap'][to]) )
else:
if verbose:
log("Recipient (%s) not in PGP domain list." % to)