author | weijun |
Thu, 18 Jul 2019 08:53:06 +0800 | |
changeset 57488 | 94691d8e746f |
permissions | -rw-r--r-- |
57488
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
1 |
/* |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
2 |
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
4 |
* |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
8 |
* |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
13 |
* accompanied this code). |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
14 |
* |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
18 |
* |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
21 |
* questions. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
22 |
*/ |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
23 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
24 |
import java.io.ByteArrayOutputStream; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
25 |
import java.security.MessageDigest; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
26 |
import java.util.ArrayList; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
27 |
import java.util.List; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
28 |
import sun.security.util.ManifestDigester; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
29 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
30 |
import org.testng.annotations.Test; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
31 |
import org.testng.annotations.DataProvider; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
32 |
import org.testng.annotations.Factory; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
33 |
import org.testng.annotations.BeforeClass; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
34 |
import org.testng.annotations.BeforeMethod; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
35 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
36 |
import static java.nio.charset.StandardCharsets.UTF_8; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
37 |
import static org.testng.Assert.*; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
38 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
39 |
/** |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
40 |
* @test |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
41 |
* @bug 8217375 |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
42 |
* @modules java.base/sun.security.util |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
43 |
* @run testng FindHeaderEndVsManifestDigesterFindFirstSection |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
44 |
* @summary Checks that {@link JarSigner#findHeaderEnd} (moved to now |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
45 |
* {@link #findHeaderEnd} in this test) can be replaced with |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
46 |
* {@link ManifestDigester#findSection} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
47 |
* (first invocation will identify main attributes) |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
48 |
* without making a difference. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
49 |
*/ |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
50 |
/* |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
51 |
* Note to future maintainer: |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
52 |
* While it might look at first glance like this test ensures backwards- |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
53 |
* compatibility between JarSigner.findHeaderEnd and |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
54 |
* ManifestDigester.findSection's first invocation that find the main |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
55 |
* attributes section, at the time of that change, this test continues to |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
56 |
* verify main attributes digestion now with ManifestDigester.findSection as |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
57 |
* opposed to previous implementation in JarSigner.findHeaderEnd. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
58 |
* Before completely removing this test, make sure that main attributes |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
59 |
* digestion is covered appropriately with tests. After JarSigner.findHeaderEnd |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
60 |
* has been removed digests should still continue to match. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
61 |
* |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
62 |
* See also |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
63 |
* - jdk/test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
64 |
* for some end-to-end tests utilizing the jarsigner tool, |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
65 |
* - jdk/test/jdk/sun/security/util/ManifestDigester/FindSection.java and |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
66 |
* - jdk/test/jdk/sun/security/util/ManifestDigester/DigestInput.java |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
67 |
* for much more detailed tests at api level |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
68 |
* |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
69 |
* Both test mentioned above, however, originally were created when removing |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
70 |
* confusion of "Manifest-Main-Attributes" individual section with actual main |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
71 |
* attributes whereas the test here is about changes related to raw manifest |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
72 |
* reproduction and in the end test pretty much the same behavior. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
73 |
*/ |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
74 |
public class FindHeaderEndVsManifestDigesterFindFirstSection { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
75 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
76 |
static final boolean FIXED_8217375 = true; // FIXME |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
77 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
78 |
/** |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
79 |
* from former {@link JarSigner#findHeaderEnd}, subject to verification if |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
80 |
* it can be replaced with {@link ManifestDigester#findSection} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
81 |
*/ |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
82 |
@SuppressWarnings("fallthrough") |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
83 |
private int findHeaderEnd(byte[] bs) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
84 |
// Initial state true to deal with empty header |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
85 |
boolean newline = true; // just met a newline |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
86 |
int len = bs.length; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
87 |
for (int i = 0; i < len; i++) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
88 |
switch (bs[i]) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
89 |
case '\r': |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
90 |
if (i < len - 1 && bs[i + 1] == '\n') i++; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
91 |
// fallthrough |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
92 |
case '\n': |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
93 |
if (newline) return i + 1; //+1 to get length |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
94 |
newline = true; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
95 |
break; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
96 |
default: |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
97 |
newline = false; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
98 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
99 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
100 |
// If header end is not found, it means the MANIFEST.MF has only |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
101 |
// the main attributes section and it does not end with 2 newlines. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
102 |
// Returns the whole length so that it can be completely replaced. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
103 |
return len; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
104 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
105 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
106 |
@DataProvider(name = "parameters") |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
107 |
public static Object[][] parameters() { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
108 |
List<Object[]> tests = new ArrayList<>(); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
109 |
for (String lineBreak : new String[] { "\n", "\r", "\r\n" }) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
110 |
if ("\r".equals(lineBreak) && !FIXED_8217375) continue; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
111 |
for (int numLBs = 0; numLBs <= 3; numLBs++) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
112 |
for (String addSection : new String[] { null, "Ignore" }) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
113 |
tests.add(new Object[] { lineBreak, numLBs, addSection }); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
114 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
115 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
116 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
117 |
return tests.toArray(new Object[tests.size()][]); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
118 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
119 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
120 |
@Factory(dataProvider = "parameters") |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
121 |
public static Object[] createTests(String lineBreak, int numLineBreaks, |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
122 |
String individualSectionName) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
123 |
return new Object[]{new FindHeaderEndVsManifestDigesterFindFirstSection( |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
124 |
lineBreak, numLineBreaks, individualSectionName |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
125 |
)}; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
126 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
127 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
128 |
final String lineBreak; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
129 |
final int numLineBreaks; // number of line breaks after main attributes |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
130 |
final String individualSectionName; // null means only main attributes |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
131 |
final byte[] rawBytes; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
132 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
133 |
FindHeaderEndVsManifestDigesterFindFirstSection(String lineBreak, |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
134 |
int numLineBreaks, String individualSectionName) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
135 |
this.lineBreak = lineBreak; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
136 |
this.numLineBreaks = numLineBreaks; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
137 |
this.individualSectionName = individualSectionName; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
138 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
139 |
rawBytes = ( |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
140 |
"oldStyle: trailing space " + lineBreak + |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
141 |
"newStyle: no trailing space" + lineBreak.repeat(numLineBreaks) + |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
142 |
// numLineBreaks < 2 will not properly delimit individual section |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
143 |
// but it does not hurt to test that anyway |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
144 |
(individualSectionName != null ? |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
145 |
"Name: " + individualSectionName + lineBreak + |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
146 |
"Ignore: nothing here" + lineBreak + |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
147 |
lineBreak |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
148 |
: "") |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
149 |
).getBytes(UTF_8); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
150 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
151 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
152 |
@BeforeMethod |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
153 |
public void verbose() { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
154 |
System.out.println("lineBreak = " + stringToIntList(lineBreak)); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
155 |
System.out.println("numLineBreaks = " + numLineBreaks); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
156 |
System.out.println("individualSectionName = " + individualSectionName); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
157 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
158 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
159 |
@FunctionalInterface |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
160 |
interface Callable { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
161 |
void call() throws Exception; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
162 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
163 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
164 |
void catchNoLineBreakAfterMainAttributes(Callable test) throws Exception { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
165 |
// manifests cannot be parsed and digested if the main attributes do |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
166 |
// not end in a blank line (double line break) or one line break |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
167 |
// immediately before eof. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
168 |
boolean failureExpected = numLineBreaks == 0 |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
169 |
&& individualSectionName == null; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
170 |
try { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
171 |
test.call(); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
172 |
if (failureExpected) fail("expected an exception"); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
173 |
} catch (NullPointerException | IllegalStateException e) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
174 |
if (!failureExpected) fail("unexpected " + e.getMessage(), e); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
175 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
176 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
177 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
178 |
/** |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
179 |
* Checks that the beginning of the manifest until position<ol> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
180 |
* <li>{@code Jarsigner.findHeaderEnd} in the previous version |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
181 |
* and</li> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
182 |
* <li>{@code ManifestDigester.getMainAttsEntry().sections[0]. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
183 |
* lengthWithBlankLine} in the new version</li> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
184 |
* </ol>produce the same offset (TODO: or the same error). |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
185 |
* The beginning of the manifest until that offset (range |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
186 |
* <pre>0 .. (offset - 1)</pre>) will be reproduced if the manifest has |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
187 |
* not changed. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
188 |
* <p> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
189 |
* Getting {@code startOfNext} of {@link ManifestDigester#findSection}'s |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
190 |
* first invokation returned {@link ManifestDigester.Position} which |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
191 |
* identifies the end offset of the main attributes is difficulted by |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
192 |
* {@link ManifestDigester#findSection} being private and therefore not |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
193 |
* directly accessible. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
194 |
*/ |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
195 |
@Test |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
196 |
public void startOfNextLengthWithBlankLine() throws Exception { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
197 |
catchNoLineBreakAfterMainAttributes(() -> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
198 |
assertEquals(lengthWithBlankLine(), findHeaderEnd(rawBytes)) |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
199 |
); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
200 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
201 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
202 |
/** |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
203 |
* Due to its private visibility, |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
204 |
* {@link ManifestDigester.Section#lengthWithBlankLine} is not directly |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
205 |
* accessible. However, calling {@link ManifestDigester.Entry#digest} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
206 |
* reveals {@code lengthWithBlankLine} as third parameter in |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
207 |
* <pre>md.update(sec.rawBytes, sec.offset, sec.lengthWithBlankLine);</pre> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
208 |
* on line ManifestDigester.java:212. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
209 |
* <p> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
210 |
* This value is the same as {@code startOfNext} of |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
211 |
* {@link ManifestDigester#findSection}'s first invocation returned |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
212 |
* {@link ManifestDigester.Position} identifying the end offset of the |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
213 |
* main attributes because<ol> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
214 |
* <li>the end offset of the main attributes is assigned to |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
215 |
* {@code startOfNext} in |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
216 |
* <pre>pos.startOfNext = i+1;</pre> in ManifestDigester.java:98</li> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
217 |
* <li>which is then passed on as the third parameter to the constructor |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
218 |
* of a new {@link ManifestDigester.Section#Section} by |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
219 |
* <pre>new Section(0, pos.endOfSection + 1, pos.startOfNext, rawBytes)));</pre> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
220 |
* in in ManifestDigester.java:128</li> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
221 |
* <li>where it is assigned to |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
222 |
* {@link ManifestDigester.Section#lengthWithBlankLine} by |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
223 |
* <pre>this.lengthWithBlankLine = lengthWithBlankLine;</pre> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
224 |
* in ManifestDigester.java:241</li> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
225 |
* <li>from where it is picked up by {@link ManifestDigester.Entry#digest} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
226 |
* in |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
227 |
* <pre>md.update(sec.rawBytes, sec.offset, sec.lengthWithBlankLine);</pre> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
228 |
* in ManifestDigester.java:212</li> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
229 |
* </ol> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
230 |
* all of which without any modification. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
231 |
*/ |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
232 |
int lengthWithBlankLine() { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
233 |
int[] lengthWithBlankLine = new int[] { 0 }; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
234 |
new ManifestDigester(rawBytes).get(ManifestDigester.MF_MAIN_ATTRS, |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
235 |
false).digest(new MessageDigest("lengthWithBlankLine") { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
236 |
@Override protected void engineReset() { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
237 |
lengthWithBlankLine[0] = 0; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
238 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
239 |
@Override protected void engineUpdate(byte b) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
240 |
lengthWithBlankLine[0]++; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
241 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
242 |
@Override protected void engineUpdate(byte[] b, int o, int l) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
243 |
lengthWithBlankLine[0] += l; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
244 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
245 |
@Override protected byte[] engineDigest() { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
246 |
return null; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
247 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
248 |
}); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
249 |
return lengthWithBlankLine[0]; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
250 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
251 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
252 |
/** |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
253 |
* Checks that the replacement of {@link JarSigner#findHeaderEnd} is |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
254 |
* actually used to reproduce manifest main attributes. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
255 |
* <p> |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
256 |
* {@link #startOfNextLengthWithBlankLine} demonstrates that |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
257 |
* {@link JarSigner#findHeaderEnd} has been replaced successfully with |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
258 |
* {@link ManifestDigester#findSection} but does not also show that the |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
259 |
* main attributes are reproduced with the same offset as before. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
260 |
* {@link #startOfNextLengthWithBlankLine} uses |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
261 |
* {@link ManifestDigester.Entry#digest} to demonstrate an equal offset |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
262 |
* calculated but {@link ManifestDigester.Entry#digest} is not necessarily |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
263 |
* the same as reproducing, especially when considering |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
264 |
* {@link ManifestDigester.Entry#oldStyle}. |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
265 |
*/ |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
266 |
@Test(enabled = FIXED_8217375) |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
267 |
public void reproduceMainAttributes() throws Exception { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
268 |
catchNoLineBreakAfterMainAttributes(() -> { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
269 |
ByteArrayOutputStream buf = new ByteArrayOutputStream(); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
270 |
ManifestDigester md = new ManifestDigester(rawBytes); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
271 |
// without 8217375 fixed the following line will not even compile |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
272 |
// so just remove it and skip the test for regression |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
273 |
md.getMainAttsEntry().reproduceRaw(buf); // FIXME |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
274 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
275 |
assertEquals(buf.size(), findHeaderEnd(rawBytes)); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
276 |
}); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
277 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
278 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
279 |
static List<Integer> stringToIntList(String string) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
280 |
byte[] bytes = string.getBytes(UTF_8); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
281 |
List<Integer> list = new ArrayList<>(); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
282 |
for (int i = 0; i < bytes.length; i++) { |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
283 |
list.add((int) bytes[i]); |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
284 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
285 |
return list; |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
286 |
} |
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
287 |
|
94691d8e746f
8217375: jarsigner breaks old signature with long lines in manifest
weijun
parents:
diff
changeset
|
288 |
} |