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

Only parse the packet length one time per packet. See #382

Browse Source
This commit is contained in:
norman 2012-06-06 08:42:36 +02:00
parent 977ce4e645
commit 784722eff4
1 changed files with 61 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,6 +199,8 @@ public class SslHandler extends FrameDecoder
private final SSLEngineInboundCloseFuture sslEngineCloseFuture = new SSLEngineInboundCloseFuture(); private final SSLEngineInboundCloseFuture sslEngineCloseFuture = new SSLEngineInboundCloseFuture();
private int packetLength = -1;
/** /**
* Creates a new instance. * Creates a new instance.
* *
@ -572,73 +574,74 @@ public class SslHandler extends FrameDecoder
protected Object decode( protected Object decode(
final ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception { final ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception {
if (buffer.readableBytes() < 5) { if (packetLength == -1) {
return null; if (buffer.readableBytes() < 5) {
} return null;
}
int packetLength = 0; // SSLv3 or TLS - Check ContentType
boolean tls;
switch (buffer.getUnsignedByte(buffer.readerIndex())) {
case 20: // change_cipher_spec
case 21: // alert
case 22: // handshake
case 23: // application_data
tls = true;
break;
default:
// SSLv2 or bad data
tls = false;
}
// SSLv3 or TLS - Check ContentType if (tls) {
boolean tls; // SSLv3 or TLS - Check ProtocolVersion
switch (buffer.getUnsignedByte(buffer.readerIndex())) { int majorVersion = buffer.getUnsignedByte(buffer.readerIndex() + 1);
case 20: // change_cipher_spec if (majorVersion == 3) {
case 21: // alert // SSLv3 or TLS
case 22: // handshake packetLength = (getShort(buffer, buffer.readerIndex() + 3) & 0xFFFF) + 5;
case 23: // application_data if (packetLength <= 5) {
tls = true; // Neither SSLv3 or TLSv1 (i.e. SSLv2 or bad data)
break; tls = false;
default: }
// SSLv2 or bad data } else {
tls = false;
}
if (tls) {
// SSLv3 or TLS - Check ProtocolVersion
int majorVersion = buffer.getUnsignedByte(buffer.readerIndex() + 1);
if (majorVersion == 3) {
// SSLv3 or TLS
packetLength = (getShort(buffer, buffer.readerIndex() + 3) & 0xFFFF) + 5;
if (packetLength <= 5) {
// Neither SSLv3 or TLSv1 (i.e. SSLv2 or bad data) // Neither SSLv3 or TLSv1 (i.e. SSLv2 or bad data)
tls = false; tls = false;
} }
} else {
// Neither SSLv3 or TLSv1 (i.e. SSLv2 or bad data)
tls = false;
} }
}
if (!tls) { if (!tls) {
// SSLv2 or bad data - Check the version // SSLv2 or bad data - Check the version
boolean sslv2 = true; boolean sslv2 = true;
int headerLength = (buffer.getUnsignedByte( int headerLength = (buffer.getUnsignedByte(
buffer.readerIndex()) & 0x80) != 0 ? 2 : 3; buffer.readerIndex()) & 0x80) != 0 ? 2 : 3;
int majorVersion = buffer.getUnsignedByte( int majorVersion = buffer.getUnsignedByte(
buffer.readerIndex() + headerLength + 1); buffer.readerIndex() + headerLength + 1);
if (majorVersion == 2 || majorVersion == 3) { if (majorVersion == 2 || majorVersion == 3) {
// SSLv2 // SSLv2
if (headerLength == 2) { if (headerLength == 2) {
packetLength = (getShort(buffer, buffer.readerIndex()) & 0x7FFF) + 2; packetLength = (getShort(buffer, buffer.readerIndex()) & 0x7FFF) + 2;
} else {
packetLength = (getShort(buffer, buffer.readerIndex()) & 0x3FFF) + 3;
}
if (packetLength <= headerLength) {
sslv2 = false;
}
} else { } else {
packetLength = (getShort(buffer, buffer.readerIndex()) & 0x3FFF) + 3;
}
if (packetLength <= headerLength) {
sslv2 = false; sslv2 = false;
} }
} else {
sslv2 = false; if (!sslv2) {
// Bad data - discard the buffer and raise an exception.
SSLException e = new SSLException(
"not an SSL/TLS record: " + ChannelBuffers.hexDump(buffer));
buffer.skipBytes(buffer.readableBytes());
throw e;
}
} }
if (!sslv2) { assert packetLength > 0;
// Bad data - discard the buffer and raise an exception.
SSLException e = new SSLException(
"not an SSL/TLS record: " + ChannelBuffers.hexDump(buffer));
buffer.skipBytes(buffer.readableBytes());
throw e;
}
} }
assert packetLength > 0;
if (buffer.readableBytes() < packetLength) { if (buffer.readableBytes() < packetLength) {
return null; return null;
@ -660,7 +663,11 @@ public class SslHandler extends FrameDecoder
// before calling the user code. // before calling the user code.
final int packetOffset = buffer.readerIndex(); final int packetOffset = buffer.readerIndex();
buffer.skipBytes(packetLength); buffer.skipBytes(packetLength);
return unwrap(ctx, channel, buffer, packetOffset, packetLength); try {
return unwrap(ctx, channel, buffer, packetOffset, packetLength);
} finally {
packetLength = -1;
}
} }
/** /**