Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #1013

This commit is contained in:
Justin Bertram 2017-02-14 11:45:26 -06:00
parent db2c711e24 992dc2bc1b
commit 8938c26cc0
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
View File

@ -80,6 +80,7 @@ import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseDecoder; import io.netty.handler.codec.http.HttpResponseDecoder;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion; import io.netty.handler.codec.http.HttpVersion;
import io.netty.handler.codec.http.LastHttpContent;
import io.netty.handler.codec.http.cookie.ClientCookieEncoder; import io.netty.handler.codec.http.cookie.ClientCookieEncoder;
import io.netty.handler.ssl.SslHandler; import io.netty.handler.ssl.SslHandler;
import io.netty.util.AttributeKey; import io.netty.util.AttributeKey;
@ -745,36 +746,50 @@ public class NettyConnector extends AbstractConnector {
this.httpClientCodec = httpClientCodec; this.httpClientCodec = httpClientCodec;
} }
/**
* HTTP upgrade response will be decode by Netty as 2 objects:
* - 1 HttpObject corresponding to the 101 SWITCHING PROTOCOL headers
* - 1 EMPTY_LAST_CONTENT
*
* The HTTP upgrade is successful whne the 101 SWITCHING PROTOCOL has been received (handshakeComplete = true)
* but the latch is count down only when the following EMPTY_LAST_CONTENT is also received.
* Otherwise this ChannelHandler would be removed too soon and the ActiveMQChannelHandler would handle the
* EMPTY_LAST_CONTENT (while it is expecitng only ByteBuf).
*/
@Override @Override
public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception { public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Received msg=" + msg); logger.debug("Received msg=" + msg);
} }
try { if (msg instanceof HttpResponse) {
if (msg instanceof HttpResponse) { HttpResponse response = (HttpResponse) msg;
HttpResponse response = (HttpResponse) msg; if (response.getStatus().code() == HttpResponseStatus.SWITCHING_PROTOCOLS.code() && response.headers().get(HttpHeaders.Names.UPGRADE).equals(ACTIVEMQ_REMOTING)) {
if (response.getStatus().code() == HttpResponseStatus.SWITCHING_PROTOCOLS.code() && response.headers().get(HttpHeaders.Names.UPGRADE).equals(ACTIVEMQ_REMOTING)) { String accept = response.headers().get(SEC_ACTIVEMQ_REMOTING_ACCEPT);
String accept = response.headers().get(SEC_ACTIVEMQ_REMOTING_ACCEPT); String expectedResponse = createExpectedResponse(MAGIC_NUMBER, ctx.channel().attr(REMOTING_KEY).get());
String expectedResponse = createExpectedResponse(MAGIC_NUMBER, ctx.channel().attr(REMOTING_KEY).get());
if (expectedResponse.equals(accept)) { if (expectedResponse.equals(accept)) {
// remove the http handlers and flag the activemq channel handler as active // HTTP upgrade is successful but let's wait to receive the EMPTY_LAST_CONTENT to count down the latch
pipeline.remove(httpClientCodec); handshakeComplete = true;
pipeline.remove(this); } else {
handshakeComplete = true; // HTTP upgrade failed
ActiveMQChannelHandler channelHandler = pipeline.get(ActiveMQChannelHandler.class); ActiveMQClientLogger.LOGGER.httpHandshakeFailed(msg);
channelHandler.active = true; ctx.close();
return; latch.countDown();
}
} }
return;
} }
} finally { } else if (msg == LastHttpContent.EMPTY_LAST_CONTENT && handshakeComplete) {
if (!handshakeComplete) { // remove the http handlers and flag the activemq channel handler as active
ActiveMQClientLogger.LOGGER.httpHandshakeFailed(msg); pipeline.remove(httpClientCodec);
ctx.close(); pipeline.remove(this);
} ActiveMQChannelHandler channelHandler = pipeline.get(ActiveMQChannelHandler.class);
latch.countDown(); channelHandler.active = true;
} }
if (!handshakeComplete) {
ActiveMQClientLogger.LOGGER.httpHandshakeFailed(msg);
ctx.close();
}
latch.countDown();
} }
@Override @Override