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

Fail the build if we can't load the OpenSSL library (#11269)

Browse Source 
Motivation:

We should better fail the build if we can't load the OpenSSL library to ensure we not introduce a regression at some point related to native library loading

Modifications:

Remove usages of assumeTrue and let the tests fail if we cant load the native lib

Result:

Ensure we not regress
This commit is contained in:
Norman Maurer 2021-05-19 08:19:15 +02:00
parent afa6230c90
commit c56e5e6e4f
17 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/docker-compose.yaml
View File

@ -25,11 +25,11 @@ services:
build-leak:
<<: *common
command: /bin/bash -cl "./mvnw -Pleak clean install -Dio.netty.testsuite.badHost=netty.io"
command: /bin/bash -cl "./mvnw -Pleak clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.classifier=linux-x86_64-fedora"
build:
<<: *common
command: /bin/bash -cl "./mvnw clean install -Dio.netty.testsuite.badHost=netty.io"
command: /bin/bash -cl "./mvnw clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.classifier=linux-x86_64-fedora"
deploy:
<<: *common
@ -52,7 +52,7 @@ services:
- ~/.m2:/root/.m2
- ~/local-staging:/root/local-staging
- ..:/code
command: /bin/bash -cl "cat <(echo -e \"${GPG_PRIVATE_KEY}\") | gpg --batch --import && ./mvnw clean javadoc:jar package gpg:sign org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging -DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true -DskipTests=true -Dgpg.passphrase=${GPG_PASSPHRASE} -Dgpg.keyname=${GPG_KEYNAME}"
command: /bin/bash -cl "cat <(echo -e \"${GPG_PRIVATE_KEY}\") | gpg --batch --import && ./mvnw clean javadoc:jar package gpg:sign org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DnexusUrl=https://oss.sonatype.org -DserverId=sonatype-nexus-staging -DaltStagingDirectory=/root/local-staging -DskipRemoteStaging=true -DskipTests=true -Dgpg.passphrase=${GPG_PASSPHRASE} -Dgpg.keyname=${GPG_KEYNAME} -Dtcnative.classifier=linux-x86_64-fedora"
build-boringssl-static:
<<: *common

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

