src/java.base/share/classes/java/util/jar/JarVerifier.java
author darcy
Wed, 09 Oct 2019 10:17:50 -0700
changeset 58520 e036ee8bae56
parent 57956 e0b8b019d2f5
child 58679 9c3209ff7550
permissions -rw-r--r--
8231202: Suppress warnings on non-serializable non-transient instance fields in serializable classes Reviewed-by: rriggs, chegar
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
57956
e0b8b019d2f5 8229997: Apply java.io.Serial annotations in java.base
darcy
parents: 52159
diff changeset
     2
 * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5462
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5462
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    20
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5462
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5462
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5462
diff changeset
    23
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
package java.util.jar;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
import java.io.*;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    29
import java.net.URL;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    30
import java.util.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
import java.security.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
import java.security.cert.CertificateException;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    33
import java.util.zip.ZipEntry;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
36745
51effd3e92d0 8152190: Move sun.misc.JarIndex and InvalidJarIndexException to an internal package
chegar
parents: 29986
diff changeset
    35
import jdk.internal.util.jar.JarIndex;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
import sun.security.util.ManifestDigester;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    37
import sun.security.util.ManifestEntryVerifier;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    38
import sun.security.util.SignatureFileVerifier;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    39
import sun.security.util.Debug;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
/**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
 * @author      Roland Schemers
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
class JarVerifier {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
    /* Are we debugging ? */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
    static final Debug debug = Debug.getInstance("jar");
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
    /* a table mapping names to code signers, for jar entries that have
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
       had their actual hashes verified */
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
    52
    private Hashtable<String, CodeSigner[]> verifiedSigners;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
    /* a table mapping names to code signers, for jar entries that have
4152
bc36a9f01ac6 6870812: enhance security tools to use ECC algorithms
weijun
parents: 4049
diff changeset
    55
       passed the .SF/.DSA/.EC -> MANIFEST check */
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
    56
    private Hashtable<String, CodeSigner[]> sigFileSigners;
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    57
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    58
    /* a hash table to hold .SF bytes */
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
    59
    private Hashtable<String, byte[]> sigFileData;
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    60
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    61
    /** "queue" of pending PKCS7 blocks that we couldn't parse
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    62
     *  until we parsed the .SF file */
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
    63
    private ArrayList<SignatureFileVerifier> pendingBlocks;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
    /* cache of CodeSigner objects */
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
    66
    private ArrayList<CodeSigner[]> signerCache;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    68
    /* Are we parsing a block? */
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    69
    private boolean parsingBlockOrSF = false;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    70
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    71
    /* Are we done parsing META-INF entries? */
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    72
    private boolean parsingMeta = true;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    73
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
    /* Are there are files to verify? */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    75
    private boolean anyToVerify = true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    77
    /* The output stream to use when keeping track of files we are interested
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    78
       in */
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    79
    private ByteArrayOutputStream baos;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    80
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    81
    /** The ManifestDigester object */
5606
63aa4b61c0a8 4465490: Suspicious about double-check locking idiom being used in the code
sherman
parents: 5462
diff changeset
    82
    private volatile ManifestDigester manDig;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
90ce3da70b43 Initial load
duke
parents:
diff changeset
    84
    /** the bytes for the manDig object */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    85
    byte manifestRawBytes[] = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    86
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    87
    /** controls eager signature validation */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    88
    boolean eagerValidation;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    89
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    90
    /** makes code source singleton instances unique to us */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    91
    private Object csdomain = new Object();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    92
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    93
    /** collect -DIGEST-MANIFEST values for blacklist */
11119
6ff03c1202ce 7116722: Miscellaneous warnings sun.misc ( and related classes )
chegar
parents: 9365
diff changeset
    94
    private List<Object> manifestDigests;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
    95
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
    96
    public JarVerifier(byte rawBytes[]) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    97
        manifestRawBytes = rawBytes;
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
    98
        sigFileSigners = new Hashtable<>();
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
    99
        verifiedSigners = new Hashtable<>();
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   100
        sigFileData = new Hashtable<>(11);
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   101
        pendingBlocks = new ArrayList<>();
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   102
        baos = new ByteArrayOutputStream();
11119
6ff03c1202ce 7116722: Miscellaneous warnings sun.misc ( and related classes )
chegar
parents: 9365
diff changeset
   103
        manifestDigests = new ArrayList<>();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   105
