Bufgix for multi-adress keys

GnuPG/__init__.py

@@ -37,7 +37,24 @@ def private_keys( keyhome ):
 			fingerprint = line.split(':')[4]
 			keys[fingerprint] = email
 	return keys
-
+
+def mails_public_keys ( keyhome ):
+        cmd = ['/usr/bin/gpg', '--homedir', keyhome, '--list-keys', '--with-colons']
+	p = subprocess.Popen( cmd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
+	p.wait()
+	last_fingerprint = None
+	mails = dict()
+	for line in p.stdout.readlines():
+		if line[0:3] == 'uid' or line[0:3] == 'pub':
+			if ('<' not in line or '>' not in line):
+				continue
+			email = line.split('<')[1].split('>')[0]
+			fingerprint = line.split(':')[4]
+			if fingerprint:
+                            last_fingerprint = fingerprint
+			mails[email] = last_fingerprint
+	return mails
+
 def public_keys( keyhome ):
 	cmd = ['/usr/bin/gpg', '--homedir', keyhome, '--list-keys', '--with-colons']
 	p = subprocess.Popen( cmd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
@@ -49,7 +66,8 @@ def public_keys( keyhome ):
 				continue
 			email = line.split('<')[1].split('>')[0]
 			fingerprint = line.split(':')[4]
-			keys[fingerprint] = email
+			if fingerprint:
+                            keys[fingerprint] = email
 	return keys
 
 # confirms a key has a given email address
@@ -147,4 +165,4 @@ def decrypt(self):
 	def _command(self):
 		cmd = ["/usr/bin/gpg", "--trust-model", "always", "--homedir", self._keyhome, "--batch", "--yes", "--no-secmem-warning", "-a", "-d"]
 
-		return cmd
+		return cmd

README.md

@@ -31,10 +31,11 @@ This is a combined work of many developers and contributors:
 * Bruce Markey - [GitHub](https://github.com/TheEd1tor)
 * Remko Tronçon - [GitHub](https://github.com/remko/phkp/)
 * Kiritan Flux [GitHub](https://github.com/kflux)
-* Fabian Krone [GitHub] (https://github.com/fkrone/gpg-mailgate)
+* Fabian Krone [GitHub](https://github.com/fkrone/gpg-mailgate)
+* Stephan Richter [GitHub](https://github.com/keawe-software/gpg-mailgate)
 
 # To Do
 
 * rename from gpg-mailgate to openpgp-s-mime-mailgate or something.....
 * find a better solution for an own user instead of the user `nobody`
-* make PGP/INLINE decryption more reliable
+* make PGP/INLINE decryption more reliable

gpg-mailgate.py

@@ -250,7 +250,7 @@ def decrypt_inline_with_attachments( payloads, success, message = None ):
 				# There was no encrypted payload found, so the original payload is attached
 				message.attach(payload)
 
- 	return message, success
+	return message, success
 
 def decrypt_inline_without_attachments( decrypted_message ):
 
@@ -292,10 +292,19 @@ def gpg_encrypt( raw_message, recipients ):
 		log("No valid entry for gpg keyhome. Encryption aborted.")
 		return recipients
 
-	keys = GnuPG.public_keys( cfg['gpg']['keyhome'] )
+	# get a mapping from fingerpints to emails
+	keys = GnuPG.public_keys( cfg['gpg']['keyhome'] ) 
+
 	for fingerprint in keys:
 		keys[fingerprint] = sanitize_case_sense(keys[fingerprint])
-
+
+	# get a mapping form emails to fingerprins. better, since one fingerprint may belong to several emails
+	raw_emails = GnuPG.mails_public_keys( cfg['gpg']['keyhome'] )
+
+	emails = list()
+	for email in raw_emails:
+		emails.append(sanitize_case_sense(email))
+
 	gpg_to = list()
 	ungpg_to = list()
 
@@ -312,7 +321,7 @@ def gpg_encrypt( raw_message, recipients ):
 				log("Key '%s' in encrypt keymap not found in keyring for email address '%s'." % (cfg['enc_keymap'][to], to))
 
 		# Check if key in keychain is present
-		if to in keys.values() and not get_bool_from_cfg('default', 'enc_keymap_only', 'yes'):
+		if to in emails and not get_bool_from_cfg('default', 'enc_keymap_only', 'yes'):
 			gpg_to.append( (to, to) )
 			continue
 
@@ -441,7 +450,7 @@ def encrypt_all_payloads_mime( message, gpg_to_cmdline ):
 	junk_str = junk_msg.as_string()  # WTF!  Without this, get_boundary() will return 'None'!
 	boundary = junk_msg.get_boundary()
 
-    # This also modifies the boundary in the body of the message, ie it gets parsed.
+	# This also modifies the boundary in the body of the message, ie it gets parsed.
 	if message.has_key('Content-Type'):
 		message.replace_header('Content-Type', "multipart/encrypted; protocol=\"application/pgp-encrypted\";\nboundary=\"%s\"\n" % boundary)
 	else:
@@ -540,6 +549,8 @@ def smime_encrypt( raw_message, recipients ):
 
 def get_cert_for_email( to_addr, cert_path ):
 
+	if not os.path.isdir(cert_path):
+		return None
 	files_in_directory = os.listdir(cert_path)
 	for filename in files_in_directory:
 		file_path = os.path.join(cert_path, filename)