Add interopt tests between Conscrypt and OpenSSL SSLEngine implementations. (#8919)
Motivation: In the past we found a lot of SSL related bugs because of the interopt tests we have in place between different SSLEngine implementations. We should have as many of these interopt tests as possible for this reason. Modifications: - Add interopt tests between Conscrypt and OpenSSL SSLEngine implementations Result: More tests for SSL.
This commit is contained in:
Norman Maurer
parent
902cdaae56
commit
22128a85fe
@ -0,0 +1,143 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project 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 io.netty.handler.ssl;
|
||||||
|
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.Ignore;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.junit.runners.Parameterized;
|
||||||
|
|
||||||
|
import javax.net.ssl.SSLEngine;
|
||||||
|
import javax.net.ssl.SSLException;
|
||||||
|
import java.security.Provider;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static io.netty.handler.ssl.OpenSslTestUtils.checkShouldUseKeyManagerFactory;
|
||||||
|
import static org.junit.Assume.assumeTrue;
|
||||||
|
|
||||||
|
@RunWith(Parameterized.class)
|
||||||
|
public class ConscryptOpenSslEngineInteropTest extends ConscryptSslEngineTest {
|
||||||
|
|
||||||
|
@Parameterized.Parameters(name = "{index}: bufferType = {0}, combo = {1}, delegate = {2}")
|
||||||
|
public static Collection<Object[]> data() {
|
||||||
|
List<Object[]> params = new ArrayList<Object[]>();
|
||||||
|
for (BufferType type: BufferType.values()) {
|
||||||
|
params.add(new Object[] { type, ProtocolCipherCombo.tlsv12(), false });
|
||||||
|
params.add(new Object[] { type, ProtocolCipherCombo.tlsv12(), true });
|
||||||
|
}
|
||||||
|
return params;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ConscryptOpenSslEngineInteropTest(BufferType type, ProtocolCipherCombo combo, boolean delegate) {
|
||||||
|
super(type, combo, delegate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void checkOpenssl() {
|
||||||
|
assumeTrue(OpenSsl.isAvailable());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SslProvider sslClientProvider() {
|
||||||
|
return SslProvider.JDK;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SslProvider sslServerProvider() {
|
||||||
|
return SslProvider.OPENSSL;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Provider serverSslContextProvider() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
@Ignore("TODO: Make this work with Conscrypt")
|
||||||
|
public void testMutualAuthValidClientCertChainTooLongFailOptionalClientAuth() {
|
||||||
|
super.testMutualAuthValidClientCertChainTooLongFailOptionalClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
@Ignore("TODO: Make this work with Conscrypt")
|
||||||
|
public void testMutualAuthValidClientCertChainTooLongFailRequireClientAuth() {
|
||||||
|
super.testMutualAuthValidClientCertChainTooLongFailRequireClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean mySetupMutualAuthServerIsValidClientException(Throwable cause) {
|
||||||
|
// TODO(scott): work around for a JDK issue. The exception should be SSLHandshakeException.
|
||||||
|
return super.mySetupMutualAuthServerIsValidClientException(cause) || causedBySSLException(cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth() throws Exception {
|
||||||
|
checkShouldUseKeyManagerFactory();
|
||||||
|
super.testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth() throws Exception {
|
||||||
|
checkShouldUseKeyManagerFactory();
|
||||||
|
super.testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth() throws Exception {
|
||||||
|
checkShouldUseKeyManagerFactory();
|
||||||
|
super.testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testClientHostnameValidationSuccess() throws InterruptedException, SSLException {
|
||||||
|
assumeTrue(OpenSsl.supportsHostnameValidation());
|
||||||
|
super.testClientHostnameValidationSuccess();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testClientHostnameValidationFail() throws InterruptedException, SSLException {
|
||||||
|
assumeTrue(OpenSsl.supportsHostnameValidation());
|
||||||
|
super.testClientHostnameValidationFail();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testSessionAfterHandshakeKeyManagerFactoryMutualAuth() throws Exception {
|
||||||
|
checkShouldUseKeyManagerFactory();
|
||||||
|
super.testSessionAfterHandshakeKeyManagerFactoryMutualAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean mySetupMutualAuthServerIsValidServerException(Throwable cause) {
|
||||||
|
// TODO(scott): work around for a JDK issue. The exception should be SSLHandshakeException.
|
||||||
|
return super.mySetupMutualAuthServerIsValidServerException(cause) || causedBySSLException(cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SSLEngine wrapEngine(SSLEngine engine) {
|
||||||
|
return Java8SslTestUtils.wrapSSLEngineForTesting(engine);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,143 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 The Netty Project
|
||||||
|
*
|
||||||
|
* The Netty Project 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 io.netty.handler.ssl;
|
||||||
|
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.Ignore;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.junit.runners.Parameterized;
|
||||||
|
|
||||||
|
import javax.net.ssl.SSLEngine;
|
||||||
|
import javax.net.ssl.SSLException;
|
||||||
|
import java.security.Provider;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static io.netty.handler.ssl.OpenSslTestUtils.checkShouldUseKeyManagerFactory;
|
||||||
|
import static org.junit.Assume.assumeTrue;
|
||||||
|
|
||||||
|
@RunWith(Parameterized.class)
|
||||||
|
public class OpenSslConscryptSslEngineInteropTest extends ConscryptSslEngineTest {
|
||||||
|
|
||||||
|
@Parameterized.Parameters(name = "{index}: bufferType = {0}, combo = {1}, delegate = {2}")
|
||||||
|
public static Collection<Object[]> data() {
|
||||||
|
List<Object[]> params = new ArrayList<Object[]>();
|
||||||
|
for (BufferType type: BufferType.values()) {
|
||||||
|
params.add(new Object[] { type, ProtocolCipherCombo.tlsv12(), false });
|
||||||
|
params.add(new Object[] { type, ProtocolCipherCombo.tlsv12(), true });
|
||||||
|
}
|
||||||
|
return params;
|
||||||
|
}
|
||||||
|
|
||||||
|
public OpenSslConscryptSslEngineInteropTest(BufferType type, ProtocolCipherCombo combo, boolean delegate) {
|
||||||
|
super(type, combo, delegate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void checkOpenssl() {
|
||||||
|
assumeTrue(OpenSsl.isAvailable());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SslProvider sslClientProvider() {
|
||||||
|
return SslProvider.OPENSSL;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SslProvider sslServerProvider() {
|
||||||
|
return SslProvider.JDK;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Provider clientSslContextProvider() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
@Ignore("TODO: Make this work with Conscrypt")
|
||||||
|
public void testMutualAuthValidClientCertChainTooLongFailOptionalClientAuth() {
|
||||||
|
super.testMutualAuthValidClientCertChainTooLongFailOptionalClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
@Ignore("TODO: Make this work with Conscrypt")
|
||||||
|
public void testMutualAuthValidClientCertChainTooLongFailRequireClientAuth() {
|
||||||
|
super.testMutualAuthValidClientCertChainTooLongFailRequireClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean mySetupMutualAuthServerIsValidClientException(Throwable cause) {
|
||||||
|
// TODO(scott): work around for a JDK issue. The exception should be SSLHandshakeException.
|
||||||
|
return super.mySetupMutualAuthServerIsValidClientException(cause) || causedBySSLException(cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth() throws Exception {
|
||||||
|
checkShouldUseKeyManagerFactory();
|
||||||
|
super.testMutualAuthInvalidIntermediateCASucceedWithOptionalClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth() throws Exception {
|
||||||
|
checkShouldUseKeyManagerFactory();
|
||||||
|
super.testMutualAuthInvalidIntermediateCAFailWithOptionalClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth() throws Exception {
|
||||||
|
checkShouldUseKeyManagerFactory();
|
||||||
|
super.testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testClientHostnameValidationSuccess() throws InterruptedException, SSLException {
|
||||||
|
assumeTrue(OpenSsl.supportsHostnameValidation());
|
||||||
|
super.testClientHostnameValidationSuccess();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testClientHostnameValidationFail() throws InterruptedException, SSLException {
|
||||||
|
assumeTrue(OpenSsl.supportsHostnameValidation());
|
||||||
|
super.testClientHostnameValidationFail();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Test
|
||||||
|
public void testSessionAfterHandshakeKeyManagerFactoryMutualAuth() throws Exception {
|
||||||
|
checkShouldUseKeyManagerFactory();
|
||||||
|
super.testSessionAfterHandshakeKeyManagerFactoryMutualAuth();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean mySetupMutualAuthServerIsValidServerException(Throwable cause) {
|
||||||
|
// TODO(scott): work around for a JDK issue. The exception should be SSLHandshakeException.
|
||||||
|
return super.mySetupMutualAuthServerIsValidServerException(cause) || causedBySSLException(cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SSLEngine wrapEngine(SSLEngine engine) {
|
||||||
|
return Java8SslTestUtils.wrapSSLEngineForTesting(engine);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user