90ce3da70b43 Initial load
duke
parents:
diff changeset
   106
    /**
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   107
     * This method scans to see which entry we're parsing and
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   108
     * keeps various state information depending on what type of
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   109
     * file is being parsed.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   111
    public void beginEntry(JarEntry je, ManifestEntryVerifier mev)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   112
        throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
        if (je == null)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
            return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   116
90ce3da70b43 Initial load
duke
parents:
diff changeset
   117
        if (debug != null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   118
            debug.println("beginEntry "+je.getName());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
        String name = je.getName();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   122
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
        /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   124
         * Assumptions:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
         * 1. The manifest should be the first entry in the META-INF directory.
4152
bc36a9f01ac6 6870812: enhance security tools to use ECC algorithms
weijun
parents: 4049
diff changeset
   126
         * 2. The .SF/.DSA/.EC files follow the manifest, before any normal entries
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
         * 3. Any of the following will throw a SecurityException:
90ce3da70b43 Initial load
duke
parents:
diff changeset
   128
         *    a. digest mismatch between a manifest section and
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
         *       the SF section.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   130
         *    b. digest mismatch between the actual jar entry and the manifest
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
         */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   133
        if (parsingMeta) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   134
            String uname = name.toUpperCase(Locale.ENGLISH);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   135
            if ((uname.startsWith("META-INF/") ||
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   136
                 uname.startsWith("/META-INF/"))) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   137
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   138
                if (je.isDirectory()) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   139
                    mev.setEntry(null, je);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   140
                    return;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   141
                }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   142
19598
958f97ba1713 8022761: regression: SecurityException is NOT thrown while trying to pack a wrongly signed Indexed Jar file
weijun
parents: 19376
diff changeset
   143
                if (uname.equals(JarFile.MANIFEST_NAME) ||
958f97ba1713 8022761: regression: SecurityException is NOT thrown while trying to pack a wrongly signed Indexed Jar file
weijun
parents: 19376
diff changeset
   144
                        uname.equals(JarIndex.INDEX_NAME)) {
19376
b8743dfc5d00 8021788: JarInputStream doesn't provide certificates for some file under META-INF
weijun
parents: 13795
diff changeset
   145
                    return;
b8743dfc5d00 8021788: JarInputStream doesn't provide certificates for some file under META-INF
weijun
parents: 13795
diff changeset
   146
                }
b8743dfc5d00 8021788: JarInputStream doesn't provide certificates for some file under META-INF
weijun
parents: 13795
diff changeset
   147
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   148
                if (SignatureFileVerifier.isBlockOrSF(uname)) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   149
                    /* We parse only DSA, RSA or EC PKCS7 blocks. */
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   150
                    parsingBlockOrSF = true;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   151
                    baos.reset();
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   152
                    mev.setEntry(null, je);
19376
b8743dfc5d00 8021788: JarInputStream doesn't provide certificates for some file under META-INF
weijun
parents: 13795
diff changeset
   153
                    return;
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   154
                }
19376
b8743dfc5d00 8021788: JarInputStream doesn't provide certificates for some file under META-INF
weijun
parents: 13795
diff changeset
   155
b8743dfc5d00 8021788: JarInputStream doesn't provide certificates for some file under META-INF
weijun
parents: 13795
diff changeset
   156
                // If a META-INF entry is not MF or block or SF, they should
b8743dfc5d00 8021788: JarInputStream doesn't provide certificates for some file under META-INF
weijun
parents: 13795
diff changeset
   157
                // be normal entries. According to 2 above, no more block or
b8743dfc5d00 8021788: JarInputStream doesn't provide certificates for some file under META-INF
weijun
parents: 13795
diff changeset
   158
                // SF will appear. Let's doneWithMeta.
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   159
            }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   160
        }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   161
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   162
        if (parsingMeta) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   163
            doneWithMeta();
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   164
        }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   165
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   166
        if (je.isDirectory()) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   167
            mev.setEntry(null, je);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   168
            return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   169
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   170
90ce3da70b43 Initial load
duke
parents:
diff changeset
   171
        // be liberal in what you accept. If the name starts with ./, remove
