1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.tomcat.security;
import java.io.IOException;
import java.net.SocketException;
import javax.net.ssl.SSLHandshakeException;
import jakarta.servlet.http.HttpServletResponse;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.apache.catalina.Context;
import org.apache.catalina.startup.Tomcat;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.TesterSupport;
import org.apache.tomcat.util.net.TesterSupport.SimpleServlet;
import org.apache.tomcat.util.net.ocsp.OcspBaseTest;
import org.apache.tomcat.util.net.ocsp.TesterOcspResponder;
import org.apache.tomcat.util.net.openssl.OpenSSLStatus;
@RunWith(Parameterized.class)
public class TestSecurity2017Ocsp extends OcspBaseTest {
private static TesterOcspResponder ocspResponder;
@BeforeClass
public static void startOcspResponder() {
ocspResponder = new TesterOcspResponder();
try {
ocspResponder.start();
} catch (IOException ioe) {
ocspResponder = null;
}
}
@AfterClass
public static void stopOcspResponder() {
if (ocspResponder != null) {
ocspResponder.stop();
ocspResponder = null;
}
}
/*
* In addition to testing Tomcat Native (where the CVE occurred), this also tests JSSE and OpenSSl via FFM.
*/
@Test(expected=SSLHandshakeException.class)
public void testCVE_2017_15698() throws Exception {
if ("OpenSSL-FFM".equals(connectorName)) {
Assume.assumeFalse(OpenSSLStatus.isBoringSSL() || OpenSSLStatus.isLibreSSLPre35());
}
Assume.assumeNotNull(ocspResponder);
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "simple", new SimpleServlet());
ctx.addServletMappingDecoded("/simple", "simple");
// Use the default (valid, non-revoked) server certificate
TesterSupport.initSsl(tomcat, useOpenSSLTrust);
// Require client certificates and enable verification
SSLHostConfig sslHostConfig = tomcat.getConnector().findSslHostConfigs()[0];
sslHostConfig.setOcspEnabled(true);
sslHostConfig.setCertificateVerification("required");
// Configure a revoked client certificate with a long AIA
// Don't verify the server certificate
TesterSupport.configureClientSsl(false, TesterSupport.CLIENT_CRL_LONG_JKS);
// Disable soft-fail
sslHostConfig.setOcspSoftFail(false);
tomcat.start();
int rc;
try {
rc = getUrl("https://localhost:" + getPort() + "/simple", new ByteChunk(), false);
} catch (SocketException se) {
throw new SSLHandshakeException(se.getMessage());
}
// If the TLS handshake fails, the test won't get this far.
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
}
|
