Added changes for SSL in websocket2.1 with Netty

mrsaldana · Apr 3, 2024 · 096c551 · 096c551
1 parent 93dd6e7
commit 096c551
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/...com.ibm.ws.transport.http/src/com/ibm/ws/http/netty/pipeline/HttpPipelineInitializer.java b/...com.ibm.ws.transport.http/src/com/ibm/ws/http/netty/pipeline/HttpPipelineInitializer.java
@@ -89,7 +89,7 @@ public enum ConfigElement {
     public static final String HTTP_KEEP_ALIVE_HANDLER_NAME = "httpKeepAlive";
     public static final String HTTP2_CLEARTEXT_UPGRADE_HANDLER_NAME = "H2C_UPGRADE_HANDLER";
 
-    long maxContentLength = Long.MAX_VALUE;
+    public static final long maxContentLength = Long.MAX_VALUE;
 
     private HttpPipelineInitializer(HttpPipelineBuilder builder) {
         Objects.requireNonNull(builder);

diff --git a/...m.ws.transport.http/src/com/ibm/ws/http/netty/pipeline/http2/LibertyNettyALPNHandler.java b/...m.ws.transport.http/src/com/ibm/ws/http/netty/pipeline/http2/LibertyNettyALPNHandler.java
@@ -13,6 +13,7 @@
 import com.ibm.websphere.ras.TraceComponent;
 import com.ibm.ws.http.netty.NettyHttpChannelConfig;
 import com.ibm.ws.http.netty.pipeline.HttpPipelineInitializer;
+import com.ibm.ws.http.netty.pipeline.inbound.LibertyHttpObjectAggregator;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.HttpServerCodec;
@@ -34,13 +35,14 @@ public class LibertyNettyALPNHandler extends ApplicationProtocolNegotiationHandl
      * Default to HTTP 2.0 for now
      */
     public LibertyNettyALPNHandler(NettyHttpChannelConfig httpConfig) {
-        super(ApplicationProtocolNames.HTTP_2);
+//        super(ApplicationProtocolNames.HTTP_2);
+        super(ApplicationProtocolNames.HTTP_1_1);
         this.httpConfig = httpConfig;
     }
 
     @Override
     protected void configurePipeline(ChannelHandlerContext ctx, String protocol) throws Exception {
-        System.out.println("Configuring pipeline!!");
+        System.out.println("Configuring pipeline!! " + protocol);
         if (ApplicationProtocolNames.HTTP_2.equals(protocol)) {
             if (TraceComponent.isAnyTracingEnabled() && tc.isDebugEnabled()) {
                 Tr.debug(this, tc, "Configuring pipeline with HTTP 2 for incoming connection " + ctx.channel());
@@ -62,6 +64,9 @@ protected void configurePipeline(ChannelHandlerContext ctx, String protocol) thr
             }
             ctx.pipeline().addAfter(HttpPipelineInitializer.HTTP_ALPN_HANDLER_NAME, HttpPipelineInitializer.NETTY_HTTP_SERVER_CODEC, new HttpServerCodec());
             ctx.pipeline().addAfter(HttpPipelineInitializer.NETTY_HTTP_SERVER_CODEC, HttpPipelineInitializer.HTTP_KEEP_ALIVE_HANDLER_NAME, new HttpServerKeepAliveHandler());
+            //TODO: this is a very large number, check best practice
+            ctx.pipeline().addAfter(HttpPipelineInitializer.HTTP_KEEP_ALIVE_HANDLER_NAME, null,
+                                    new LibertyHttpObjectAggregator(httpConfig.getMessageSizeLimit() == -1 ? HttpPipelineInitializer.maxContentLength : httpConfig.getMessageSizeLimit()));
             System.out.println("Configured Http1 pipeline with " + ctx.pipeline().names());
             if (TraceComponent.isAnyTracingEnabled() && tc.isDebugEnabled()) {
                 Tr.debug(this, tc, "Configured pipeline with " + ctx.pipeline().names());

diff --git a/dev/com.ibm.ws.wsoc/bnd.bnd b/dev/com.ibm.ws.wsoc/bnd.bnd
@@ -90,7 +90,7 @@ Service-Component: \
     dynamic:='tcpOptions,httpOptions,sslOptions';\
     modified:='modified'; \
     optional:='sslOptions,sslSupport,nettyTlsProvider';\
-    greedy:='tcpOptions,httpOptions,sslOptions'; \
+    greedy:='nettyTlsProvider,tcpOptions,httpOptions,sslOptions'; \
     properties:='service.vendor=IBM', \
   ${bSymbolicName}_${replace;${bVersion};\\.;_}.ResourceProvider; \
     implementation:=com.ibm.wsspi.classloading.ResourceProvider; \

diff --git a/dev/com.ibm.ws.wsoc/src/com/ibm/ws/wsoc/outbound/NettyHttpRequestorWsoc10.java b/dev/com.ibm.ws.wsoc/src/com/ibm/ws/wsoc/outbound/NettyHttpRequestorWsoc10.java
@@ -466,12 +466,12 @@ protected void initChannel(Channel ch) throws Exception {
          // TODO enable SSL
             if (requestor.endpointAddress.isSecure()) {
                 SSLEngine engine = null;
-                if(requestor.endpointAddress instanceof Wsoc21Address) {
-                    System.out.println("Attempting to pull sslcontext from Wsoc21Address");
-                    engine = ((Wsoc21Address) requestor.endpointAddress).getSSLContext().createSSLEngine();
-                    engine.setUseClientMode(true);
-                    System.out.println("Pulled engine: " + Objects.nonNull(engine));
-                }
+//                if(requestor.endpointAddress instanceof Wsoc21Address) {
+//                    System.out.println("Attempting to pull sslcontext from Wsoc21Address");
+//                    engine = ((Wsoc21Address) requestor.endpointAddress).getSSLContext().createSSLEngine();
+//                    engine.setUseClientMode(true);
+//                    System.out.println("Pulled engine: " + Objects.nonNull(engine));
+//                }
 
 
                 if (Objects.isNull(engine) &&( WsocOutboundChain.currentSSL == null || WsocOutboundChain.getNettyTlsProvider() == null)) { // This shouldn't happen