90ce3da70b43 Initial load
duke
parents:
diff changeset
   172
        // it as we internally canonicalize it with out the ./.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   173
        if (name.startsWith("./"))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   174
            name = name.substring(2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   175
90ce3da70b43 Initial load
duke
parents:
diff changeset
   176
        // be liberal in what you accept. If the name starts with /, remove
90ce3da70b43 Initial load
duke
parents:
diff changeset
   177
        // it as we internally canonicalize it with out the /.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   178
        if (name.startsWith("/"))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
            name = name.substring(1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   180
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
        // only set the jev object for entries that have a signature
22311
46afd8601158 8023672: Enhance jar file validation
weijun
parents: 19598
diff changeset
   182
        // (either verified or not)
45975
d61490c560bf 8169392: Additional jar validation steps
weijun
parents: 36745
diff changeset
   183
        if (!name.equals(JarFile.MANIFEST_NAME)) {
d61490c560bf 8169392: Additional jar validation steps
weijun
parents: 36745
diff changeset
   184
            if (sigFileSigners.get(name) != null ||
d61490c560bf 8169392: Additional jar validation steps
weijun
parents: 36745
diff changeset
   185
                    verifiedSigners.get(name) != null) {
d61490c560bf 8169392: Additional jar validation steps
weijun
parents: 36745
diff changeset
   186
                mev.setEntry(name, je);
d61490c560bf 8169392: Additional jar validation steps
weijun
parents: 36745
diff changeset
   187
                return;
d61490c560bf 8169392: Additional jar validation steps
weijun
parents: 36745
diff changeset
   188
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
        // don't compute the digest for this entry
90ce3da70b43 Initial load
duke
parents:
diff changeset
   192
        mev.setEntry(null, je);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   193
90ce3da70b43 Initial load
duke
parents:
diff changeset
   194
        return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   195
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
90ce3da70b43 Initial load
duke
parents:
diff changeset
   197
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   198
     * update a single byte.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   199
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   200
90ce3da70b43 Initial load
duke
parents:
diff changeset
   201
    public void update(int b, ManifestEntryVerifier mev)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   202
        throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   203
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   204
        if (b != -1) {
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   205
            if (parsingBlockOrSF) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   206
                baos.write(b);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   207
            } else {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   208
                mev.update((byte)b);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   209
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   211
            processEntry(mev);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   212
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   213
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   214
90ce3da70b43 Initial load
duke
parents:
diff changeset
   215
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   216
     * update an array of bytes.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   217
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   218
90ce3da70b43 Initial load
duke
parents:
diff changeset
   219
    public void update(int n, byte[] b, int off, int len,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   220
                       ManifestEntryVerifier mev)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   221
        throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   222
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   223
        if (n != -1) {
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   224
            if (parsingBlockOrSF) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   225
                baos.write(b, off, n);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   226
            } else {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   227
                mev.update(b, off, n);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   228
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   229
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   230
            processEntry(mev);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   231
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   232
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   233
90ce3da70b43 Initial load
duke
parents:
diff changeset
   234
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   235
     * called when we reach the end of entry in one of the read() methods.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   236
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   237
    private void processEntry(ManifestEntryVerifier mev)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   238
        throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   239
    {
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   240
        if (!parsingBlockOrSF) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   241
            JarEntry je = mev.getEntry();
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   242
            if ((je != null) && (je.signers == null)) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   243
                je.signers = mev.verify(verifiedSigners, sigFileSigners);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   244
                je.certs = mapSignersToCertArray(je.signers);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   245
            }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   246
        } else {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   247
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   248
            try {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   249
                parsingBlockOrSF = false;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   250
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   251
                if (debug != null) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   252
                    debug.println("processEntry: processing block");
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   253
                }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   254
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   255
                String uname = mev.getEntry().getName()
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   256
                                             .toUpperCase(Locale.ENGLISH);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   257
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   258
                if (uname.endsWith(".SF")) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   259
                    String key = uname.substring(0, uname.length()-3);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   260
                    byte bytes[] = baos.toByteArray();
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   261
                    // add to sigFileData in case future blocks need it
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   262
                    sigFileData.put(key, bytes);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   263
                    // check pending blocks, we can now process
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   264
                    // anyone waiting for this .SF file
22078
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   265
                    for (SignatureFileVerifier sfv : pendingBlocks) {
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   266
                        if (sfv.needSignatureFile(key)) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   267
                            if (debug != null) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   268
                                debug.println(
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   269
                                 "processEntry: processing pending block");
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   270
                            }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   271
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   272
                            sfv.setSignatureFile(bytes);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   273
                            sfv.process(sigFileSigners, manifestDigests);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   274
                        }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   275
                    }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   276
                    return;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   277
                }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   278
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   279
                // now we are parsing a signature block file
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   280
24685
215fa91e1b4c 8044461: Cleanup new Boolean and single character strings
rriggs
parents: 23912
diff changeset
   281
                String key = uname.substring(0, uname.lastIndexOf('.'));
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   282
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   283
                if (signerCache == null)
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   284
                    signerCache = new ArrayList<>();
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   285
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   286
                if (manDig == null) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   287
                    synchronized(manifestRawBytes) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   288
                        if (manDig == null) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   289
                            manDig = new ManifestDigester(manifestRawBytes);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   290
                            manifestRawBytes = null;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   291
                        }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   292
                    }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   293
                }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   294
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   295
                SignatureFileVerifier sfv =
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   296
                  new SignatureFileVerifier(signerCache,
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   297
                                            manDig, uname, baos.toByteArray());
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   298
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   299
                if (sfv.needSignatureFileBytes()) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   300
                    // see if we have already parsed an external .SF file
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   301
                    byte[] bytes = sigFileData.get(key);
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   302
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   303
                    if (bytes == null) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   304
                        // put this block on queue for later processing
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   305
                        // since we don't have the .SF bytes yet
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   306
                        // (uname, block);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   307
                        if (debug != null) {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   308
                            debug.println("adding pending block");
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   309
                        }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   310
                        pendingBlocks.add(sfv);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   311
                        return;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   312
                    } else {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   313
                        sfv.setSignatureFile(bytes);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   314
                    }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   315
                }
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   316
                sfv.process(sigFileSigners, manifestDigests);
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   317
22078
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   318
            } catch (IOException | CertificateException |
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   319
                    NoSuchAlgorithmException | SignatureException e) {
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   320
                if (debug != null) debug.println("processEntry caught: "+e);
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   321
                // ignore and treat as unsigned
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   322
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   323
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   324
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   325
90ce3da70b43 Initial load
duke
parents:
diff changeset
   326
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   327
     * Return an array of java.security.cert.Certificate objects for
90ce3da70b43 Initial load
duke
parents:
diff changeset
   328
     * the given file in the jar.
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   329
     * @deprecated
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   330
     */
13795
73850c397272 7193406: Clean-up JDK Build Warnings in java.util, java.io
dxu
parents: 11841
diff changeset
   331
    @Deprecated
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   332
    public java.security.cert.Certificate[] getCerts(String name)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   333
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   334
        return mapSignersToCertArray(getCodeSigners(name));
90ce3da70b43 Initial load
duke
parents:
diff changeset
   335
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   336
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   337
    public java.security.cert.Certificate[] getCerts(JarFile jar, JarEntry entry)
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   338
    {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   339
        return mapSignersToCertArray(getCodeSigners(jar, entry));
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   340
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   341
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   342
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   343
     * return an array of CodeSigner objects for
90ce3da70b43 Initial load
duke
parents:
diff changeset
   344
     * the given file in the jar. this array is not cloned.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   345
     *
90ce3da70b43 Initial load
duke
parents:
diff changeset
   346
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   347
    public CodeSigner[] getCodeSigners(String name)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   348
    {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   349
        return verifiedSigners.get(name);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   350
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   351
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   352
    public CodeSigner[] getCodeSigners(JarFile jar, JarEntry entry)
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   353
    {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   354
        String name = entry.getName();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   355
        if (eagerValidation && sigFileSigners.get(name) != null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   356
            /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   357
             * Force a read of the entry data to generate the
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   358
             * verification hash.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   359
             */
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   360
            try {
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   361
                InputStream s = jar.getInputStream(entry);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   362
                byte[] buffer = new byte[1024];
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   363
                int n = buffer.length;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   364
                while (n != -1) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   365
                    n = s.read(buffer, 0, buffer.length);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   366
                }
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   367
                s.close();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   368
            } catch (IOException e) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   369
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   370
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   371
        return getCodeSigners(name);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   372
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   373
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   374
    /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   375
     * Convert an array of signers into an array of concatenated certificate
90ce3da70b43 Initial load
duke
parents:
diff changeset
   376
     * arrays.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   377
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   378
    private static java.security.cert.Certificate[] mapSignersToCertArray(
90ce3da70b43 Initial load
duke
parents:
diff changeset
   379
        CodeSigner[] signers) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   380
90ce3da70b43 Initial load
duke
parents:
diff changeset
   381
        if (signers != null) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   382
            ArrayList<java.security.cert.Certificate> certChains = new ArrayList<>();
22078
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   383
            for (CodeSigner signer : signers) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   384
                certChains.addAll(
22078
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   385
                    signer.getSignerCertPath().getCertificates());
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   386
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   387
90ce3da70b43 Initial load
duke
parents:
diff changeset
   388
            // Convert into a Certificate[]
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   389
            return certChains.toArray(
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   390
                    new java.security.cert.Certificate[certChains.size()]);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   391
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   392
        return null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   393
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   394
90ce3da70b43 Initial load
duke
parents:
diff changeset
   395
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   396
     * returns true if there no files to verify.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   397
     * should only be called after all the META-INF entries
90ce3da70b43 Initial load
duke
parents:
diff changeset
   398
     * have been processed.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   399
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   400
    boolean nothingToVerify()
90ce3da70b43 Initial load
duke
parents:
diff changeset
   401
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   402
        return (anyToVerify == false);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   403
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   404
90ce3da70b43 Initial load
duke
parents:
diff changeset
   405
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   406
     * called to let us know we have processed all the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   407
     * META-INF entries, and if we re-read one of them, don't
90ce3da70b43 Initial load
duke
parents:
diff changeset
   408
     * re-process it. Also gets rid of any data structures
90ce3da70b43 Initial load
duke
parents:
diff changeset
   409
     * we needed when parsing META-INF entries.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   410
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   411
    void doneWithMeta()
90ce3da70b43 Initial load
duke
parents:
diff changeset
   412
    {
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   413
        parsingMeta = false;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   414
        anyToVerify = !sigFileSigners.isEmpty();
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   415
        baos = null;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   416
        sigFileData = null;
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   417
        pendingBlocks = null;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   418
        signerCache = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   419
        manDig = null;
9001
4eb5b77d7425 7023056: NPE from sun.security.util.ManifestEntryVerifier.verify during Maven build
weijun
parents: 8387
diff changeset
   420
        // MANIFEST.MF is always treated as signed and verified,
4eb5b77d7425 7023056: NPE from sun.security.util.ManifestEntryVerifier.verify during Maven build
weijun
parents: 8387
diff changeset
   421
        // move its signers from sigFileSigners to verifiedSigners.
4eb5b77d7425 7023056: NPE from sun.security.util.ManifestEntryVerifier.verify during Maven build
weijun
parents: 8387
diff changeset
   422
        if (sigFileSigners.containsKey(JarFile.MANIFEST_NAME)) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   423
            CodeSigner[] codeSigners = sigFileSigners.remove(JarFile.MANIFEST_NAME);
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   424
            verifiedSigners.put(JarFile.MANIFEST_NAME, codeSigners);
9001
4eb5b77d7425 7023056: NPE from sun.security.util.ManifestEntryVerifier.verify during Maven build
weijun
parents: 8387
diff changeset
   425
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   426
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   427
90ce3da70b43 Initial load
duke
parents:
diff changeset
   428
    static class VerifierStream extends java.io.InputStream {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   429
90ce3da70b43 Initial load
duke
parents:
diff changeset
   430
        private InputStream is;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   431
        private JarVerifier jv;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   432
        private ManifestEntryVerifier mev;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   433
        private long numLeft;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   434
90ce3da70b43 Initial load
duke
parents:
diff changeset
   435
        VerifierStream(Manifest man,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   436
                       JarEntry je,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   437
                       InputStream is,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   438
                       JarVerifier jv) throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   439
        {
51110
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   440
            this.is = Objects.requireNonNull(is);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   441
            this.jv = jv;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   442
            this.mev = new ManifestEntryVerifier(man);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   443
            this.jv.beginEntry(je, mev);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   444
            this.numLeft = je.getSize();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   445
            if (this.numLeft == 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   446
                this.jv.update(-1, this.mev);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   447
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   448
90ce3da70b43 Initial load
duke
parents:
diff changeset
   449
        public int read() throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   450
        {
51110
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   451
            ensureOpen();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   452
            if (numLeft > 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   453
                int b = is.read();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   454
                jv.update(b, mev);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   455
                numLeft--;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   456
                if (numLeft == 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   457
                    jv.update(-1, mev);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   458
                return b;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   459
            } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   460
                return -1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   461
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   462
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   463
90ce3da70b43 Initial load
duke
parents:
diff changeset
   464
        public int read(byte b[], int off, int len) throws IOException {
51110
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   465
            ensureOpen();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   466
            if ((numLeft > 0) && (numLeft < len)) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   467
                len = (int)numLeft;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   468
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   469
90ce3da70b43 Initial load
duke
parents:
diff changeset
   470
            if (numLeft > 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   471
                int n = is.read(b, off, len);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   472
                jv.update(n, b, off, len, mev);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   473
                numLeft -= n;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   474
                if (numLeft == 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   475
                    jv.update(-1, b, off, len, mev);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   476
                return n;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   477
            } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   478
                return -1;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   479
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   480
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   481
90ce3da70b43 Initial load
duke
parents:
diff changeset
   482
        public void close()
90ce3da70b43 Initial load
duke
parents:
diff changeset
   483
            throws IOException
90ce3da70b43 Initial load
duke
parents:
diff changeset
   484
        {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   485
            if (is != null)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   486
                is.close();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   487
            is = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   488
            mev = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   489
            jv = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   490
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   491
90ce3da70b43 Initial load
duke
parents:
diff changeset
   492
        public int available() throws IOException {
51110
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   493
            ensureOpen();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   494
            return is.available();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   495
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   496
51110
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   497
        private void ensureOpen() throws IOException {
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   498
            if (is == null) {
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   499
                throw new IOException("stream closed");
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   500
            }
03f2bfdcb636 8206863: A closed JarVerifier.VerifierStream should throw IOException
martin
parents: 50048
diff changeset
   501
        }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   502
    }
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   503
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   504
    // Extended JavaUtilJarAccess CodeSource API Support
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   505
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   506
    private Map<URL, Map<CodeSigner[], CodeSource>> urlToCodeSourceMap = new HashMap<>();
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   507
    private Map<CodeSigner[], CodeSource> signerToCodeSource = new HashMap<>();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   508
    private URL lastURL;
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   509
    private Map<CodeSigner[], CodeSource> lastURLMap;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   510
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   511
    /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   512
     * Create a unique mapping from codeSigner cache entries to CodeSource.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   513
     * In theory, multiple URLs origins could map to a single locally cached
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   514
     * and shared JAR file although in practice there will be a single URL in use.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   515
     */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   516
    private synchronized CodeSource mapSignersToCodeSource(URL url, CodeSigner[] signers) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   517
        Map<CodeSigner[], CodeSource> map;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   518
        if (url == lastURL) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   519
            map = lastURLMap;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   520
        } else {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   521
            map = urlToCodeSourceMap.get(url);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   522
            if (map == null) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   523
                map = new HashMap<>();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   524
                urlToCodeSourceMap.put(url, map);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   525
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   526
            lastURLMap = map;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   527
            lastURL = url;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   528
        }
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   529
        CodeSource cs = map.get(signers);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   530
        if (cs == null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   531
            cs = new VerifierCodeSource(csdomain, url, signers);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   532
            signerToCodeSource.put(signers, cs);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   533
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   534
        return cs;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   535
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   536
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   537
    private CodeSource[] mapSignersToCodeSources(URL url, List<CodeSigner[]> signers, boolean unsigned) {
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   538
        List<CodeSource> sources = new ArrayList<>();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   539
22078
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   540
        for (CodeSigner[] signer : signers) {
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   541
            sources.add(mapSignersToCodeSource(url, signer));
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   542
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   543
        if (unsigned) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   544
            sources.add(mapSignersToCodeSource(url, null));
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   545
        }
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   546
        return sources.toArray(new CodeSource[sources.size()]);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   547
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   548
    private CodeSigner[] emptySigner = new CodeSigner[0];
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   549
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   550
    /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   551
     * Match CodeSource to a CodeSigner[] in the signer cache.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   552
     */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   553
    private CodeSigner[] findMatchingSigners(CodeSource cs) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   554
        if (cs instanceof VerifierCodeSource) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   555
            VerifierCodeSource vcs = (VerifierCodeSource) cs;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   556
            if (vcs.isSameDomain(csdomain)) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   557
                return ((VerifierCodeSource) cs).getPrivateSigners();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   558
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   559
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   560
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   561
        /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   562
         * In practice signers should always be optimized above
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   563
         * but this handles a CodeSource of any type, just in case.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   564
         */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   565
        CodeSource[] sources = mapSignersToCodeSources(cs.getLocation(), getJarCodeSigners(), true);
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   566
        List<CodeSource> sourceList = new ArrayList<>();
22078
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   567
        for (CodeSource source : sources) {
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   568
            sourceList.add(source);
9365
469cd39a25de 7040803: regression: bugster fail to start
igor
parents: 9248
diff changeset
   569
        }
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   570
        int j = sourceList.indexOf(cs);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   571
        if (j != -1) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   572
            CodeSigner[] match;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   573
            match = ((VerifierCodeSource) sourceList.get(j)).getPrivateSigners();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   574
            if (match == null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   575
                match = emptySigner;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   576
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   577
            return match;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   578
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   579
        return null;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   580
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   581
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   582
    /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   583
     * Instances of this class hold uncopied references to internal
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   584
     * signing data that can be compared by object reference identity.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   585
     */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   586
    private static class VerifierCodeSource extends CodeSource {
57956
e0b8b019d2f5 8229997: Apply java.io.Serial annotations in java.base
darcy
parents: 52159
diff changeset
   587
        @java.io.Serial
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   588
        private static final long serialVersionUID = -9047366145967768825L;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   589
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   590
        URL vlocation;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   591
        CodeSigner[] vsigners;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   592
        java.security.cert.Certificate[] vcerts;
58520
e036ee8bae56 8231202: Suppress warnings on non-serializable non-transient instance fields in serializable classes
darcy
parents: 57956
diff changeset
   593
        @SuppressWarnings("serial") // Not statically typed as Serializable
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   594
        Object csdomain;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   595
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   596
        VerifierCodeSource(Object csdomain, URL location, CodeSigner[] signers) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   597
            super(location, signers);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   598
            this.csdomain = csdomain;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   599
            vlocation = location;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   600
            vsigners = signers; // from signerCache
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   601
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   602
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   603
        VerifierCodeSource(Object csdomain, URL location, java.security.cert.Certificate[] certs) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   604
            super(location, certs);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   605
            this.csdomain = csdomain;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   606
            vlocation = location;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   607
            vcerts = certs; // from signerCache
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   608
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   609
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   610
        /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   611
         * All VerifierCodeSource instances are constructed based on
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   612
         * singleton signerCache or signerCacheCert entries for each unique signer.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   613
         * No CodeSigner<->Certificate[] conversion is required.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   614
         * We use these assumptions to optimize equality comparisons.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   615
         */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   616
        public boolean equals(Object obj) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   617
            if (obj == this) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   618
                return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   619
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   620
            if (obj instanceof VerifierCodeSource) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   621
                VerifierCodeSource that = (VerifierCodeSource) obj;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   622
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   623
                /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   624
                 * Only compare against other per-signer singletons constructed
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   625
                 * on behalf of the same JarFile instance. Otherwise, compare
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   626
                 * things the slower way.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   627
                 */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   628
                if (isSameDomain(that.csdomain)) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   629
                    if (that.vsigners != this.vsigners
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   630
                            || that.vcerts != this.vcerts) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   631
                        return false;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   632
                    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   633
                    if (that.vlocation != null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   634
                        return that.vlocation.equals(this.vlocation);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   635
                    } else if (this.vlocation != null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   636
                        return this.vlocation.equals(that.vlocation);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   637
                    } else { // both null
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   638
                        return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   639
                    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   640
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   641
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   642
            return super.equals(obj);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   643
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   644
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   645
        boolean isSameDomain(Object csdomain) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   646
            return this.csdomain == csdomain;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   647
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   648
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   649
        private CodeSigner[] getPrivateSigners() {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   650
            return vsigners;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   651
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   652
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   653
        private java.security.cert.Certificate[] getPrivateCertificates() {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   654
            return vcerts;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   655
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   656
    }
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   657
    private Map<String, CodeSigner[]> signerMap;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   658
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   659
    private synchronized Map<String, CodeSigner[]> signerMap() {
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   660
        if (signerMap == null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   661
            /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   662
             * Snapshot signer state so it doesn't change on us. We care
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   663
             * only about the asserted signatures. Verification of
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   664
             * signature validity happens via the JarEntry apis.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   665
             */
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   666
            signerMap = new HashMap<>(verifiedSigners.size() + sigFileSigners.size());
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   667
            signerMap.putAll(verifiedSigners);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   668
            signerMap.putAll(sigFileSigners);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   669
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   670
        return signerMap;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   671
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   672
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   673
    public synchronized Enumeration<String> entryNames(JarFile jar, final CodeSource[] cs) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   674
        final Map<String, CodeSigner[]> map = signerMap();
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   675
        final Iterator<Map.Entry<String, CodeSigner[]>> itor = map.entrySet().iterator();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   676
        boolean matchUnsigned = false;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   677
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   678
        /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   679
         * Grab a single copy of the CodeSigner arrays. Check
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   680
         * to see if we can optimize CodeSigner equality test.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   681
         */
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   682
        List<CodeSigner[]> req = new ArrayList<>(cs.length);
22078
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   683
        for (CodeSource c : cs) {
bdec5d53e98c 8030851: Update code in java.util to use newer language features
psandoz
parents: 19598
diff changeset
   684
            CodeSigner[] match = findMatchingSigners(c);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   685
            if (match != null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   686
                if (match.length > 0) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   687
                    req.add(match);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   688
                } else {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   689
                    matchUnsigned = true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   690
                }
23912
9eab25093a89 8026067: Enhance signed jar verification
weijun
parents: 23010
diff changeset
   691
            } else {
9eab25093a89 8026067: Enhance signed jar verification
weijun
parents: 23010
diff changeset
   692
                matchUnsigned = true;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   693
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   694
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   695
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   696
        final List<CodeSigner[]> signersReq = req;
50048
1c4fb292447c 8202719: Use Collections.emptyEnumeration where possible
redestad
parents: 47987
diff changeset
   697
        final Enumeration<String> enum2 = matchUnsigned ? unsignedEntryNames(jar) : Collections.emptyEnumeration();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   698
29986
97167d851fc4 8078467: Update core libraries to use diamond with anonymous classes
darcy
parents: 25859
diff changeset
   699
        return new Enumeration<>() {
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   700
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   701
            String name;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   702
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   703
            public boolean hasMoreElements() {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   704
                if (name != null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   705
                    return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   706
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   707
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   708
                while (itor.hasNext()) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   709
                    Map.Entry<String, CodeSigner[]> e = itor.next();
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   710
                    if (signersReq.contains(e.getValue())) {
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   711
                        name = e.getKey();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   712
                        return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   713
                    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   714
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   715
                while (enum2.hasMoreElements()) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   716
                    name = enum2.nextElement();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   717
                    return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   718
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   719
                return false;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   720
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   721
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   722
            public String nextElement() {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   723
                if (hasMoreElements()) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   724
                    String value = name;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   725
                    name = null;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   726
                    return value;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   727
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   728
                throw new NoSuchElementException();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   729
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   730
        };
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   731
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   732
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   733
    /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   734
     * Like entries() but screens out internal JAR mechanism entries
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   735
     * and includes signed entries with no ZIP data.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   736
     */
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47216
diff changeset
   737
    public Enumeration<JarEntry> entries2(final JarFile jar, Enumeration<JarEntry> e) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   738
        final Map<String, CodeSigner[]> map = new HashMap<>();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   739
        map.putAll(signerMap());
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47216
diff changeset
   740
        final Enumeration<JarEntry> enum_ = e;
29986
97167d851fc4 8078467: Update core libraries to use diamond with anonymous classes
darcy
parents: 25859
diff changeset
   741
        return new Enumeration<>() {
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   742
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   743
            Enumeration<String> signers = null;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   744
            JarEntry entry;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   745
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   746
            public boolean hasMoreElements() {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   747
                if (entry != null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   748
                    return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   749
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   750
                while (enum_.hasMoreElements()) {
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47216
diff changeset
   751
                    JarEntry je = enum_.nextElement();
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47216
diff changeset
   752
                    if (JarVerifier.isSigningRelated(je.getName())) {
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   753
                        continue;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   754
                    }
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47216
diff changeset
   755
                    entry = jar.newEntry(je);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   756
                    return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   757
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   758
                if (signers == null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   759
                    signers = Collections.enumeration(map.keySet());
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   760
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   761
                while (signers.hasMoreElements()) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   762
                    String name = signers.nextElement();
47987
85ea7e83af30 8189611: JarFile versioned stream and real name support
sherman
parents: 47216
diff changeset
   763
                    entry = jar.newEntry(name);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   764
                    return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   765
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   766
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   767
                // Any map entries left?
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   768
                return false;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   769
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   770
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   771
            public JarEntry nextElement() {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   772
                if (hasMoreElements()) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   773
                    JarEntry je = entry;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   774
                    map.remove(je.getName());
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   775
                    entry = null;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   776
                    return je;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   777
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   778
                throw new NoSuchElementException();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   779
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   780
        };
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   781
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   782
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   783
    // true if file is part of the signature mechanism itself
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   784
    static boolean isSigningRelated(String name) {
23912
9eab25093a89 8026067: Enhance signed jar verification
weijun
parents: 23010
diff changeset
   785
        return SignatureFileVerifier.isSigningRelated(name);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   786
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   787
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   788
    private Enumeration<String> unsignedEntryNames(JarFile jar) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   789
        final Map<String, CodeSigner[]> map = signerMap();
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   790
        final Enumeration<JarEntry> entries = jar.entries();
29986
97167d851fc4 8078467: Update core libraries to use diamond with anonymous classes
darcy
parents: 25859
diff changeset
   791
        return new Enumeration<>() {
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   792
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   793
            String name;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   794
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   795
            /*
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   796
             * Grab entries from ZIP directory but screen out
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   797
             * metadata.
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   798
             */
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   799
            public boolean hasMoreElements() {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   800
                if (name != null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   801
                    return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   802
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   803
                while (entries.hasMoreElements()) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   804
                    String value;
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   805
                    ZipEntry e = entries.nextElement();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   806
                    value = e.getName();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   807
                    if (e.isDirectory() || isSigningRelated(value)) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   808
                        continue;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   809
                    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   810
                    if (map.get(value) == null) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   811
                        name = value;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   812
                        return true;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   813
                    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   814
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   815
                return false;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   816
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   817
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   818
            public String nextElement() {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   819
                if (hasMoreElements()) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   820
                    String value = name;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   821
                    name = null;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   822
                    return value;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   823
                }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   824
                throw new NoSuchElementException();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   825
            }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   826
        };
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   827
    }
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   828
    private List<CodeSigner[]> jarCodeSigners;
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   829
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   830
    private synchronized List<CodeSigner[]> getJarCodeSigners() {
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   831
        CodeSigner[] signers;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   832
        if (jarCodeSigners == null) {
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   833
            HashSet<CodeSigner[]> set = new HashSet<>();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   834
            set.addAll(signerMap().values());
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   835
            jarCodeSigners = new ArrayList<>();
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   836
            jarCodeSigners.addAll(set);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   837
        }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   838
        return jarCodeSigners;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   839
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   840
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   841
    public synchronized CodeSource[] getCodeSources(JarFile jar, URL url) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   842
        boolean hasUnsigned = unsignedEntryNames(jar).hasMoreElements();
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   843
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   844
        return mapSignersToCodeSources(url, getJarCodeSigners(), hasUnsigned);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   845
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   846
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   847
    public CodeSource getCodeSource(URL url, String name) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   848
        CodeSigner[] signers;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   849
11841
38a39c748880 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc.
smarks
parents: 11119
diff changeset
   850
        signers = signerMap().get(name);
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   851
        return mapSignersToCodeSource(url, signers);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   852
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   853
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   854
    public CodeSource getCodeSource(URL url, JarFile jar, JarEntry je) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   855
        CodeSigner[] signers;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   856
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   857
        return mapSignersToCodeSource(url, getCodeSigners(jar, je));
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   858
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   859
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   860
    public void setEagerValidation(boolean eager) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   861
        eagerValidation = eager;
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   862
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   863
11119
6ff03c1202ce 7116722: Miscellaneous warnings sun.misc ( and related classes )
chegar
parents: 9365
diff changeset
   864
    public synchronized List<Object> getManifestDigests() {
8387
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   865
        return Collections.unmodifiableList(manifestDigests);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   866
    }
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   867
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   868
    static CodeSource getUnsignedCS(URL url) {
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   869
        return new VerifierCodeSource(null, url, (java.security.cert.Certificate[]) null);
f0fa7bbf889e 6742654: Code insertion/replacement attacks against signed jars
weijun
parents: 5627
diff changeset
   870
    }
52159
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   871
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   872
    /**
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   873
     * Returns whether the name is trusted. Used by
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   874
     * {@link Manifest#getTrustedAttributes(String)}.
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   875
     */
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   876
    boolean isTrustedManifestEntry(String name) {
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   877
        // How many signers? MANIFEST.MF is always verified
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   878
        CodeSigner[] forMan = verifiedSigners.get(JarFile.MANIFEST_NAME);
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   879
        if (forMan == null) {
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   880
            return true;
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   881
        }
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   882
        // Check sigFileSigners first, because we are mainly dealing with
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   883
        // non-file entries which will stay in sigFileSigners forever.
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   884
        CodeSigner[] forName = sigFileSigners.get(name);
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   885
        if (forName == null) {
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   886
            forName = verifiedSigners.get(name);
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   887
        }
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   888
        // Returns trusted if all signers sign the entry
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   889
        return forName != null && forName.length == forMan.length;
42244a052fbb 8194534: Manifest better support
weijun
parents: 51110
diff changeset
   890
    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   891
}