undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
|
|
@ -0,0 +1,113 @@
|
|||
/*
|
||||
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8023362
|
||||
* @run main/othervm OcspUnauthorized
|
||||
* @summary Make sure Ocsp UNAUTHORIZED response is treated as failure when
|
||||
* SOFT_FAIL option is set
|
||||
*/
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.security.Security;
|
||||
import java.security.cert.CertPathValidatorException.BasicReason;
|
||||
import java.security.cert.*;
|
||||
import java.security.cert.PKIXRevocationChecker.Option;
|
||||
import java.util.Base64;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumSet;
|
||||
|
||||
public class OcspUnauthorized {
|
||||
|
||||
private final static String OCSP_RESPONSE = "MAMKAQY=";
|
||||
|
||||
private final static String EE_CERT =
|
||||
"MIICADCCAWmgAwIBAgIEOvxUmjANBgkqhkiG9w0BAQQFADAqMQswCQYDVQQGEwJ1czE" +
|
||||
"MMAoGA1UEChMDc3VuMQ0wCwYDVQQLEwRsYWJzMB4XDTAxMDUxNDIwNDQyMVoXDTI4MD" +
|
||||
"kyOTIwNDQyMVowOTELMAkGA1UEBhMCdXMxDDAKBgNVBAoTA3N1bjENMAsGA1UECxMEb" +
|
||||
"GFiczENMAsGA1UECxMEaXNyZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4MmP" +
|
||||
"GDriFJ+OhDlTuLpHzPy0nawDKyIYUJPZmU9M/pCAUbZewAOyAXGPYVU1og2ZiO9tWBi" +
|
||||
"ZBeJGoFHEkkhfeqSVb2PsRckiXvPZ3AiSVmdX0uD/a963abmhRMYB1gDO2+jBe3F/DU" +
|
||||
"pHwpyThchy8tYUMh7Gr7+m/8FwZbdbSpMCAwEAAaMkMCIwDwYDVR0PAQH/BAUDAwekA" +
|
||||
"DAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAME3fmXvES0FVDXSD1iC" +
|
||||
"TJLf86kUy3H+uMG7h5pOQmcfF1o9PVWlNByVf4r2b4GRgftPQ3Ao0SAvq1aSkW7YpkN" +
|
||||
"pcartYqNk2E5brPajOC0v+Pkxf/g/pkRTT6Zp+9erGQF4Ta62q0iwOyc3FovSbh0Ph2" +
|
||||
"WidZRP4qUG5I6JmGkI";
|
||||
|
||||
private final static String TRUST_ANCHOR =
|
||||
"MIICIzCCAYygAwIBAgIEOvxT7DANBgkqhkiG9w0BAQQFADAbMQswCQYDVQQGEwJ1czE" +
|
||||
"MMAoGA1UEChMDc3VuMB4XDTAxMDUxNDIxMDQyOVoXDTI4MDkyOTIxMDQyOVowKjELMA" +
|
||||
"kGA1UEBhMCdXMxDDAKBgNVBAoTA3N1bjENMAsGA1UECxMEbGFiczCBnzANBgkqhkiG9" +
|
||||
"w0BAQEFAAOBjQAwgYkCgYEA0/16V87rhznCM0y7IqyGcfQBentG+PglA+1hiqCuQY/A" +
|
||||
"jFiDKr5N+LpcfU28P41E4M+DSDrMIEe4JchRcXeJY6aIVhpOveVV9mgtBaEKlsScrIJ" +
|
||||
"zmVqM07PG9JENg2FibECnB5TNUSfVbFKfvtAqaZ7Pc971oZVoIePBWnfKV9kCAwEAAa" +
|
||||
"NlMGMwPwYDVR0eAQH/BDUwM6AxMC+kKjELMAkGA1UEBhMCdXMxDDAKBgNVBAoTA3N1b" +
|
||||
"jENMAsGA1UECxMEbGFic4ABAzAPBgNVHQ8BAf8EBQMDB6QAMA8GA1UdEwEB/wQFMAMB" +
|
||||
"Af8wDQYJKoZIhvcNAQEEBQADgYEAfJ5HWd7K5PmX0+Vbsux4SYhoaejDwwgS43BRNa+" +
|
||||
"AmFq9LIZ+ZcjBMVte8Y3sJF+nz9+1qBaUhNhbaECCqsgmWSwvI+0kUzJXL89k9AdQ8m" +
|
||||
"AYf6CB6+kaZQBgrdSdqSGz3tCVa2MIK8wmb0ROM40oJ7vt3qSwgFi3UTltxkFfwQ0=";
|
||||
|
||||
private static CertificateFactory cf;
|
||||
private static Base64.Decoder base64Decoder = Base64.getDecoder();
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
// EE_CERT is signed with MD5withRSA
|
||||
Security.setProperty("jdk.certpath.disabledAlgorithms", "");
|
||||
cf = CertificateFactory.getInstance("X.509");
|
||||
X509Certificate taCert = getX509Cert(TRUST_ANCHOR);
|
||||
X509Certificate eeCert = getX509Cert(EE_CERT);
|
||||
CertPath cp = cf.generateCertPath(Collections.singletonList(eeCert));
|
||||
|
||||
CertPathValidator cpv = CertPathValidator.getInstance("PKIX");
|
||||
PKIXRevocationChecker prc =
|
||||
(PKIXRevocationChecker)cpv.getRevocationChecker();
|
||||
prc.setOptions(EnumSet.of(Option.SOFT_FAIL, Option.NO_FALLBACK));
|
||||
byte[] response = base64Decoder.decode(OCSP_RESPONSE);
|
||||
|
||||
prc.setOcspResponses(Collections.singletonMap(eeCert, response));
|
||||
|
||||
TrustAnchor ta = new TrustAnchor(taCert, null);
|
||||
PKIXParameters params = new PKIXParameters(Collections.singleton(ta));
|
||||
|
||||
params.addCertPathChecker(prc);
|
||||
|
||||
try {
|
||||
cpv.validate(cp, params);
|
||||
throw new Exception("FAILED: expected CertPathValidatorException");
|
||||
} catch (CertPathValidatorException cpve) {
|
||||
cpve.printStackTrace();
|
||||
if (cpve.getReason() != BasicReason.UNSPECIFIED &&
|
||||
!cpve.getMessage().contains("OCSP response error: UNAUTHORIZED")) {
|
||||
throw new Exception("FAILED: unexpected " +
|
||||
"CertPathValidatorException reason");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static X509Certificate getX509Cert(String enc) throws Exception {
|
||||
byte[] bytes = base64Decoder.decode(enc);
|
||||
ByteArrayInputStream is = new ByteArrayInputStream(bytes);
|
||||
return (X509Certificate)cf.generateCertificate(is);
|
||||
}
|
||||
}
|
||||
185
test/jdk/java/security/cert/PKIXRevocationChecker/UnitTest.java
Normal file
185
test/jdk/java/security/cert/PKIXRevocationChecker/UnitTest.java
Normal file
|
|
@ -0,0 +1,185 @@
|
|||
/*
|
||||
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 6854712 7171570 8010748 8025287
|
||||
* @summary Basic unit test for PKIXRevocationChecker
|
||||
*/
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.InputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.net.URI;
|
||||
import java.security.cert.*;
|
||||
import java.security.cert.PKIXRevocationChecker.Option;
|
||||
import java.util.*;
|
||||
|
||||
public class UnitTest {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
CertPathValidator cpv = CertPathValidator.getInstance("PKIX");
|
||||
CertPathChecker cpc = cpv.getRevocationChecker();
|
||||
PKIXRevocationChecker prc = (PKIXRevocationChecker)cpc;
|
||||
|
||||
prc.init(false);
|
||||
|
||||
System.out.println("Testing that get methods return null or " +
|
||||
"empty lists/sets/maps");
|
||||
requireNull(prc.getOcspResponder(), "getOcspResponder()");
|
||||
requireNull(prc.getOcspResponderCert(), "getOcspResponderCert()");
|
||||
requireEmpty(prc.getOcspExtensions(), "getOcspExtensions()");
|
||||
requireEmpty(prc.getOcspResponses(), "getOcspResponses()");
|
||||
requireEmpty(prc.getOptions(), "getOptions()");
|
||||
requireEmpty(prc.getSoftFailExceptions(), "getSoftFailExceptions()");
|
||||
|
||||
System.out.println("Testing that get methods return same parameters " +
|
||||
"that are passed to set methods");
|
||||
URI uri = new URI("http://localhost");
|
||||
prc.setOcspResponder(uri);
|
||||
requireEquals(uri, prc.getOcspResponder(), "getOcspResponder()");
|
||||
|
||||
X509Certificate cert = getCert();
|
||||
prc.setOcspResponderCert(cert);
|
||||
requireEquals(cert, prc.getOcspResponderCert(),
|
||||
"getOcspResponderCert()");
|
||||
|
||||
List<Extension> exts = new ArrayList<>();
|
||||
for (String oid : cert.getNonCriticalExtensionOIDs()) {
|
||||
System.out.println(oid);
|
||||
exts.add(new ExtensionImpl(oid,
|
||||
cert.getExtensionValue(oid), false));
|
||||
}
|
||||
prc.setOcspExtensions(exts);
|
||||
requireEquals(exts, prc.getOcspExtensions(), "getOcspExtensions()");
|
||||
|
||||
Set<Option> options = EnumSet.of(Option.ONLY_END_ENTITY);
|
||||
prc.setOptions(options);
|
||||
requireEquals(options, prc.getOptions(), "getOptions()");
|
||||
|
||||
System.out.println("Testing that parameters are re-initialized to " +
|
||||
"default values if null is passed to set methods");
|
||||
prc.setOcspResponder(null);
|
||||
requireNull(prc.getOcspResponder(), "getOcspResponder()");
|
||||
prc.setOcspResponderCert(null);
|
||||
requireNull(prc.getOcspResponderCert(), "getOcspResponderCert()");
|
||||
prc.setOcspExtensions(null);
|
||||
requireEmpty(prc.getOcspExtensions(), "getOcspExtensions()");
|
||||
prc.setOcspResponses(null);
|
||||
requireEmpty(prc.getOcspResponses(), "getOcspResponses()");
|
||||
prc.setOptions(null);
|
||||
requireEmpty(prc.getOptions(), "getOptions()");
|
||||
|
||||
System.out.println("Testing that getRevocationChecker returns new " +
|
||||
"instance each time");
|
||||
CertPathChecker first = cpv.getRevocationChecker();
|
||||
CertPathChecker second = cpv.getRevocationChecker();
|
||||
if (first == second) {
|
||||
throw new Exception("FAILED: CertPathCheckers not new instances");
|
||||
}
|
||||
CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX");
|
||||
first = cpb.getRevocationChecker();
|
||||
second = cpb.getRevocationChecker();
|
||||
if (first == second) {
|
||||
throw new Exception("FAILED: CertPathCheckers not new instances");
|
||||
}
|
||||
}
|
||||
|
||||
static void requireNull(Object o, String msg) throws Exception {
|
||||
if (o != null) {
|
||||
throw new Exception("FAILED: " + msg + " must return null");
|
||||
}
|
||||
}
|
||||
|
||||
static void requireEmpty(Map<?,?> m, String msg) throws Exception {
|
||||
if (!m.isEmpty()) {
|
||||
throw new Exception("FAILED: " + msg + " must return an empty map");
|
||||
}
|
||||
}
|
||||
|
||||
static void requireEmpty(List<?> l, String msg) throws Exception {
|
||||
if (!l.isEmpty()) {
|
||||
throw new Exception("FAILED: " + msg +" must return an empty list");
|
||||
}
|
||||
}
|
||||
|
||||
static void requireEmpty(Set<?> s, String msg) throws Exception {
|
||||
if (!s.isEmpty()) {
|
||||
throw new Exception("FAILED: " + msg + " must return an empty set");
|
||||
}
|
||||
}
|
||||
|
||||
static void requireEquals(Object a, Object b, String msg) throws Exception {
|
||||
if (!a.equals(b)) {
|
||||
throw new Exception("FAILED: " + msg + " does not return the " +
|
||||
"same object that was set");
|
||||
}
|
||||
}
|
||||
|
||||
static X509Certificate getCert() throws Exception {
|
||||
String b64 =
|
||||
"-----BEGIN CERTIFICATE-----\n" +
|
||||
"MIIBLTCB2KADAgECAgEDMA0GCSqGSIb3DQEBBAUAMA0xCzAJBgNVBAMTAkNBMB4X\n" +
|
||||
"DTAyMTEwNzExNTcwM1oXDTIyMTEwNzExNTcwM1owFTETMBEGA1UEAxMKRW5kIEVu\n" +
|
||||
"dGl0eTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDVBDfF+uBr5s5jzzDs1njKlZNt\n" +
|
||||
"h8hHzEt3ASh67Peos+QrDzgpUyFXT6fdW2h7iPf0ifjM8eW2xa+3EnPjjU5jAgMB\n" +
|
||||
"AAGjGzAZMBcGA1UdIAQQMA4wBgYEVR0gADAEBgIqADANBgkqhkiG9w0BAQQFAANB\n" +
|
||||
"AFo//WOboCNOCcA1fvcWW9oc4MvV8ZPvFIAbyEbgyFd4id5lGDTRbRPvvNZRvdsN\n" +
|
||||
"NM2gXYr+f87NHIXc9EF3pzw=\n" +
|
||||
"-----END CERTIFICATE-----";
|
||||
|
||||
InputStream is = new ByteArrayInputStream(b64.getBytes("UTF-8"));
|
||||
CertificateFactory cf = CertificateFactory.getInstance("X.509");
|
||||
return (X509Certificate)cf.generateCertificate(is);
|
||||
}
|
||||
|
||||
static class ExtensionImpl implements Extension {
|
||||
private final String oid;
|
||||
private final byte[] val;
|
||||
private final boolean critical;
|
||||
|
||||
ExtensionImpl(String oid, byte[] val, boolean critical) {
|
||||
this.oid = oid;
|
||||
this.val = val;
|
||||
this.critical = critical;
|
||||
}
|
||||
|
||||
public void encode(OutputStream out) throws IOException {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return oid;
|
||||
}
|
||||
|
||||
public byte[] getValue() {
|
||||
return val.clone();
|
||||
}
|
||||
|
||||
public boolean isCritical() {
|
||||
return critical;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue