author | redestad |
Sun, 18 Oct 2015 01:43:06 +0200 | |
changeset 33235 | edfac9a33df3 |
parent 32933 | 83d50f1247bb |
child 34525 | 14d2d84cae6d |
permissions | -rw-r--r-- |
2 | 1 |
/* |
31469
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
2 |
* Copyright (c) 1997, 2015, 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 |
||
28 |
import java.io.*; |
|
29 |
import java.lang.ref.SoftReference; |
|
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
30 |
import java.net.URL; |
2 | 31 |
import java.util.*; |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
32 |
import java.util.stream.Stream; |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
33 |
import java.util.stream.StreamSupport; |
2 | 34 |
import java.util.zip.*; |
35 |
import java.security.CodeSigner; |
|
36 |
import java.security.cert.Certificate; |
|
37 |
import java.security.AccessController; |
|
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
38 |
import java.security.CodeSource; |
32834
e1dca5fe4de3
8137056: Move SharedSecrets and interface friends out of sun.misc
chegar
parents:
32037
diff
changeset
|
39 |
import jdk.internal.misc.SharedSecrets; |
2 | 40 |
import sun.security.action.GetPropertyAction; |
41 |
import sun.security.util.ManifestEntryVerifier; |
|
22578
ff8d54ac7c5c
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
weijun
parents:
22342
diff
changeset
|
42 |
import sun.security.util.SignatureFileVerifier; |
2 | 43 |
|
44 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
45 |
* The {@code JarFile} class is used to read the contents of a jar file |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
46 |
* from any file that can be opened with {@code java.io.RandomAccessFile}. |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
47 |
* It extends the class {@code java.util.zip.ZipFile} with support |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
48 |
* for reading an optional {@code Manifest} entry. The |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
49 |
* {@code Manifest} can be used to specify meta-information about the |
2 | 50 |
* jar file and its entries. |
51 |
* |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
52 |
* <p> Unless otherwise noted, passing a {@code null} argument to a constructor |
2 | 53 |
* or method in this class will cause a {@link NullPointerException} to be |
54 |
* thrown. |
|
55 |
* |
|
22316 | 56 |
* If the verify flag is on when opening a signed jar file, the content of the |
57 |
* file is verified against its signature embedded inside the file. Please note |
|
58 |
* that the verification process does not include validating the signer's |
|
59 |
* certificate. A caller should inspect the return value of |
|
60 |
* {@link JarEntry#getCodeSigners()} to further determine if the signature |
|
61 |
* can be trusted. |
|
62 |
* |
|
2 | 63 |
* @author David Connelly |
64 |
* @see Manifest |
|
65 |
* @see java.util.zip.ZipFile |
|
66 |
* @see java.util.jar.JarEntry |
|
67 |
* @since 1.2 |
|
68 |
*/ |
|
69 |
public |
|
70 |
class JarFile extends ZipFile { |
|
71 |
private SoftReference<Manifest> manRef; |
|
72 |
private JarEntry manEntry; |
|
73 |
private JarVerifier jv; |
|
74 |
private boolean jvInitialized; |
|
75 |
private boolean verify; |
|
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
76 |
|
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
77 |
// indicates if Class-Path attribute present (only valid if hasCheckedSpecialAttributes true) |
2 | 78 |
private boolean hasClassPathAttribute; |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
79 |
// true if manifest checked for special attributes |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
80 |
private volatile boolean hasCheckedSpecialAttributes; |
2 | 81 |
|
82 |
// Set up JavaUtilJarAccess in SharedSecrets |
|
83 |
static { |
|
84 |
SharedSecrets.setJavaUtilJarAccess(new JavaUtilJarAccessImpl()); |
|
85 |
} |
|
86 |
||
87 |
/** |
|
88 |
* The JAR manifest file name. |
|
89 |
*/ |
|
90 |
public static final String MANIFEST_NAME = "META-INF/MANIFEST.MF"; |
|
91 |
||
92 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
93 |
* Creates a new {@code JarFile} to read from the specified |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
94 |
* file {@code name}. The {@code JarFile} will be verified if |
2 | 95 |
* it is signed. |
96 |
* @param name the name of the jar file to be opened for reading |
|
97 |
* @throws IOException if an I/O error has occurred |
|
98 |
* @throws SecurityException if access to the file is denied |
|
99 |
* by the SecurityManager |
|
100 |
*/ |
|
101 |
public JarFile(String name) throws IOException { |
|
102 |
this(new File(name), true, ZipFile.OPEN_READ); |
|
103 |
} |
|
104 |
||
105 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
106 |
* Creates a new {@code JarFile} to read from the specified |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
107 |
* file {@code name}. |
2 | 108 |
* @param name the name of the jar file to be opened for reading |
109 |
* @param verify whether or not to verify the jar file if |
|
110 |
* it is signed. |
|
111 |
* @throws IOException if an I/O error has occurred |
|
112 |
* @throws SecurityException if access to the file is denied |
|
113 |
* by the SecurityManager |
|
114 |
*/ |
|
115 |
public JarFile(String name, boolean verify) throws IOException { |
|
116 |
this(new File(name), verify, ZipFile.OPEN_READ); |
|
117 |
} |
|
118 |
||
119 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
120 |
* Creates a new {@code JarFile} to read from the specified |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
121 |
* {@code File} object. The {@code JarFile} will be verified if |
2 | 122 |
* it is signed. |
123 |
* @param file the jar file to be opened for reading |
|
124 |
* @throws IOException if an I/O error has occurred |
|
125 |
* @throws SecurityException if access to the file is denied |
|
126 |
* by the SecurityManager |
|
127 |
*/ |
|
128 |
public JarFile(File file) throws IOException { |
|
129 |
this(file, true, ZipFile.OPEN_READ); |
|
130 |
} |
|
131 |
||
132 |
||
133 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
134 |
* Creates a new {@code JarFile} to read from the specified |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
135 |
* {@code File} object. |
2 | 136 |
* @param file the jar file to be opened for reading |
137 |
* @param verify whether or not to verify the jar file if |
|
138 |
* it is signed. |
|
139 |
* @throws IOException if an I/O error has occurred |
|
140 |
* @throws SecurityException if access to the file is denied |
|
141 |
* by the SecurityManager. |
|
142 |
*/ |
|
143 |
public JarFile(File file, boolean verify) throws IOException { |
|
144 |
this(file, verify, ZipFile.OPEN_READ); |
|
145 |
} |
|
146 |
||
147 |
||
148 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
149 |
* Creates a new {@code JarFile} to read from the specified |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
150 |
* {@code File} object in the specified mode. The mode argument |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
151 |
* must be either {@code OPEN_READ} or {@code OPEN_READ | OPEN_DELETE}. |
2 | 152 |
* |
153 |
* @param file the jar file to be opened for reading |
|
154 |
* @param verify whether or not to verify the jar file if |
|
155 |
* it is signed. |
|
156 |
* @param mode the mode in which the file is to be opened |
|
157 |
* @throws IOException if an I/O error has occurred |
|
158 |
* @throws IllegalArgumentException |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
159 |
* if the {@code mode} argument is invalid |
2 | 160 |
* @throws SecurityException if access to the file is denied |
161 |
* by the SecurityManager |
|
162 |
* @since 1.3 |
|
163 |
*/ |
|
164 |
public JarFile(File file, boolean verify, int mode) throws IOException { |
|
165 |
super(file, mode); |
|
166 |
this.verify = verify; |
|
167 |
} |
|
168 |
||
169 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
170 |
* Returns the jar file manifest, or {@code null} if none. |
2 | 171 |
* |
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
172 |
* @return the jar file manifest, or {@code null} if none |
2 | 173 |
* |
174 |
* @throws IllegalStateException |
|
175 |
* may be thrown if the jar file has been closed |
|
19047
08210fe86260
8021408: Fix misc doclint issues in java.util and java.io
darcy
parents:
18822
diff
changeset
|
176 |
* @throws IOException if an I/O error has occurred |
2 | 177 |
*/ |
178 |
public Manifest getManifest() throws IOException { |
|
179 |
return getManifestFromReference(); |
|
180 |
} |
|
181 |
||
182 |
private Manifest getManifestFromReference() throws IOException { |
|
183 |
Manifest man = manRef != null ? manRef.get() : null; |
|
184 |
||
185 |
if (man == null) { |
|
186 |
||
187 |
JarEntry manEntry = getManEntry(); |
|
188 |
||
189 |
// If found then load the manifest |
|
190 |
if (manEntry != null) { |
|
191 |
if (verify) { |
|
192 |
byte[] b = getBytes(manEntry); |
|
193 |
man = new Manifest(new ByteArrayInputStream(b)); |
|
194 |
if (!jvInitialized) { |
|
9365 | 195 |
jv = new JarVerifier(b); |
2 | 196 |
} |
197 |
} else { |
|
198 |
man = new Manifest(super.getInputStream(manEntry)); |
|
199 |
} |
|
11274
7e7196757acd
7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
smarks
parents:
9365
diff
changeset
|
200 |
manRef = new SoftReference<>(man); |
2 | 201 |
} |
202 |
} |
|
203 |
return man; |
|
204 |
} |
|
205 |
||
206 |
private native String[] getMetaInfEntryNames(); |
|
207 |
||
208 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
209 |
* Returns the {@code JarEntry} for the given entry name or |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
210 |
* {@code null} if not found. |
2 | 211 |
* |
212 |
* @param name the jar file entry name |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
213 |
* @return the {@code JarEntry} for the given entry name or |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
214 |
* {@code null} if not found. |
2 | 215 |
* |
216 |
* @throws IllegalStateException |
|
217 |
* may be thrown if the jar file has been closed |
|
218 |
* |
|
219 |
* @see java.util.jar.JarEntry |
|
220 |
*/ |
|
221 |
public JarEntry getJarEntry(String name) { |
|
222 |
return (JarEntry)getEntry(name); |
|
223 |
} |
|
224 |
||
225 |
/** |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
226 |
* Returns the {@code ZipEntry} for the given entry name or |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
227 |
* {@code null} if not found. |
2 | 228 |
* |
229 |
* @param name the jar file entry name |
|
32037
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
230 |
* @return the {@code ZipEntry} for the given entry name or |
ab4526f4ac10
8133115: docs: replace <tt> tags (obsolete in html5) for java.util.logging, java.util.prefs, java.util.zip, java.util.jar
avstepan
parents:
31469
diff
changeset
|
231 |
* {@code null} if not found |
2 | 232 |
* |
233 |
* @throws IllegalStateException |
|
234 |
* may be thrown if the jar file has been closed |
|
235 |
* |
|
236 |
* @see java.util.zip.ZipEntry |
|
237 |
*/ |
|
238 |
public ZipEntry getEntry(String name) { |
|
239 |
ZipEntry ze = super.getEntry(name); |
|
240 |
if (ze != null) { |
|
241 |
return new JarFileEntry(ze); |
|
242 |
} |
|
243 |
return null; |
|
244 |
} |
|
245 |
||
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
246 |
private class JarEntryIterator implements Enumeration<JarEntry>, |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
247 |
Iterator<JarEntry> |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
248 |
{ |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
249 |
final Enumeration<? extends ZipEntry> e = JarFile.super.entries(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
250 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
251 |
public boolean hasNext() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
252 |
return e.hasMoreElements(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
253 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
254 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
255 |
public JarEntry next() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
256 |
ZipEntry ze = e.nextElement(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
257 |
return new JarFileEntry(ze); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
258 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
259 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
260 |
public boolean hasMoreElements() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
261 |
return hasNext(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
262 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
263 |
|
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
264 |
public JarEntry nextElement() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
265 |
return next(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
266 |
} |
31469
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
267 |
|
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
268 |
public Iterator<JarEntry> asIterator() { |
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
269 |
return this; |
92cc72d2a11a
8081678: Add Stream returning methods to classes where there currently exist only Enumeration returning methods
psandoz
parents:
30786
diff
changeset
|
270 |
} |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
271 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
272 |
|
2 | 273 |
/** |
30786
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
274 |
* Returns an enumeration of the jar file entries. |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
275 |
* |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
276 |
* @return an enumeration of the jar file entries |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
277 |
* @throws IllegalStateException |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
278 |
* may be thrown if the jar file has been closed |
2 | 279 |
*/ |
280 |
public Enumeration<JarEntry> entries() { |
|
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
281 |
return new JarEntryIterator(); |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
282 |
} |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
283 |
|
30786
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
284 |
/** |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
285 |
* Returns an ordered {@code Stream} over the jar file entries. |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
286 |
* Entries appear in the {@code Stream} in the order they appear in |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
287 |
* the central directory of the jar file. |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
288 |
* |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
289 |
* @return an ordered {@code Stream} of entries in this jar file |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
290 |
* @throws IllegalStateException if the jar file has been closed |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
291 |
* @since 1.8 |
fb0d6aaea1dc
8064736: Part of java.util.jar.JarFile spec looks confusing with references to Zip
sherman
parents:
29986
diff
changeset
|
292 |
*/ |
17421
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
293 |
public Stream<JarEntry> stream() { |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
294 |
return StreamSupport.stream(Spliterators.spliterator( |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
295 |
new JarEntryIterator(), size(), |
f3fbcfe6e2cf
8012645: Stream methods on BitSet, Random, ThreadLocalRandom, ZipFile
mduigou
parents:
16117
diff
changeset
|
296 |
Spliterator.ORDERED | Spliterator.DISTINCT | |
18822
4b6be7c19547
8019395: Consolidate StreamSupport.{stream,parallelStream} into a single method
psandoz
parents:
17421
diff
changeset
|
297 |
Spliterator.IMMUTABLE | Spliterator.NONNULL), false); |
2 | 298 |
} |
299 |
||
300 |
private class JarFileEntry extends JarEntry { |
|
301 |
JarFileEntry(ZipEntry ze) { |
|
302 |
super(ze); |
|
303 |
} |
|
304 |
public Attributes getAttributes() throws IOException { |
|
305 |
Manifest man = JarFile.this.getManifest(); |
|
306 |
if (man != null) { |
|
307 |
return man.getAttributes(getName()); |
|
308 |
} else { |
|
309 |
return null; |
|
310 |
} |
|
311 |
} |
|
312 |
public Certificate[] getCertificates() { |
|
313 |
try { |
|
314 |
maybeInstantiateVerifier(); |
|
315 |
} catch (IOException e) { |
|
316 |
throw new RuntimeException(e); |
|
317 |
} |
|
318 |
if (certs == null && jv != null) { |
|
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
319 |
certs = jv.getCerts(JarFile.this, this); |
2 | 320 |
} |
321 |
return certs == null ? null : certs.clone(); |
|
322 |
} |
|
323 |
public CodeSigner[] getCodeSigners() { |
|
324 |
try { |
|
325 |
maybeInstantiateVerifier(); |
|
326 |
} catch (IOException e) { |
|
327 |
throw new RuntimeException(e); |
|
328 |
} |
|
329 |
if (signers == null && jv != null) { |
|
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
330 |
signers = jv.getCodeSigners(JarFile.this, this); |
2 | 331 |
} |
332 |
return signers == null ? null : signers.clone(); |
|
333 |
} |
|
334 |
} |
|
335 |
||
336 |
/* |
|
337 |
* Ensures that the JarVerifier has been created if one is |
|
338 |
* necessary (i.e., the jar appears to be signed.) This is done as |
|
339 |
* a quick check to avoid processing of the manifest for unsigned |
|
340 |
* jars. |
|
341 |
*/ |
|
342 |
private void maybeInstantiateVerifier() throws IOException { |
|
343 |
if (jv != null) { |
|
344 |
return; |
|
345 |
} |
|
346 |
||
347 |
if (verify) { |
|
348 |
String[] names = getMetaInfEntryNames(); |
|
349 |
if (names != null) { |
|
22078
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
350 |
for (String nameLower : names) { |
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
351 |
String name = nameLower.toUpperCase(Locale.ENGLISH); |
9365 | 352 |
if (name.endsWith(".DSA") || |
353 |
name.endsWith(".RSA") || |
|
354 |
name.endsWith(".EC") || |
|
355 |
name.endsWith(".SF")) { |
|
2 | 356 |
// Assume since we found a signature-related file |
357 |
// that the jar is signed and that we therefore |
|
358 |
// need a JarVerifier and Manifest |
|
359 |
getManifest(); |
|
360 |
return; |
|
361 |
} |
|
362 |
} |
|
363 |
} |
|
364 |
// No signature-related files; don't instantiate a |
|
365 |
// verifier |
|
366 |
verify = false; |
|
367 |
} |
|
368 |
} |
|
369 |
||
370 |
||
371 |
/* |
|
372 |
* Initializes the verifier object by reading all the manifest |
|
373 |
* entries and passing them to the verifier. |
|
374 |
*/ |
|
375 |
private void initializeVerifier() { |
|
376 |
ManifestEntryVerifier mev = null; |
|
377 |
||
378 |
// Verify "META-INF/" entries... |
|
379 |
try { |
|
380 |
String[] names = getMetaInfEntryNames(); |
|
381 |
if (names != null) { |
|
22078
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
382 |
for (String name : names) { |
22578
ff8d54ac7c5c
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
weijun
parents:
22342
diff
changeset
|
383 |
String uname = name.toUpperCase(Locale.ENGLISH); |
ff8d54ac7c5c
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
weijun
parents:
22342
diff
changeset
|
384 |
if (MANIFEST_NAME.equals(uname) |
ff8d54ac7c5c
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
weijun
parents:
22342
diff
changeset
|
385 |
|| SignatureFileVerifier.isBlockOrSF(uname)) { |
ff8d54ac7c5c
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
weijun
parents:
22342
diff
changeset
|
386 |
JarEntry e = getJarEntry(name); |
ff8d54ac7c5c
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
weijun
parents:
22342
diff
changeset
|
387 |
if (e == null) { |
ff8d54ac7c5c
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
weijun
parents:
22342
diff
changeset
|
388 |
throw new JarException("corrupted jar file"); |
ff8d54ac7c5c
8031572: jarsigner -verify exits with 0 when a jar file is not properly signed
weijun
parents:
22342
diff
changeset
|
389 |
} |
2 | 390 |
if (mev == null) { |
391 |
mev = new ManifestEntryVerifier |
|
392 |
(getManifestFromReference()); |
|
393 |
} |
|
9365 | 394 |
byte[] b = getBytes(e); |
395 |
if (b != null && b.length > 0) { |
|
396 |
jv.beginEntry(e, mev); |
|
397 |
jv.update(b.length, b, 0, b.length, mev); |
|
398 |
jv.update(-1, null, 0, 0, mev); |
|
399 |
} |
|
2 | 400 |
} |
401 |
} |
|
402 |
} |
|
403 |
} catch (IOException ex) { |
|
404 |
// if we had an error parsing any blocks, just |
|
405 |
// treat the jar file as being unsigned |
|
406 |
jv = null; |
|
407 |
verify = false; |
|
16082 | 408 |
if (JarVerifier.debug != null) { |
409 |
JarVerifier.debug.println("jarfile parsing error!"); |
|
410 |
ex.printStackTrace(); |
|
411 |
} |
|
2 | 412 |
} |
413 |
||
414 |
// if after initializing the verifier we have nothing |
|
415 |
// signed, we null it out. |
|
416 |
||
417 |
if (jv != null) { |
|
418 |
||
419 |
jv.doneWithMeta(); |
|
420 |
if (JarVerifier.debug != null) { |
|
421 |
JarVerifier.debug.println("done with meta!"); |
|
422 |
} |
|
423 |
||
424 |
if (jv.nothingToVerify()) { |
|
425 |
if (JarVerifier.debug != null) { |
|
426 |
JarVerifier.debug.println("nothing to verify!"); |
|
427 |
} |
|
428 |
jv = null; |
|
429 |
verify = false; |
|
430 |
} |
|
431 |
} |
|
432 |
} |
|
433 |
||
434 |
/* |
|
435 |
* Reads all the bytes for a given entry. Used to process the |
|
436 |
* META-INF files. |
|
437 |
*/ |
|
438 |
private byte[] getBytes(ZipEntry ze) throws IOException { |
|
16082 | 439 |
try (InputStream is = super.getInputStream(ze)) { |
32933 | 440 |
int len = (int)ze.getSize(); |
33235
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
441 |
int bytesRead; |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
442 |
byte[] b; |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
443 |
// trust specified entry sizes when reasonably small |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
444 |
if (len != -1 && len <= 65535) { |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
445 |
b = new byte[len]; |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
446 |
bytesRead = is.readNBytes(b, 0, len); |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
447 |
} else { |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
448 |
b = is.readAllBytes(); |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
449 |
bytesRead = b.length; |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
450 |
} |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
451 |
if (len != -1 && len != bytesRead) { |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
452 |
throw new EOFException("Expected:" + len + ", read:" + bytesRead); |
edfac9a33df3
8139706: JarFile.getBytes could use InputStream.readNBytes
redestad
parents:
32933
diff
changeset
|
453 |
} |
32933 | 454 |
return b; |
8553
46c2babb1e44
7021582: convert jar/zip code and tests to use try-with-resources
smarks
parents:
8387
diff
changeset
|
455 |
} |
2 | 456 |
} |
457 |
||
458 |
/** |
|
459 |
* Returns an input stream for reading the contents of the specified |
|
460 |
* zip file entry. |
|
461 |
* @param ze the zip file entry |
|
462 |
* @return an input stream for reading the contents of the specified |
|
463 |
* zip file entry |
|
464 |
* @throws ZipException if a zip file format error has occurred |
|
465 |
* @throws IOException if an I/O error has occurred |
|
466 |
* @throws SecurityException if any of the jar file entries |
|
467 |
* are incorrectly signed. |
|
468 |
* @throws IllegalStateException |
|
469 |
* may be thrown if the jar file has been closed |
|
470 |
*/ |
|
471 |
public synchronized InputStream getInputStream(ZipEntry ze) |
|
472 |
throws IOException |
|
473 |
{ |
|
474 |
maybeInstantiateVerifier(); |
|
475 |
if (jv == null) { |
|
476 |
return super.getInputStream(ze); |
|
477 |
} |
|
478 |
if (!jvInitialized) { |
|
479 |
initializeVerifier(); |
|
480 |
jvInitialized = true; |
|
481 |
// could be set to null after a call to |
|
482 |
// initializeVerifier if we have nothing to |
|
483 |
// verify |
|
484 |
if (jv == null) |
|
485 |
return super.getInputStream(ze); |
|
486 |
} |
|
487 |
||
488 |
// wrap a verifier stream around the real stream |
|
489 |
return new JarVerifier.VerifierStream( |
|
490 |
getManifestFromReference(), |
|
491 |
ze instanceof JarFileEntry ? |
|
492 |
(JarEntry) ze : getJarEntry(ze.getName()), |
|
493 |
super.getInputStream(ze), |
|
494 |
jv); |
|
495 |
} |
|
496 |
||
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
497 |
// Statics for hand-coded Boyer-Moore search |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
498 |
private static final char[] CLASSPATH_CHARS = {'c','l','a','s','s','-','p','a','t','h'}; |
2 | 499 |
// The bad character shift for "class-path" |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
500 |
private static final int[] CLASSPATH_LASTOCC; |
2 | 501 |
// The good suffix shift for "class-path" |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
502 |
private static final int[] CLASSPATH_OPTOSFT; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
503 |
|
2 | 504 |
static { |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
505 |
CLASSPATH_LASTOCC = new int[128]; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
506 |
CLASSPATH_OPTOSFT = new int[10]; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
507 |
CLASSPATH_LASTOCC[(int)'c'] = 1; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
508 |
CLASSPATH_LASTOCC[(int)'l'] = 2; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
509 |
CLASSPATH_LASTOCC[(int)'s'] = 5; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
510 |
CLASSPATH_LASTOCC[(int)'-'] = 6; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
511 |
CLASSPATH_LASTOCC[(int)'p'] = 7; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
512 |
CLASSPATH_LASTOCC[(int)'a'] = 8; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
513 |
CLASSPATH_LASTOCC[(int)'t'] = 9; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
514 |
CLASSPATH_LASTOCC[(int)'h'] = 10; |
2 | 515 |
for (int i=0; i<9; i++) |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
516 |
CLASSPATH_OPTOSFT[i] = 10; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
517 |
CLASSPATH_OPTOSFT[9]=1; |
2 | 518 |
} |
519 |
||
520 |
private JarEntry getManEntry() { |
|
521 |
if (manEntry == null) { |
|
522 |
// First look up manifest entry using standard name |
|
523 |
manEntry = getJarEntry(MANIFEST_NAME); |
|
524 |
if (manEntry == null) { |
|
525 |
// If not found, then iterate through all the "META-INF/" |
|
526 |
// entries to find a match. |
|
527 |
String[] names = getMetaInfEntryNames(); |
|
528 |
if (names != null) { |
|
22078
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
529 |
for (String name : names) { |
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
530 |
if (MANIFEST_NAME.equals(name.toUpperCase(Locale.ENGLISH))) { |
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
531 |
manEntry = getJarEntry(name); |
2 | 532 |
break; |
533 |
} |
|
534 |
} |
|
535 |
} |
|
536 |
} |
|
537 |
} |
|
538 |
return manEntry; |
|
539 |
} |
|
540 |
||
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
541 |
/** |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
542 |
* Returns {@code true} iff this JAR file has a manifest with the |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
543 |
* Class-Path attribute |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
544 |
*/ |
2 | 545 |
boolean hasClassPathAttribute() throws IOException { |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
546 |
checkForSpecialAttributes(); |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
547 |
return hasClassPathAttribute; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
548 |
} |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
549 |
|
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
550 |
/** |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
551 |
* Returns true if the pattern {@code src} is found in {@code b}. |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
552 |
* The {@code lastOcc} and {@code optoSft} arrays are the precomputed |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
553 |
* bad character and good suffix shifts. |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
554 |
*/ |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
555 |
private boolean match(char[] src, byte[] b, int[] lastOcc, int[] optoSft) { |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
556 |
int len = src.length; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
557 |
int last = b.length - len; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
558 |
int i = 0; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
559 |
next: |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
560 |
while (i<=last) { |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
561 |
for (int j=(len-1); j>=0; j--) { |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
562 |
char c = (char) b[i+j]; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
563 |
c = (((c-'A')|('Z'-c)) >= 0) ? (char)(c + 32) : c; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
564 |
if (c != src[j]) { |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
565 |
i += Math.max(j + 1 - lastOcc[c&0x7F], optoSft[j]); |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
566 |
continue next; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
567 |
} |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
568 |
} |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
569 |
return true; |
2 | 570 |
} |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
571 |
return false; |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
572 |
} |
2 | 573 |
|
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
574 |
/** |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
575 |
* On first invocation, check if the JAR file has the Class-Path |
19409 | 576 |
* attribute. A no-op on subsequent calls. |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
577 |
*/ |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
578 |
private void checkForSpecialAttributes() throws IOException { |
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
579 |
if (hasCheckedSpecialAttributes) return; |
27565 | 580 |
JarEntry manEntry = getManEntry(); |
581 |
if (manEntry != null) { |
|
582 |
byte[] b = getBytes(manEntry); |
|
583 |
if (match(CLASSPATH_CHARS, b, CLASSPATH_LASTOCC, CLASSPATH_OPTOSFT)) |
|
584 |
hasClassPathAttribute = true; |
|
2 | 585 |
} |
16023
58ecc1b8327b
8008290: (profiles) Startup regression due to additional checking of JAR file manifests
alanb
parents:
11274
diff
changeset
|
586 |
hasCheckedSpecialAttributes = true; |
2 | 587 |
} |
588 |
||
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
589 |
private synchronized void ensureInitialization() { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
590 |
try { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
591 |
maybeInstantiateVerifier(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
592 |
} catch (IOException e) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
593 |
throw new RuntimeException(e); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
594 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
595 |
if (jv != null && !jvInitialized) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
596 |
initializeVerifier(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
597 |
jvInitialized = true; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
598 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
599 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
600 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
601 |
JarEntry newEntry(ZipEntry ze) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
602 |
return new JarFileEntry(ze); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
603 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
604 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
605 |
Enumeration<String> entryNames(CodeSource[] cs) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
606 |
ensureInitialization(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
607 |
if (jv != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
608 |
return jv.entryNames(this, cs); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
609 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
610 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
611 |
/* |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
612 |
* JAR file has no signed content. Is there a non-signing |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
613 |
* code source? |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
614 |
*/ |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
615 |
boolean includeUnsigned = false; |
22078
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
616 |
for (CodeSource c : cs) { |
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
617 |
if (c.getCodeSigners() == null) { |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
618 |
includeUnsigned = true; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
619 |
break; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
620 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
621 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
622 |
if (includeUnsigned) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
623 |
return unsignedEntryNames(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
624 |
} else { |
29986
97167d851fc4
8078467: Update core libraries to use diamond with anonymous classes
darcy
parents:
27565
diff
changeset
|
625 |
return new Enumeration<>() { |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
626 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
627 |
public boolean hasMoreElements() { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
628 |
return false; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
629 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
630 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
631 |
public String nextElement() { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
632 |
throw new NoSuchElementException(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
633 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
634 |
}; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
635 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
636 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
637 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
638 |
/** |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
639 |
* Returns an enumeration of the zip file entries |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
640 |
* excluding internal JAR mechanism entries and including |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
641 |
* signed entries missing from the ZIP directory. |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
642 |
*/ |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
643 |
Enumeration<JarEntry> entries2() { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
644 |
ensureInitialization(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
645 |
if (jv != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
646 |
return jv.entries2(this, super.entries()); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
647 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
648 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
649 |
// screen out entries which are never signed |
11274
7e7196757acd
7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
smarks
parents:
9365
diff
changeset
|
650 |
final Enumeration<? extends ZipEntry> enum_ = super.entries(); |
29986
97167d851fc4
8078467: Update core libraries to use diamond with anonymous classes
darcy
parents:
27565
diff
changeset
|
651 |
return new Enumeration<>() { |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
652 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
653 |
ZipEntry entry; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
654 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
655 |
public boolean hasMoreElements() { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
656 |
if (entry != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
657 |
return true; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
658 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
659 |
while (enum_.hasMoreElements()) { |
11274
7e7196757acd
7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
smarks
parents:
9365
diff
changeset
|
660 |
ZipEntry ze = enum_.nextElement(); |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
661 |
if (JarVerifier.isSigningRelated(ze.getName())) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
662 |
continue; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
663 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
664 |
entry = ze; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
665 |
return true; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
666 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
667 |
return false; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
668 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
669 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
670 |
public JarFileEntry nextElement() { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
671 |
if (hasMoreElements()) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
672 |
ZipEntry ze = entry; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
673 |
entry = null; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
674 |
return new JarFileEntry(ze); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
675 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
676 |
throw new NoSuchElementException(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
677 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
678 |
}; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
679 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
680 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
681 |
CodeSource[] getCodeSources(URL url) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
682 |
ensureInitialization(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
683 |
if (jv != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
684 |
return jv.getCodeSources(this, url); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
685 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
686 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
687 |
/* |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
688 |
* JAR file has no signed content. Is there a non-signing |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
689 |
* code source? |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
690 |
*/ |
11274
7e7196757acd
7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
smarks
parents:
9365
diff
changeset
|
691 |
Enumeration<String> unsigned = unsignedEntryNames(); |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
692 |
if (unsigned.hasMoreElements()) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
693 |
return new CodeSource[]{JarVerifier.getUnsignedCS(url)}; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
694 |
} else { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
695 |
return null; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
696 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
697 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
698 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
699 |
private Enumeration<String> unsignedEntryNames() { |
11274
7e7196757acd
7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
smarks
parents:
9365
diff
changeset
|
700 |
final Enumeration<JarEntry> entries = entries(); |
29986
97167d851fc4
8078467: Update core libraries to use diamond with anonymous classes
darcy
parents:
27565
diff
changeset
|
701 |
return new Enumeration<>() { |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
702 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
703 |
String name; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
704 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
705 |
/* |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
706 |
* Grab entries from ZIP directory but screen out |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
707 |
* metadata. |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
708 |
*/ |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
709 |
public boolean hasMoreElements() { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
710 |
if (name != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
711 |
return true; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
712 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
713 |
while (entries.hasMoreElements()) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
714 |
String value; |
11274
7e7196757acd
7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
smarks
parents:
9365
diff
changeset
|
715 |
ZipEntry e = entries.nextElement(); |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
716 |
value = e.getName(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
717 |
if (e.isDirectory() || JarVerifier.isSigningRelated(value)) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
718 |
continue; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
719 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
720 |
name = value; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
721 |
return true; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
722 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
723 |
return false; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
724 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
725 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
726 |
public String nextElement() { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
727 |
if (hasMoreElements()) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
728 |
String value = name; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
729 |
name = null; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
730 |
return value; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
731 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
732 |
throw new NoSuchElementException(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
733 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
734 |
}; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
735 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
736 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
737 |
CodeSource getCodeSource(URL url, String name) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
738 |
ensureInitialization(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
739 |
if (jv != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
740 |
if (jv.eagerValidation) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
741 |
CodeSource cs = null; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
742 |
JarEntry je = getJarEntry(name); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
743 |
if (je != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
744 |
cs = jv.getCodeSource(url, this, je); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
745 |
} else { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
746 |
cs = jv.getCodeSource(url, name); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
747 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
748 |
return cs; |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
749 |
} else { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
750 |
return jv.getCodeSource(url, name); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
751 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
752 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
753 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
754 |
return JarVerifier.getUnsignedCS(url); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
755 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
756 |
|
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
757 |
void setEagerValidation(boolean eager) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
758 |
try { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
759 |
maybeInstantiateVerifier(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
760 |
} catch (IOException e) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
761 |
throw new RuntimeException(e); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
762 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
763 |
if (jv != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
764 |
jv.setEagerValidation(eager); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
765 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
766 |
} |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
767 |
|
11274
7e7196757acd
7117249: fix warnings in java.util.jar, .logging, .prefs, .zip
smarks
parents:
9365
diff
changeset
|
768 |
List<Object> getManifestDigests() { |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
769 |
ensureInitialization(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
770 |
if (jv != null) { |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
771 |
return jv.getManifestDigests(); |
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
772 |
} |
22078
bdec5d53e98c
8030851: Update code in java.util to use newer language features
psandoz
parents:
19409
diff
changeset
|
773 |
return new ArrayList<>(); |
8387
f0fa7bbf889e
6742654: Code insertion/replacement attacks against signed jars
weijun
parents:
5506
diff
changeset
|
774 |
} |
2 | 775 |
} |