andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing assume checks to skip tests if KeyManagerFactory can not be used (#9148)

Browse Source 
Motivation:

Depending on what OpenSSL library version we use / system property that is set we need to skip tests that use KeyManagerFactory.

Modifications:

Add missing assume checks for tests that use KeyManagerFactory.

Result:

All tests pass even if KeyManagerFactory is not supported
This commit is contained in:
Norman Maurer 2019-05-15 07:24:01 +02:00 committed by GitHub
parent cf2f1f54b6
commit ccf56706f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
handler/src/test/java/io/netty/handler/ssl/ConscryptOpenSslEngineInteropTest.java
View File

@ -109,6 +109,13 @@ public class ConscryptOpenSslEngineInteropTest extends ConscryptSslEngineTest {
super.testMutualAuthInvalidIntermediateCAFailWithRequiredClientAuth();
}
@Override
@Test
public void testSessionAfterHandshakeKeyManagerFactory() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSessionAfterHandshakeKeyManagerFactory();
}
@Override
@Test
public void testSessionAfterHandshakeKeyManagerFactoryMutualAuth() throws Exception {
@ -116,6 +123,13 @@ public class ConscryptOpenSslEngineInteropTest extends ConscryptSslEngineTest {
super.testSessionAfterHandshakeKeyManagerFactoryMutualAuth();
}
@Override
@Test
public void testSupportedSignatureAlgorithms() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSupportedSignatureAlgorithms();
}
@Override
protected boolean mySetupMutualAuthServerIsValidServerException(Throwable cause) {
// TODO(scott): work around for a JDK issue. The exception should be SSLHandshakeException.

7
handler/src/test/java/io/netty/handler/ssl/JdkOpenSslEngineInteroptTest.java
View File

@ -134,6 +134,13 @@ public class JdkOpenSslEngineInteroptTest extends SSLEngineTest {
super.testHandshakeSession();
}
@Override
@Test
public void testSupportedSignatureAlgorithms() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSupportedSignatureAlgorithms();
}
@Override
protected SSLEngine wrapEngine(SSLEngine engine) {
return Java8SslTestUtils.wrapSSLEngineForTesting(engine);

7
handler/src/test/java/io/netty/handler/ssl/OpenSslConscryptSslEngineInteropTest.java
View File

@ -115,6 +115,13 @@ public class OpenSslConscryptSslEngineInteropTest extends ConscryptSslEngineTest
super.testSessionAfterHandshakeKeyManagerFactoryMutualAuth();
}
@Override
@Test
public void testSupportedSignatureAlgorithms() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSupportedSignatureAlgorithms();
}
@Override
protected boolean mySetupMutualAuthServerIsValidServerException(Throwable cause) {
// TODO(scott): work around for a JDK issue. The exception should be SSLHandshakeException.

7
handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java
View File

@ -152,6 +152,13 @@ public class OpenSslEngineTest extends SSLEngineTest {
super.testHandshakeSession();
}
@Override
@Test
public void testSupportedSignatureAlgorithms() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSupportedSignatureAlgorithms();
}
private static boolean isNpnSupported(String versionString) {
String[] versionStringParts = versionString.split(" ", -1);
if (versionStringParts.length == 2 && "LibreSSL".equals(versionStringParts[0])) {

7
handler/src/test/java/io/netty/handler/ssl/OpenSslJdkSslEngineInteroptTest.java
View File

@ -119,6 +119,13 @@ public class OpenSslJdkSslEngineInteroptTest extends SSLEngineTest {
super.testHandshakeSession();
}
@Override
@Test
public void testSupportedSignatureAlgorithms() throws Exception {
checkShouldUseKeyManagerFactory();
super.testSupportedSignatureAlgorithms();
}
@Override
protected SSLEngine wrapEngine(SSLEngine engine) {
return Java8SslTestUtils.wrapSSLEngineForTesting(engine);

3
handler/src/test/java/io/netty/handler/ssl/OpenSslPrivateKeyMethodTest.java
View File

@ -65,6 +65,7 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import static io.netty.handler.ssl.OpenSslTestUtils.checkShouldUseKeyManagerFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
@ -88,6 +89,8 @@ public class OpenSslPrivateKeyMethodTest {
@BeforeClass
public static void init() throws Exception {
checkShouldUseKeyManagerFactory();
Assume.assumeTrue(OpenSsl.isBoringSSL());
// Check if the cipher is supported at all which may not be the case for various JDK versions and OpenSSL API
// implementations.