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

Fix leak in SniClientTest. (#8324)

Browse Source 
Motivation:

We need to release the ReferenceCountedSslContext to eliminate resource leaks.

Reported in https://garage.netty.io/teamcity/viewLog.html?buildId=33353&buildTypeId=netty_build_oraclejdk8&tab=buildLog#_focus=157264.

Modifications:

Call release on the SslContext instances.

Result:

No more leaks in tests.
This commit is contained in:
Norman Maurer 2018-09-26 19:59:00 +02:00 committed by GitHub
parent 60a7ece4c3
commit 4d1458604a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
handler/src/test/java/io/netty/handler/ssl/SniClientTest.java
View File

@ -28,6 +28,8 @@ import io.netty.channel.local.LocalServerChannel;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import io.netty.handler.ssl.util.SelfSignedCertificate; import io.netty.handler.ssl.util.SelfSignedCertificate;
import io.netty.util.Mapping; import io.netty.util.Mapping;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.ReferenceCounted;
import io.netty.util.concurrent.Promise; import io.netty.util.concurrent.Promise;
import io.netty.util.internal.PlatformDependent; import io.netty.util.internal.PlatformDependent;
import org.junit.Assert; import org.junit.Assert;
@ -95,12 +97,13 @@ public class SniClientTest {
String sniHostName = "sni.netty.io"; String sniHostName = "sni.netty.io";
LocalAddress address = new LocalAddress("test"); LocalAddress address = new LocalAddress("test");
EventLoopGroup group = new DefaultEventLoopGroup(1); EventLoopGroup group = new DefaultEventLoopGroup(1);
SelfSignedCertificate cert = new SelfSignedCertificate();
SslContext sslServerContext = null;
SslContext sslClientContext = null;
Channel sc = null; Channel sc = null;
Channel cc = null; Channel cc = null;
try { try {
SelfSignedCertificate cert = new SelfSignedCertificate();
final SslContext sslServerContext;
if ((sslServerProvider == SslProvider.OPENSSL || sslServerProvider == SslProvider.OPENSSL_REFCNT) if ((sslServerProvider == SslProvider.OPENSSL || sslServerProvider == SslProvider.OPENSSL_REFCNT)
&& !OpenSsl.useKeyManagerFactory()) { && !OpenSsl.useKeyManagerFactory()) {
sslServerContext = SslContextBuilder.forServer(cert.certificate(), cert.privateKey()) sslServerContext = SslContextBuilder.forServer(cert.certificate(), cert.privateKey())
@ -118,6 +121,7 @@ public class SniClientTest {
.build(); .build();
} }
final SslContext finalContext = sslServerContext;
final Promise<String> promise = group.next().newPromise(); final Promise<String> promise = group.next().newPromise();
ServerBootstrap sb = new ServerBootstrap(); ServerBootstrap sb = new ServerBootstrap();
sc = sb.group(group).channel(LocalServerChannel.class).childHandler(new ChannelInitializer<Channel>() { sc = sb.group(group).channel(LocalServerChannel.class).childHandler(new ChannelInitializer<Channel>() {
@ -127,7 +131,7 @@ public class SniClientTest {
@Override @Override
public SslContext map(String input) { public SslContext map(String input) {
promise.setSuccess(input); promise.setSuccess(input);
return sslServerContext; return finalContext;
} }
})); }));
} }
@ -136,12 +140,12 @@ public class SniClientTest {
TrustManagerFactory tmf = PlatformDependent.javaVersion() >= 8 ? TrustManagerFactory tmf = PlatformDependent.javaVersion() >= 8 ?
SniClientJava8TestUtil.newSniX509TrustmanagerFactory(sniHostName) : SniClientJava8TestUtil.newSniX509TrustmanagerFactory(sniHostName) :
InsecureTrustManagerFactory.INSTANCE; InsecureTrustManagerFactory.INSTANCE;
SslContext sslContext = SslContextBuilder.forClient().trustManager(tmf) sslClientContext = SslContextBuilder.forClient().trustManager(tmf)
.sslProvider(sslClientProvider).build(); .sslProvider(sslClientProvider).build();
Bootstrap cb = new Bootstrap(); Bootstrap cb = new Bootstrap();
SslHandler handler = new SslHandler( SslHandler handler = new SslHandler(
sslContext.newEngine(ByteBufAllocator.DEFAULT, sniHostName, -1)); sslClientContext.newEngine(ByteBufAllocator.DEFAULT, sniHostName, -1));
cc = cb.group(group).channel(LocalChannel.class).handler(handler) cc = cb.group(group).channel(LocalChannel.class).handler(handler)
.connect(address).syncUninterruptibly().channel(); .connect(address).syncUninterruptibly().channel();
Assert.assertEquals(sniHostName, promise.syncUninterruptibly().getNow()); Assert.assertEquals(sniHostName, promise.syncUninterruptibly().getNow());
@ -160,6 +164,11 @@ public class SniClientTest {
if (sc != null) { if (sc != null) {
sc.close().syncUninterruptibly(); sc.close().syncUninterruptibly();
} }
ReferenceCountUtil.release(sslServerContext);
ReferenceCountUtil.release(sslClientContext);
cert.delete();
group.shutdownGracefully(); group.shutdownGracefully();
} }
} }