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

Backport fix for make SslHandler close the connection on SSLException or NotSslRecordException. This needs to get enabled via setter to keep backward compatibility. See #160

Browse Source
This commit is contained in:
norman 2012-08-22 07:46:49 +02:00
parent 01ba0ff075
commit 03c4283020
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
View File

@ -206,6 +206,8 @@ public class SslHandler extends FrameDecoder
private final SSLEngineInboundCloseFuture sslEngineCloseFuture = new SSLEngineInboundCloseFuture();
private boolean closeOnSSLException;
/**
* Creates a new instance.
*
@ -372,9 +374,15 @@ public class SslHandler extends FrameDecoder
handshakeFuture.setFailure(e);
fireExceptionCaught(ctx, e);
if (closeOnSSLException) {
Channels.close(ctx, future(channel));
}
}
} else { // Failed to initiate handshake.
fireExceptionCaught(ctx, exception);
if (closeOnSSLException) {
Channels.close(ctx, future(channel));
}
}
return handshakeFuture;
@ -400,6 +408,9 @@ public class SslHandler extends FrameDecoder
return wrapNonAppData(ctx, channel);
} catch (SSLException e) {
fireExceptionCaught(ctx, e);
if (closeOnSSLException) {
Channels.close(ctx, future(channel));
}
return failedFuture(channel, e);
}
}
@ -455,6 +466,25 @@ public class SslHandler extends FrameDecoder
}
/**
* If set to <code>true</code>, the {@link Channel} will automatically get closed
* one a {@link SSLException} was caught. This is most times what you want, as after this
* its almost impossible to recover.
*
* Anyway the default is <code>false</code> to not break compatibility with older releases. This
* will be changed to <code>true</code> in the next major release.
*
*/
public void setCloseOnSSLException(boolean closeOnSslException) {
if (ctx != null) {
throw new IllegalStateException("Can only get changed before attached to ChannelPipeline");
}
this.closeOnSSLException = closeOnSslException;
}
public boolean getCloseOnSSLException() {
return closeOnSSLException;
}
public void handleDownstream(
final ChannelHandlerContext context, final ChannelEvent evt) throws Exception {
@ -696,7 +726,17 @@ public class SslHandler extends FrameDecoder
NotSslRecordException e = new NotSslRecordException(
"not an SSL/TLS record: " + ChannelBuffers.hexDump(buffer));
buffer.skipBytes(buffer.readableBytes());
throw e;
if (closeOnSSLException) {
// first trigger the exception and then close the channel
fireExceptionCaught(ctx, e);
Channels.close(ctx, future(channel));
// just return null as we closed the channel before, that
// will take care of cleanup etc
return null;
} else {
throw e;
}
}
}
@ -1208,6 +1248,9 @@ public class SslHandler extends FrameDecoder
}
handshakeFuture.setFailure(cause);
if (closeOnSSLException) {
Channels.close(ctx, future(channel));
}
}
private void closeOutboundAndChannel(