From bd02210b2be64956a952f925a2dcd35fb42f6136 Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Fri, 22 Apr 2016 12:46:33 +0200
Subject: [PATCH] mhsign: Fix key lookup of aliases when encrypting

Now mhsign can handle addresses that contain whitespace (e.g.
``markus schnalke <meillo@marmaro.de>'') in aliases. The helper
tool ap(1) is used to extract the actual addresses.
---
 test/tests/mhsign/test-mhsign |   77 +++++++++++++++++++++++++++++++++++++++++
 uip/Makefile.in               |    2 +-
 uip/mhsign.sh                 |    9 +++--
 3 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100755 test/tests/mhsign/test-mhsign

diff --git a/test/tests/mhsign/test-mhsign b/test/tests/mhsign/test-mhsign
new file mode 100755
index 0000000..7654e5f
--- /dev/null
+++ b/test/tests/mhsign/test-mhsign
@@ -0,0 +1,77 @@
+#!/bin/sh
+######################################################
+#
+# Test mhsign (correct alias expansion with -enc)
+#
+######################################################
+
+. "$MH_TEST_COMMON"
+
+
+# setup some aliases
+
+cat >"$MH_TEST_DIR/.mmh/aliases" <<!
+a1:     unknownperson
+a2:     unknownperson@example.org
+a3:     Unknown Person <unknownperson>
+a4:     Unknown Person <unknownperson@example.org>
+a5:     "Unknown Person" <unknownperson@example.org>
+a6:     (Unknown) <unknownperson@example.org> (Person)
+a7:     Unknown <unknownperson@example.org>, unknownperson@example.org
+!
+cat >>"$MH_TEST_DIR/.mmh/profile" <<!
+aliasfile: aliases
+!
+
+
+# override gpg with our own function for defined output
+
+echo '#!/bin/sh
+exit 1
+' >"$MH_TEST_DIR/bin/gpg"
+chmod +x "$MH_TEST_DIR/bin/gpg"
+export MMHPGPKEY=0x12345678
+
+
+# now test it
+
+draft=`mhpath +drafts b`
+cat >"$draft" <<!
+To: a1, a2, a3, a4, a5
+Cc: a6, a7
+Subject: mhsign -enc test
+--------
+secret
+!
+
+runandcheck "whom -noali $draft" <<!
+a1
+a2
+a3
+a4
+a5
+a6
+a7
+!
+
+runandcheck "whom -ali $draft" <<!
+unknownperson
+unknownperson@example.org
+Unknown Person <unknownperson>
+Unknown Person <unknownperson@example.org>
+"Unknown Person" <unknownperson@example.org>
+(Unknown) <unknownperson@example.org> (Person)
+Unknown <unknownperson@example.org>
+unknownperson@example.org
+!
+
+runandcheck "mhsign -enc $draft" <<!
+Could not find key for <unknownperson>
+Could not find key for <unknownperson@example.org>
+Could not find key for <unknownperson>
+Could not find key for <unknownperson@example.org>
+Could not find key for <unknownperson@example.org>
+Could not find key for <unknownperson@example.org>
+Could not find key for <unknownperson@example.org>
+Could not find key for <unknownperson@example.org>
+!
diff --git a/uip/Makefile.in b/uip/Makefile.in
index be02b67..6b7a570 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -130,7 +130,7 @@ mmhwrap: mmhwrap.sh
 	chmod +x mmhwrap
 
 mhsign: mhsign.sh
-	cp $(srcdir)/mhsign.sh mhsign
+	sed "s,%libdir%,"$(libdir)"," $(srcdir)/mhsign.sh >mhsign
 	chmod +x mhsign
 
 mhpgp: mhpgp.sh
diff --git a/uip/mhsign.sh b/uip/mhsign.sh
index 038052b..17b7489 100755
--- a/uip/mhsign.sh
+++ b/uip/mhsign.sh
@@ -108,14 +108,17 @@ lookupkeys() {
 		echo "Encryption is not supported for BCCs" >&2
 		return 1
 	fi
-		
-	for i in `whom -ali -tocc -nobcc "$1"` ; do
+
+	whom -ali -tocc -nobcc "$1" | while read i ; do
 		case "$i" in
 		'|'*)	echo "Ignoring pipe address" >&2
 			continue ;;
 		*@*)	;;
-		*)	i="$i@`hostname -f`" ;;
+		*)	a="$i@`hostname -f`" ;;
 		esac
+		# extract the actual address
+		format='%<{error}%{error}: %{text}%|%(addr{text})%>'
+		i=`%libdir%/ap -form "=$format" "$i"`
 		if k=`lookupkeyfile "$i"` ; then
 			KL="$KL $k"
 		elif k=`lookupkeyring "$i"` ; then
-- 
1.7.10.4