author | jwilhelm |
Mon, 14 Jan 2019 23:05:26 +0100 | |
changeset 53293 | 64049c8e7452 |
parent 53243 | 8bea4144b21c |
parent 53291 | 8f822a19309b |
child 58242 | 94bb65cb37d3 |
permissions | -rw-r--r-- |
2 | 1 |
/* |
53291
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
2 |
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2 | 24 |
*/ |
25 |
||
26 |
package java.util.jar; |
|
27 |
||
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
28 |
import java.io.DataOutputStream; |
2 | 29 |
import java.io.FilterInputStream; |
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
30 |
import java.io.IOException; |
2 | 31 |
import java.io.InputStream; |
32 |
import java.io.OutputStream; |
|
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
33 |
import java.util.HashMap; |
2 | 34 |
import java.util.Map; |
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
35 |
|
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
36 |
import sun.security.util.SecurityProperties; |
2 | 37 |
|
53095
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
38 |
import static java.nio.charset.StandardCharsets.UTF_8; |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
39 |
|
2 | 40 |
/** |
41 |
* The Manifest class is used to maintain Manifest entry names and their |
|
42 |
* associated Attributes. There are main Manifest Attributes as well as |
|
43 |
* per-entry Attributes. For information on the Manifest format, please |
|
44 |
* see the |
|
45663
4a0cbf8f2474
8182023: some java.util.jar docs contain links to technotes
psandoz
parents:
27804
diff
changeset
|
45 |
* <a href="{@docRoot}/../specs/jar/jar.html"> |
2 | 46 |
* Manifest format specification</a>. |
47 |
* |
|
48 |
* @author David Connelly |
|
49 |
* @see Attributes |
|
50 |
* @since 1.2 |
|
51 |
*/ |
|
52 |
public class Manifest implements Cloneable { |
|
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
53 |
|
2 | 54 |
// manifest main attributes |
52159 | 55 |
private final Attributes attr = new Attributes(); |
2 | 56 |
|
57 |
// manifest entries |
|
52159 | 58 |
private final Map<String, Attributes> entries = new HashMap<>(); |
59 |
||
60 |
// associated JarVerifier, not null when called by JarFile::getManifest. |
|
61 |
private final JarVerifier jv; |
|
2 | 62 |
|
63 |
/** |
|
64 |
* Constructs a new, empty Manifest. |
|
65 |
*/ |
|
66 |
public Manifest() { |
|
52159 | 67 |
jv = null; |
2 | 68 |
} |
69 |
||
70 |
/** |
|
71 |
* Constructs a new Manifest from the specified input stream. |
|
72 |
* |
|
73 |
* @param is the input stream containing manifest data |
|
21278 | 74 |
* @throws IOException if an I/O error has occurred |
2 | 75 |
*/ |
76 |
public Manifest(InputStream is) throws IOException { |
|
52159 | 77 |
this(null, is, null); |
2 | 78 |
} |
79 |
||
80 |
/** |
|
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
81 |
* Constructs a new Manifest from the specified input stream. |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
82 |
* |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
83 |
* @param is the input stream containing manifest data |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
84 |
* @param jarFilename the name of the corresponding jar archive if available |
53291
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
85 |
* @throws IOException if an I/O error has occurred |
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
86 |
*/ |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
87 |
Manifest(InputStream is, String jarFilename) throws IOException { |
52159 | 88 |
this(null, is, jarFilename); |
89 |
} |
|
90 |
||
91 |
/** |
|
92 |
* Constructs a new Manifest from the specified input stream |
|
93 |
* and associates it with a JarVerifier. |
|
53291
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
94 |
* |
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
95 |
* @param jv the JarVerifier to use |
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
96 |
* @param is the input stream containing manifest data |
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
97 |
* @param jarFilename the name of the corresponding jar archive if available |
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
98 |
* @throws IOException if an I/O error has occurred |
52159 | 99 |
*/ |
100 |
Manifest(JarVerifier jv, InputStream is, String jarFilename) throws IOException { |
|
53291
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
101 |
read(is, jarFilename); |
52159 | 102 |
this.jv = jv; |
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
103 |
} |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
104 |
|
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
105 |
/** |
2 | 106 |
* Constructs a new Manifest that is a copy of the specified Manifest. |
107 |
* |
|
108 |
* @param man the Manifest to copy |
|
109 |
*/ |
|
110 |
public Manifest(Manifest man) { |
|
111 |
attr.putAll(man.getMainAttributes()); |
|
112 |
entries.putAll(man.getEntries()); |
|
52159 | 113 |
jv = man.jv; |
2 | 114 |
} |
115 |
||
116 |
/** |
|
117 |
* Returns the main Attributes for the Manifest. |
|
118 |
* @return the main Attributes for the Manifest |
|
119 |
*/ |
|
120 |
public Attributes getMainAttributes() { |
|
121 |
return attr; |
|
122 |
} |
|
123 |
||
124 |
/** |
|
125 |
* Returns a Map of the entries contained in this Manifest. Each entry |
|
126 |
* is represented by a String name (key) and associated Attributes (value). |
|
127 |
* The Map permits the {@code null} key, but no entry with a null key is |
|
128 |
* created by {@link #read}, nor is such an entry written by using {@link |
|
129 |
* #write}. |
|
130 |
* |
|
131 |
* @return a Map of the entries contained in this Manifest |
|
132 |
*/ |
|
133 |
public Map<String,Attributes> getEntries() { |
|
134 |
return entries; |
|
135 |
} |
|
136 |
||
137 |
/** |
|
138 |
* Returns the Attributes for the specified entry name. |
|
139 |
* This method is defined as: |
|
140 |
* <pre> |
|
141 |
* return (Attributes)getEntries().get(name) |
|
142 |
* </pre> |
|
143 |
* Though {@code null} is a valid {@code name}, when |
|
144 |
* {@code getAttributes(null)} is invoked on a {@code Manifest} |
|
145 |
* obtained from a jar file, {@code null} will be returned. While jar |
|
146 |
* files themselves do not allow {@code null}-named attributes, it is |
|
147 |
* possible to invoke {@link #getEntries} on a {@code Manifest}, and |
|
148 |
* on that result, invoke {@code put} with a null key and an |
|
149 |
* arbitrary value. Subsequent invocations of |
|
150 |
* {@code getAttributes(null)} will return the just-{@code put} |
|
151 |
* value. |
|
152 |
* <p> |
|
153 |
* Note that this method does not return the manifest's main attributes; |
|
154 |
* see {@link #getMainAttributes}. |
|
155 |
* |
|
156 |
* @param name entry name |
|
157 |
* @return the Attributes for the specified entry name |
|
158 |
*/ |
|
159 |
public Attributes getAttributes(String name) { |
|
160 |
return getEntries().get(name); |
|
161 |
} |
|
162 |
||
163 |
/** |
|
52159 | 164 |
* Returns the Attributes for the specified entry name, if trusted. |
165 |
* |
|
166 |
* @param name entry name |
|
167 |
* @return returns the same result as {@link #getAttributes(String)} |
|
168 |
* @throws SecurityException if the associated jar is signed but this entry |
|
169 |
* has been modified after signing (i.e. the section in the manifest |
|
170 |
* does not exist in SF files of all signers). |
|
171 |
*/ |
|
172 |
Attributes getTrustedAttributes(String name) { |
|
52171 | 173 |
// Note: Before the verification of MANIFEST.MF/.SF/.RSA files is done, |
174 |
// jv.isTrustedManifestEntry() isn't able to detect MANIFEST.MF change. |
|
175 |
// Users of this method should call SharedSecrets.javaUtilJarAccess() |
|
176 |
// .ensureInitialization() first. |
|
52159 | 177 |
Attributes result = getAttributes(name); |
178 |
if (result != null && jv != null && ! jv.isTrustedManifestEntry(name)) { |
|
179 |
throw new SecurityException("Untrusted manifest entry: " + name); |
|
180 |
} |
|
181 |
return result; |
|
182 |
} |
|
183 |
||
184 |
/** |
|
2 | 185 |
* Clears the main Attributes as well as the entries in this Manifest. |
186 |
*/ |
|
187 |
public void clear() { |
|
188 |
attr.clear(); |
|
189 |
entries.clear(); |
|
190 |
} |
|
191 |
||
192 |
/** |
|
193 |
* Writes the Manifest to the specified OutputStream. |
|
194 |
* Attributes.Name.MANIFEST_VERSION must be set in |
|
195 |
* MainAttributes prior to invoking this method. |
|
196 |
* |
|
197 |
* @param out the output stream |
|
198 |
* @exception IOException if an I/O error has occurred |
|
199 |
* @see #getMainAttributes |
|
200 |
*/ |
|
201 |
public void write(OutputStream out) throws IOException { |
|
202 |
DataOutputStream dos = new DataOutputStream(out); |
|
203 |
// Write out the main attributes for the manifest |
|
204 |
attr.writeMain(dos); |
|
49442 | 205 |
// Now write out the per-entry attributes |
53095
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
206 |
StringBuilder buffer = entries.isEmpty() ? null : new StringBuilder(72); |
22078
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
21278
diff
changeset
|
207 |
for (Map.Entry<String, Attributes> e : entries.entrySet()) { |
53095
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
208 |
buffer.setLength(0); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
209 |
buffer.append("Name: "); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
210 |
buffer.append(e.getKey()); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
211 |
println72(dos, buffer.toString()); |
11274
7e7196757acd
7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
smarks
parents:
5506
diff
changeset
|
212 |
e.getValue().write(dos); |
2 | 213 |
} |
214 |
dos.flush(); |
|
215 |
} |
|
216 |
||
217 |
/** |
|
53095
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
218 |
* Adds line breaks to enforce a maximum of 72 bytes per line. |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
219 |
* |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
220 |
* @deprecation Replaced with {@link #println72}. |
2 | 221 |
*/ |
53095
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
222 |
@Deprecated(since = "13") |
2 | 223 |
static void make72Safe(StringBuffer line) { |
224 |
int length = line.length(); |
|
49111
1b33025ae610
6372077: JarFile.getManifest() should handle manifest attribute name 70 bytes
rriggs
parents:
47216
diff
changeset
|
225 |
int index = 72; |
1b33025ae610
6372077: JarFile.getManifest() should handle manifest attribute name 70 bytes
rriggs
parents:
47216
diff
changeset
|
226 |
while (index < length) { |
1b33025ae610
6372077: JarFile.getManifest() should handle manifest attribute name 70 bytes
rriggs
parents:
47216
diff
changeset
|
227 |
line.insert(index, "\r\n "); |
1b33025ae610
6372077: JarFile.getManifest() should handle manifest attribute name 70 bytes
rriggs
parents:
47216
diff
changeset
|
228 |
index += 74; // + line width + line break ("\r\n") |
1b33025ae610
6372077: JarFile.getManifest() should handle manifest attribute name 70 bytes
rriggs
parents:
47216
diff
changeset
|
229 |
length += 3; // + line break ("\r\n") and space |
2 | 230 |
} |
53095
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
231 |
} |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
232 |
|
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
233 |
/** |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
234 |
* Writes {@code line} to {@code out} with line breaks and continuation |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
235 |
* spaces within the limits of 72 bytes of contents per line followed |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
236 |
* by a line break. |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
237 |
*/ |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
238 |
static void println72(OutputStream out, String line) throws IOException { |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
239 |
if (!line.isEmpty()) { |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
240 |
byte[] lineBytes = line.getBytes(UTF_8); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
241 |
int length = lineBytes.length; |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
242 |
// first line can hold one byte more than subsequent lines which |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
243 |
// start with a continuation line break space |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
244 |
out.write(lineBytes[0]); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
245 |
int pos = 1; |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
246 |
while (length - pos > 71) { |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
247 |
out.write(lineBytes, pos, 71); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
248 |
pos += 71; |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
249 |
println(out); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
250 |
out.write(' '); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
251 |
} |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
252 |
out.write(lineBytes, pos, length - pos); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
253 |
} |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
254 |
println(out); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
255 |
} |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
256 |
|
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
257 |
/** |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
258 |
* Writes a line break to {@code out}. |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
259 |
*/ |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
260 |
static void println(OutputStream out) throws IOException { |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
261 |
out.write('\r'); |
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
262 |
out.write('\n'); |
2 | 263 |
} |
264 |
||
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
265 |
static String getErrorPosition(String filename, final int lineNumber) { |
52040
d8aebcc2d3ac
8211860: Avoid reading security properties eagerly on Manifest class initialization
redestad
parents:
51879
diff
changeset
|
266 |
if (filename == null || |
d8aebcc2d3ac
8211860: Avoid reading security properties eagerly on Manifest class initialization
redestad
parents:
51879
diff
changeset
|
267 |
!SecurityProperties.INCLUDE_JAR_NAME_IN_EXCEPTIONS) { |
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
268 |
return "line " + lineNumber; |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
269 |
} |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
270 |
return "manifest of " + filename + ":" + lineNumber; |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
271 |
} |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
272 |
|
2 | 273 |
/** |
274 |
* Reads the Manifest from the specified InputStream. The entry |
|
275 |
* names and attributes read will be merged in with the current |
|
276 |
* manifest entries. |
|
277 |
* |
|
278 |
* @param is the input stream |
|
279 |
* @exception IOException if an I/O error has occurred |
|
280 |
*/ |
|
281 |
public void read(InputStream is) throws IOException { |
|
53291
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
282 |
read(is, null); |
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
283 |
} |
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
284 |
|
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
285 |
private void read(InputStream is, String jarFilename) throws IOException { |
2 | 286 |
// Buffered input stream for reading manifest data |
287 |
FastInputStream fis = new FastInputStream(is); |
|
288 |
// Line buffer |
|
289 |
byte[] lbuf = new byte[512]; |
|
290 |
// Read the main attributes for the manifest |
|
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
291 |
int lineNumber = attr.read(fis, lbuf, jarFilename, 0); |
2 | 292 |
// Total number of entries, attributes read |
293 |
int ecount = 0, acount = 0; |
|
294 |
// Average size of entry attributes |
|
295 |
int asize = 2; |
|
296 |
// Now parse the manifest entries |
|
297 |
int len; |
|
298 |
String name = null; |
|
299 |
boolean skipEmptyLines = true; |
|
300 |
byte[] lastline = null; |
|
301 |
||
302 |
while ((len = fis.readLine(lbuf)) != -1) { |
|
50413
1234ff7199c7
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest
sherman
parents:
49442
diff
changeset
|
303 |
byte c = lbuf[--len]; |
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
304 |
lineNumber++; |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
305 |
|
50413
1234ff7199c7
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest
sherman
parents:
49442
diff
changeset
|
306 |
if (c != '\n' && c != '\r') { |
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
307 |
throw new IOException("manifest line too long (" |
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
308 |
+ getErrorPosition(jarFilename, lineNumber) + ")"); |
2 | 309 |
} |
310 |
if (len > 0 && lbuf[len-1] == '\r') { |
|
311 |
--len; |
|
312 |
} |
|
313 |
if (len == 0 && skipEmptyLines) { |
|
314 |
continue; |
|
315 |
} |
|
316 |
skipEmptyLines = false; |
|
317 |
||
318 |
if (name == null) { |
|
319 |
name = parseName(lbuf, len); |
|
320 |
if (name == null) { |
|
53291
8f822a19309b
8216362: Better error message handling when there is an invalid Manifest
lancea
parents:
52171
diff
changeset
|
321 |
throw new IOException("invalid manifest format (" |
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
322 |
+ getErrorPosition(jarFilename, lineNumber) + ")"); |
2 | 323 |
} |
324 |
if (fis.peek() == ' ') { |
|
325 |
// name is wrapped |
|
326 |
lastline = new byte[len - 6]; |
|
327 |
System.arraycopy(lbuf, 6, lastline, 0, len - 6); |
|
328 |
continue; |
|
329 |
} |
|
330 |
} else { |
|
331 |
// continuation line |
|
332 |
byte[] buf = new byte[lastline.length + len - 1]; |
|
333 |
System.arraycopy(lastline, 0, buf, 0, lastline.length); |
|
334 |
System.arraycopy(lbuf, 1, buf, lastline.length, len - 1); |
|
335 |
if (fis.peek() == ' ') { |
|
336 |
// name is wrapped |
|
337 |
lastline = buf; |
|
338 |
continue; |
|
339 |
} |
|
53095
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
340 |
name = new String(buf, 0, buf.length, UTF_8); |
2 | 341 |
lastline = null; |
342 |
} |
|
343 |
Attributes attr = getAttributes(name); |
|
344 |
if (attr == null) { |
|
345 |
attr = new Attributes(asize); |
|
346 |
entries.put(name, attr); |
|
347 |
} |
|
51879
6ffa38b8da65
8207768: Improve exception messages during manifest parsing of jar archives
mbaesken
parents:
50433
diff
changeset
|
348 |
lineNumber = attr.read(fis, lbuf, jarFilename, lineNumber); |
2 | 349 |
ecount++; |
350 |
acount += attr.size(); |
|
351 |
//XXX: Fix for when the average is 0. When it is 0, |
|
352 |
// you get an Attributes object with an initial |
|
353 |
// capacity of 0, which tickles a bug in HashMap. |
|
354 |
asize = Math.max(2, acount / ecount); |
|
355 |
||
356 |
name = null; |
|
357 |
skipEmptyLines = true; |
|
358 |
} |
|
359 |
} |
|
360 |
||
361 |
private String parseName(byte[] lbuf, int len) { |
|
362 |
if (toLower(lbuf[0]) == 'n' && toLower(lbuf[1]) == 'a' && |
|
363 |
toLower(lbuf[2]) == 'm' && toLower(lbuf[3]) == 'e' && |
|
364 |
lbuf[4] == ':' && lbuf[5] == ' ') { |
|
365 |
try { |
|
53095
33a51275fee0
8066619: Fix deprecation warnings in java.util.jar
rriggs
parents:
52171
diff
changeset
|
366 |
return new String(lbuf, 6, len - 6, UTF_8); |
2 | 367 |
} |
368 |
catch (Exception e) { |
|
369 |
} |
|
370 |
} |
|
371 |
return null; |
|
372 |
} |
|
373 |
||
374 |
private int toLower(int c) { |
|
375 |
return (c >= 'A' && c <= 'Z') ? 'a' + (c - 'A') : c; |
|
376 |
} |
|
377 |
||
378 |
/** |
|
379 |
* Returns true if the specified Object is also a Manifest and has |
|
380 |
* the same main Attributes and entries. |
|
381 |
* |
|
382 |
* @param o the object to be compared |
|
383 |
* @return true if the specified Object is also a Manifest and has |
|
384 |
* the same main Attributes and entries |
|
385 |
*/ |
|
386 |
public boolean equals(Object o) { |
|
387 |
if (o instanceof Manifest) { |
|
388 |
Manifest m = (Manifest)o; |
|
389 |
return attr.equals(m.getMainAttributes()) && |
|
390 |
entries.equals(m.getEntries()); |
|
391 |
} else { |
|
392 |
return false; |
|
393 |
} |
|
394 |
} |
|
395 |
||
396 |
/** |
|
397 |
* Returns the hash code for this Manifest. |
|
398 |
*/ |
|
399 |
public int hashCode() { |
|
400 |
return attr.hashCode() + entries.hashCode(); |
|
401 |
} |
|
402 |
||
403 |
/** |
|
404 |
* Returns a shallow copy of this Manifest. The shallow copy is |
|
405 |
* implemented as follows: |
|
406 |
* <pre> |
|
407 |
* public Object clone() { return new Manifest(this); } |
|
408 |
* </pre> |
|
409 |
* @return a shallow copy of this Manifest |
|
410 |
*/ |
|
411 |
public Object clone() { |
|
412 |
return new Manifest(this); |
|
413 |
} |
|
414 |
||
415 |
/* |
|
416 |
* A fast buffered input stream for parsing manifest files. |
|
417 |
*/ |
|
418 |
static class FastInputStream extends FilterInputStream { |
|
419 |
private byte buf[]; |
|
420 |
private int count = 0; |
|
421 |
private int pos = 0; |
|
422 |
||
423 |
FastInputStream(InputStream in) { |
|
424 |
this(in, 8192); |
|
425 |
} |
|
426 |
||
427 |
FastInputStream(InputStream in, int size) { |
|
428 |
super(in); |
|
429 |
buf = new byte[size]; |
|
430 |
} |
|
431 |
||
432 |
public int read() throws IOException { |
|
433 |
if (pos >= count) { |
|
434 |
fill(); |
|
435 |
if (pos >= count) { |
|
436 |
return -1; |
|
437 |
} |
|
438 |
} |
|
11828
590711df7828
7143629: JDK jar/zip code should use unsigned library support
darcy
parents:
11274
diff
changeset
|
439 |
return Byte.toUnsignedInt(buf[pos++]); |
2 | 440 |
} |
441 |
||
442 |
public int read(byte[] b, int off, int len) throws IOException { |
|
443 |
int avail = count - pos; |
|
444 |
if (avail <= 0) { |
|
445 |
if (len >= buf.length) { |
|
446 |
return in.read(b, off, len); |
|
447 |
} |
|
448 |
fill(); |
|
449 |
avail = count - pos; |
|
450 |
if (avail <= 0) { |
|
451 |
return -1; |
|
452 |
} |
|
453 |
} |
|
454 |
if (len > avail) { |
|
455 |
len = avail; |
|
456 |
} |
|
457 |
System.arraycopy(buf, pos, b, off, len); |
|
458 |
pos += len; |
|
459 |
return len; |
|
460 |
} |
|
461 |
||
462 |
/* |
|
463 |
* Reads 'len' bytes from the input stream, or until an end-of-line |
|
464 |
* is reached. Returns the number of bytes read. |
|
465 |
*/ |
|
466 |
public int readLine(byte[] b, int off, int len) throws IOException { |
|
467 |
byte[] tbuf = this.buf; |
|
468 |
int total = 0; |
|
469 |
while (total < len) { |
|
470 |
int avail = count - pos; |
|
471 |
if (avail <= 0) { |
|
472 |
fill(); |
|
473 |
avail = count - pos; |
|
474 |
if (avail <= 0) { |
|
475 |
return -1; |
|
476 |
} |
|
477 |
} |
|
478 |
int n = len - total; |
|
479 |
if (n > avail) { |
|
480 |
n = avail; |
|
481 |
} |
|
482 |
int tpos = pos; |
|
483 |
int maxpos = tpos + n; |
|
50413
1234ff7199c7
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest
sherman
parents:
49442
diff
changeset
|
484 |
byte c = 0; |
1234ff7199c7
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest
sherman
parents:
49442
diff
changeset
|
485 |
// jar.spec.newline: CRLF | LF | CR (not followed by LF) |
1234ff7199c7
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest
sherman
parents:
49442
diff
changeset
|
486 |
while (tpos < maxpos && (c = tbuf[tpos++]) != '\n' && c != '\r'); |
1234ff7199c7
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest
sherman
parents:
49442
diff
changeset
|
487 |
if (c == '\r' && tpos < maxpos && tbuf[tpos] == '\n') { |
1234ff7199c7
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest
sherman
parents:
49442
diff
changeset
|
488 |
tpos++; |
1234ff7199c7
8200530: '\r' is not supported as "newline" in java.util.jar.Manifest
sherman
parents:
49442
diff
changeset
|
489 |
} |
2 | 490 |
n = tpos - pos; |
491 |
System.arraycopy(tbuf, pos, b, off, n); |
|
492 |
off += n; |
|
493 |
total += n; |
|
494 |
pos = tpos; |
|
50433
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
495 |
c = tbuf[tpos-1]; |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
496 |
if (c == '\n') { |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
497 |
break; |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
498 |
} |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
499 |
if (c == '\r') { |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
500 |
if (count == pos) { |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
501 |
// try to see if there is a trailing LF |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
502 |
fill(); |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
503 |
if (pos < count && tbuf[pos] == '\n') { |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
504 |
if (total < len) { |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
505 |
b[off++] = '\n'; |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
506 |
total++; |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
507 |
} else { |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
508 |
// we should always have big enough lbuf but |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
509 |
// just in case we don't, replace the last CR |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
510 |
// with LF. |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
511 |
b[off - 1] = '\n'; |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
512 |
} |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
513 |
pos++; |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
514 |
} |
2bafeb7a1f6b
8204494: Fix for 8200530 triggered regression, closed/test/jdk/security/infra/java/security/KeyStore/BouncyCastleInterop.java failed
sherman
parents:
50413
diff
changeset
|
515 |
} |
2 | 516 |
break; |
517 |
} |
|
518 |
} |
|
519 |
return total; |
|
520 |
} |
|
521 |
||
522 |
public byte peek() throws IOException { |
|
523 |
if (pos == count) |
|
524 |
fill(); |
|
12181
d7c6dd7a2bd5
7148584: Jar tools fails to generate manifest correctly when boundary condition hit
coffeys
parents:
11828
diff
changeset
|
525 |
if (pos == count) |
d7c6dd7a2bd5
7148584: Jar tools fails to generate manifest correctly when boundary condition hit
coffeys
parents:
11828
diff
changeset
|
526 |
return -1; // nothing left in buffer |
2 | 527 |
return buf[pos]; |
528 |
} |
|
529 |
||
530 |
public int readLine(byte[] b) throws IOException { |
|
531 |
return readLine(b, 0, b.length); |
|
532 |
} |
|
533 |
||
534 |
public long skip(long n) throws IOException { |
|
535 |
if (n <= 0) { |
|
536 |
return 0; |
|
537 |
} |
|
538 |
long avail = count - pos; |
|
539 |
if (avail <= 0) { |
|
540 |
return in.skip(n); |
|
541 |
} |
|
542 |
if (n > avail) { |
|
543 |
n = avail; |
|
544 |
} |
|
545 |
pos += n; |
|
546 |
return n; |
|
547 |
} |
|
548 |
||
549 |
public int available() throws IOException { |
|
550 |
return (count - pos) + in.available(); |
|
551 |
} |
|
552 |
||
553 |
public void close() throws IOException { |
|
554 |
if (in != null) { |
|
555 |
in.close(); |
|
556 |
in = null; |
|
557 |
buf = null; |
|
558 |
} |
|
559 |
} |
|
560 |
||
561 |
private void fill() throws IOException { |
|
562 |
count = pos = 0; |
|
563 |
int n = in.read(buf, 0, buf.length); |
|
564 |
if (n > 0) { |
|
565 |
count = n; |
|
566 |
} |
|
567 |
} |
|
568 |
} |
|
569 |
} |