@ -58,7 +58,7 @@ public class ConscryptOpenSslEngineInteropTest extends ConscryptSslEngineTest {
@BeforeClass
public static void checkOpenssl() {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
}
@Override

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

@ -63,7 +63,7 @@ public class JdkOpenSslEngineInteroptTest extends SSLEngineTest {
@BeforeClass
public static void checkOpenSsl() {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
}
@Override

10
handler/src/test/java/io/netty/handler/ssl/OpenSslCertificateExceptionTest.java
View File

@ -17,16 +17,20 @@ package io.netty.handler.ssl;
import io.netty.internal.tcnative.CertificateVerifier;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import java.lang.reflect.Field;
public class OpenSslCertificateExceptionTest {
@BeforeClass
public static void ensureOpenSsl() {
OpenSsl.ensureAvailability();
}
@Test
public void testValidErrorCode() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
Field[] fields = CertificateVerifier.class.getFields();
for (Field field : fields) {
if (field.isAccessible()) {
@ -39,13 +43,11 @@ public class OpenSslCertificateExceptionTest {
@Test(expected = IllegalArgumentException.class)
public void testNonValidErrorCode() {
Assume.assumeTrue(OpenSsl.isAvailable());
new OpenSslCertificateException(Integer.MIN_VALUE);
}
@Test
public void testCanBeInstancedWhenOpenSslIsNotAvailable() {
Assume.assumeFalse(OpenSsl.isAvailable());
new OpenSslCertificateException(0);
}
}

4
handler/src/test/java/io/netty/handler/ssl/OpenSslClientContextTest.java
View File

@ -21,13 +21,11 @@ import org.junit.BeforeClass;
import javax.net.ssl.SSLException;
import java.io.File;
import static org.junit.Assume.assumeTrue;
public class OpenSslClientContextTest extends SslContextTest {
@BeforeClass
public static void checkOpenSsl() {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
}
@Override

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

@ -57,7 +57,7 @@ public class OpenSslConscryptSslEngineInteropTest extends ConscryptSslEngineTest
@BeforeClass
public static void checkOpenssl() {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
}
@Override

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

@ -111,7 +111,7 @@ public class OpenSslEngineTest extends SSLEngineTest {
@BeforeClass
public static void checkOpenSsl() {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
}
@Override
@ -1320,6 +1320,7 @@ public class OpenSslEngineTest extends SSLEngineTest {
@Test(expected = SSLException.class)
public void testNoKeyFound() throws Exception {
checkShouldUseKeyManagerFactory();
clientSslCtx = wrapContext(SslContextBuilder
.forClient()
.trustManager(InsecureTrustManagerFactory.INSTANCE)

2
handler/src/test/java/io/netty/handler/ssl/OpenSslKeyMaterialManagerTest.java
View File

@ -33,7 +33,7 @@ public class OpenSslKeyMaterialManagerTest {
@Test
public void testChooseClientAliasReturnsNull() throws SSLException {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
X509ExtendedKeyManager keyManager = new X509ExtendedKeyManager() {
@Override

2
handler/src/test/java/io/netty/handler/ssl/OpenSslKeyMaterialProviderTest.java
View File

@ -42,7 +42,7 @@ public class OpenSslKeyMaterialProviderTest {
@BeforeClass
public static void checkOpenSsl() {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
}
protected KeyManagerFactory newKeyManagerFactory() throws Exception {

2
handler/src/test/java/io/netty/handler/ssl/OpenSslRenegotiateTest.java
View File

@ -30,7 +30,7 @@ public class OpenSslRenegotiateTest extends RenegotiateTest {
@BeforeClass
public static void checkOpenSsl() {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
}
@Override

6
handler/src/test/java/io/netty/handler/ssl/OpenSslServerContextTest.java
View File

@ -16,24 +16,20 @@
package io.netty.handler.ssl;
import org.junit.Assume;
import org.junit.BeforeClass;
import javax.net.ssl.SSLException;
import java.io.File;
import static org.junit.Assume.assumeTrue;
public class OpenSslServerContextTest extends SslContextTest {
@BeforeClass
public static void checkOpenSsl() {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
}
@Override
protected SslContext newSslContext(File crtFile, File keyFile, String pass) throws SSLException {
Assume.assumeTrue(OpenSsl.isAvailable());
return SslContextBuilder.forServer(crtFile, keyFile, pass).sslProvider(SslProvider.OPENSSL).build();
}
}

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

@ -19,7 +19,6 @@ package io.netty.handler.ssl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;
import java.io.ByteArrayOutputStream;
import java.io.File;
@ -45,7 +44,7 @@ public class PemEncodedTest {
}
private static void testPemEncoded(SslProvider provider) throws Exception {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
assumeFalse(OpenSsl.supportsKeyManagerFactory());
PemPrivateKey pemKey;
PemX509Certificate pemCert;

4
handler/src/test/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngineTest.java
View File

@ -48,7 +48,7 @@ public class ReferenceCountedOpenSslEngineTest extends OpenSslEngineTest {
@Override
protected void cleanupClientSslEngine(SSLEngine engine) {
ReferenceCountUtil.release(engine);
ReferenceCountUtil.release(unwrapEngine(engine));
}
@Override
@ -58,7 +58,7 @@ public class ReferenceCountedOpenSslEngineTest extends OpenSslEngineTest {
@Override
protected void cleanupServerSslEngine(SSLEngine engine) {
ReferenceCountUtil.release(engine);
ReferenceCountUtil.release(unwrapEngine(engine));
}
@Test(expected = NullPointerException.class)

16
handler/src/test/java/io/netty/handler/ssl/SslContextBuilderTest.java
View File

@ -46,7 +46,7 @@ public class SslContextBuilderTest {
@Test
public void testClientContextFromFileOpenssl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
testClientContextFromFile(SslProvider.OPENSSL);
}
@ -57,7 +57,7 @@ public class SslContextBuilderTest {
@Test
public void testClientContextOpenssl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
testClientContext(SslProvider.OPENSSL);
}
@ -68,7 +68,7 @@ public class SslContextBuilderTest {
@Test
public void testKeyStoreTypeOpenssl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
testKeyStoreType(SslProvider.OPENSSL);
}
@ -79,7 +79,7 @@ public class SslContextBuilderTest {
@Test
public void testServerContextFromFileOpenssl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
testServerContextFromFile(SslProvider.OPENSSL);
}
@ -90,7 +90,7 @@ public class SslContextBuilderTest {
@Test
public void testServerContextOpenssl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
testServerContext(SslProvider.OPENSSL);
}
@ -101,7 +101,7 @@ public class SslContextBuilderTest {
@Test
public void testContextFromManagersOpenssl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
Assume.assumeTrue(OpenSsl.supportsKeyManagerFactory());
testContextFromManagers(SslProvider.OPENSSL);
}
@ -154,13 +154,13 @@ public class SslContextBuilderTest {
@Test(expected = IllegalArgumentException.class)
public void testInvalidCipherJdk() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
testInvalidCipher(SslProvider.JDK);
}
@Test
public void testInvalidCipherOpenSSL() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
try {
// This may fail or not depending on the OpenSSL version used
// See https://github.com/openssl/openssl/issues/7196

2
handler/src/test/java/io/netty/handler/ssl/SslErrorTest.java
View File

@ -127,7 +127,7 @@ public class SslErrorTest {
public void testCorrectAlert() throws Exception {
// As this only works correctly at the moment when OpenSslEngine is used on the server-side there is
// no need to run it if there is no openssl is available at all.
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
SelfSignedCertificate ssc = new SelfSignedCertificate();

12
handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java
View File

@ -365,7 +365,7 @@ public class SslHandlerTest {
@Test
public void testReleaseSslEngine() throws Exception {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
SelfSignedCertificate cert = new SelfSignedCertificate();
try {
@ -1111,7 +1111,7 @@ public class SslHandlerTest {
}
private static void testSessionTickets(SslProvider provider, String protocol, boolean withKey) throws Throwable {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
final SslContext sslClientCtx = SslContextBuilder.forClient()
.trustManager(InsecureTrustManagerFactory.INSTANCE)
.sslProvider(provider)
@ -1390,13 +1390,13 @@ public class SslHandlerTest {
@Test
public void testHandshakeFailureCipherMissmatchTLSv12OpenSsl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
testHandshakeFailureCipherMissmatch(SslProvider.OPENSSL, false);
}
@Test
public void testHandshakeFailureCipherMissmatchTLSv13OpenSsl() throws Exception {
Assume.assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
Assume.assumeTrue(SslProvider.isTlsv13Supported(SslProvider.OPENSSL));
Assume.assumeFalse("BoringSSL does not support setting ciphers for TLSv1.3 explicit", OpenSsl.isBoringSSL());
testHandshakeFailureCipherMissmatch(SslProvider.OPENSSL, true);
@ -1509,7 +1509,7 @@ public class SslHandlerTest {
@Test
public void testHandshakeEventsTls12Openssl() throws Exception {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
testHandshakeEvents(SslProvider.OPENSSL, SslUtils.PROTOCOL_TLS_V1_2);
}
@ -1521,7 +1521,7 @@ public class SslHandlerTest {
@Test
public void testHandshakeEventsTls13Openssl() throws Exception {
assumeTrue(OpenSsl.isAvailable());
OpenSsl.ensureAvailability();
assumeTrue(SslProvider.isTlsv13Supported(SslProvider.OPENSSL));
testHandshakeEvents(SslProvider.OPENSSL, SslUtils.PROTOCOL_TLS_V1_3);
}

23
transport-blockhound-tests/src/test/java/io/netty/util/internal/NettyBlockHoundIntegrationTest.java
View File

@ -240,14 +240,25 @@ public class NettyBlockHoundIntegrationTest {
}
@Test
public void testTrustManagerVerify() throws Exception {
testTrustManagerVerify("TLSv1.2");
public void testTrustManagerVerifyJDK() throws Exception {
testTrustManagerVerify(SslProvider.JDK, "TLSv1.2");
}
@Test
public void testTrustManagerVerifyTLSv13() throws Exception {
public void testTrustManagerVerifyTLSv13JDK() throws Exception {
assumeTrue(SslProvider.isTlsv13Supported(SslProvider.JDK));
testTrustManagerVerify("TLSv1.3");
testTrustManagerVerify(SslProvider.JDK, "TLSv1.3");
}
@Test
public void testTrustManagerVerifyOpenSSL() throws Exception {
testTrustManagerVerify(SslProvider.OPENSSL, "TLSv1.2");
}
@Test
public void testTrustManagerVerifyTLSv13OpenSSL() throws Exception {
assumeTrue(SslProvider.isTlsv13Supported(SslProvider.OPENSSL));
testTrustManagerVerify(SslProvider.OPENSSL, "TLSv1.3");
}
@Test
@ -378,9 +389,10 @@ public class NettyBlockHoundIntegrationTest {
}
}
private static void testTrustManagerVerify(String tlsVersion) throws Exception {
private static void testTrustManagerVerify(SslProvider provider, String tlsVersion) throws Exception {
final SslContext sslClientCtx =
SslContextBuilder.forClient()
.sslProvider(provider)
.protocols(tlsVersion)
.trustManager(ResourcesUtil.getFile(
NettyBlockHoundIntegrationTest.class, "mutual_auth_ca.pem"))
@ -392,6 +404,7 @@ public class NettyBlockHoundIntegrationTest {
ResourcesUtil.getFile(
NettyBlockHoundIntegrationTest.class, "localhost_server.key"),
null)
.sslProvider(provider)
.protocols(tlsVersion)
.build();