From 15de83a00f84033922a6024e141907d35a0cdad6 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 19 Sep 2008 15:53:20 +0000
Subject: [PATCH] properly handle non-standard chars in key alias.  PR 45820.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@697139 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |   4 ++++
 src/etc/testcases/taskdefs/signjar.xml        |   5 +++++
 src/etc/testcases/testkeystore                | Bin 1228 -> 2453 bytes
 .../ant/taskdefs/condition/IsSigned.java      |  18 ++++++++++++++++++
 .../tools/ant/taskdefs/SignJarTest.java       |  11 +++++++++++
 5 files changed, 38 insertions(+)

diff --git a/WHATSNEW b/WHATSNEW
index e861d425f..360578c64 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -222,6 +222,10 @@ Fixed bugs:
    regardless of their configuration.
    Bugzilla Report 37970.
 
+ * <signjar> and <issigned> didn't handle aliases with characters other
+   than numbers, letters, hyphen or underscore properly.
+   Bugzilla Report 45820.
+
 Other changes:
 --------------
 
diff --git a/src/etc/testcases/taskdefs/signjar.xml b/src/etc/testcases/taskdefs/signjar.xml
index 1d83aed77..7f9bfa092 100644
--- a/src/etc/testcases/taskdefs/signjar.xml
+++ b/src/etc/testcases/taskdefs/signjar.xml
@@ -80,6 +80,11 @@
     <assertSigned/>             
   </target>
 
+  <target name="invalidchars" depends="jar">
+    <sign alias="test@nly"/>
+    <assertSigned/>             
+  </target>
+
   <target name="maxmemory" depends="jar">
     <sign maxmemory="128m"/>
     <assertSigned/>             
diff --git a/src/etc/testcases/testkeystore b/src/etc/testcases/testkeystore
index 2fd22c9f419561c1c677578f8fb704e2600292cf..5aa6a27d484509af379aa28c8fd9a92775d964ac 100644
GIT binary patch
delta 973
zcmX@ZIaRp+-`jt085kItpqP<?qa?Ms#33)Il7WFyrrPuFav<Gr(8Snnz{kd=&Bn;W
zsKq46$jHjT(!^MPN3=0_&4kMzugcqb2pc`T)1{em`|+ZOMq1iTKklB`ID4B)?8+nV
zXEwS@IIaD5X>+7vcjOc28}%z@=Q_OEr&^J;rd~tqXvnF&qfr^_52oCUQ-2hmzAgO4
zt&;^QL87V=dAmhLL_#@Sk0|Jt-gzc*OZ0uIwD9rjp6x~#D=%)7{B@SSqD^*oa+cbf
z2=690r^st|vyM0awE0$kmb2+p*(=uHVeSPYYn|*SiU@5NN=VR(Kld?Z{{Dk{lZ6Yb
zJ&!S7evn=7&S5Sz<5TNFuZEJJFU&Q%TTl2~Uv4m*mHBeLU;FXElNOZ?U7Isa*6G*1
zIwyKry>*?*lgxO}4Kb-EcBihp$iJVuIgiPrXoE59^M4N)WS2PA*w~rh?bh$K?|36w
zEgH1u>b_YACpDGbS#f`JLzC|Vx%u<wY}~53sk?r=?@Bf2jQVZq2^^OhfAm}s-f}SZ
zbmoLjm3g@mX&2(flHH5DIEwOrFN~P7_@V3mt-BQ#vzEMX2#t6ksc>ncBrv`h8CWCq
zObsj<7?=eOnwWVFnwU;Av3OiQsb#>;#;(=oan6E;nU%pH$4~$mcg&$IY{KlJdD(gS
z<#{j>j(Q9sb_@|N3=wV&5oWlEft)z6frWvkp{1dziK&TM6o_kRWM~29qB<u9%{_2q
zU@oNCIZcc^HXmd%VytgvU}|h+I3FHyK*{grUzOl}<{zF<WQsl>!xLHBdbMZW_FIi*
z%eMIc$f$bMA+8YB9`xj)oUy5E%^APP#nZO`()}hQ`AX2x%u=mSfI*vi)0F5tucB7(
zVK{ZUaLT?Jig6)p{eDc((Ve^MrFs4TsUB0^-J7O9tv~<2r*QXlFV(Y8U03of{M$3%
z2PJNp^%)Fwm_$621-7O1=j(M{J@@2;XO9NcVpahrk%X#6`!A^M|K*i-PQUfk)q~EC
hyV*DLtYHzkcCuAqPE_qfqkR)4A8>u)U-@RA5CClZapM30

delta 43
zcmbO#e1?<f-`jt085kItfS7UfRhBg@A`iW{oV;EaQhE7pP34=pC0(bBcE|$&iiQ);

diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
index 59d5a3aa5..585fb3a78 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
@@ -23,6 +23,7 @@ import java.util.Enumeration;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.ManifestTask;
 import org.apache.tools.ant.types.DataType;
 import org.apache.tools.zip.ZipEntry;
 import org.apache.tools.zip.ZipFile;
@@ -84,6 +85,7 @@ public class IsSigned extends DataType implements Condition {
                 }
                 return false;
             }
+            name = replaceInvalidChars(name);
             boolean shortSig = jarFile.getEntry(SIG_START
                         + name.toUpperCase()
                         + SIG_END) != null;
@@ -131,4 +133,20 @@ public class IsSigned extends DataType implements Condition {
         }
         return r;
     }
+
+    private static String replaceInvalidChars(final String name) {
+        StringBuffer sb = new StringBuffer();
+        final int len = name.length();
+        boolean changes = false;
+        for (int i = 0; i < len; i++) {
+            final char ch = name.charAt(i);
+            if (ManifestTask.VALID_ATTRIBUTE_CHARS.indexOf(ch) < 0) {
+                sb.append("_");
+                changes = true;
+            } else {
+                sb.append(ch);
+            }
+        }
+        return changes ? sb.toString() : name;
+    }
 }
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
index ece8eeadb..a35bfc2de 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
@@ -70,6 +70,17 @@ public class SignJarTest extends BuildFileTest {
                    sj.isSigned());
     }
 
+    public void testInvalidChars() {
+        executeTarget("invalidchars");
+        SignJarChild sj = new SignJarChild();
+        sj.setAlias("test@nly");
+        sj.setKeystore("testkeystore");
+        sj.setStorepass("apacheant");
+        File jar = new File(getProject().getProperty("test.jar"));
+        sj.setJar(jar);
+        assertTrue(sj.isSigned());
+    }
+
     /**
      * subclass in order to get access to protected isSigned method if
      * tests and task come from different classloaders.