v2.1 Bugfix of issue#75 (#77)

* Fix bug in dynamic HTTPRouterHandler switching to prevent StackOverflow. * Fix bug in dynamic HTTPRouterHandler switching to prevent StackOverflow.
bifromqio · Apr 16, 2024 · a82c5a2 · a82c5a2
1 parent 5595e79
commit a82c5a2
Show file tree

Hide file tree

Showing 82 changed files with 228 additions and 421 deletions.
diff --git a/base-cluster/pom.xml b/base-cluster/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>bifromq-parent</artifactId>
         <groupId>com.baidu.bifromq</groupId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-cluster</artifactId>

diff --git a/base-crdt/base-crdt-service/pom.xml b/base-crdt/base-crdt-service/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-crdt</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/base-crdt/base-crdt-store/pom.xml b/base-crdt/base-crdt-store/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-crdt</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-crdt-store</artifactId>

diff --git a/base-crdt/pom.xml b/base-crdt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>bifromq-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/base-env/base-env-provider-spi/pom.xml b/base-env/base-env-provider-spi/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-env</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-env-provider-spi</artifactId>

diff --git a/base-env/base-env-provider/pom.xml b/base-env/base-env-provider/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-env</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-env-provider</artifactId>

diff --git a/base-env/pom.xml b/base-env/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>bifromq-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>

diff --git a/base-hlc/pom.xml b/base-hlc/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>bifromq-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-hlc</artifactId>

diff --git a/base-hookloader/pom.xml b/base-hookloader/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>bifromq-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-hookloader</artifactId>

diff --git a/base-kv/base-kv-local-engine/pom.xml b/base-kv/base-kv-local-engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-kv</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-kv-local-engine</artifactId>

diff --git a/base-kv/base-kv-raft-type/pom.xml b/base-kv/base-kv-raft-type/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-kv</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-kv-raft-type</artifactId>

diff --git a/base-kv/base-kv-raft/pom.xml b/base-kv/base-kv-raft/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-kv</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-kv-raft</artifactId>

diff --git a/base-kv/base-kv-store-balance-controller/pom.xml b/base-kv/base-kv-store-balance-controller/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>base-kv</artifactId>
         <groupId>com.baidu.bifromq</groupId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/base-kv/base-kv-store-balance-spi/pom.xml b/base-kv/base-kv-store-balance-spi/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>base-kv</artifactId>
         <groupId>com.baidu.bifromq</groupId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/base-kv/base-kv-store-client/pom.xml b/base-kv/base-kv-store-client/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-kv</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-kv-store-client</artifactId>

diff --git a/base-kv/base-kv-store-rpc-definition/pom.xml b/base-kv/base-kv-store-rpc-definition/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-kv</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-kv-store-rpc-definition</artifactId>

diff --git a/base-kv/base-kv-store-server/pom.xml b/base-kv/base-kv-store-server/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-kv</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-kv-store-server</artifactId>

diff --git a/base-kv/base-kv-type-proto/pom.xml b/base-kv/base-kv-type-proto/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>base-kv</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-kv-type-proto</artifactId>

diff --git a/base-kv/pom.xml b/base-kv/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>bifromq-parent</artifactId>
         <groupId>com.baidu.bifromq</groupId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/base-logger/pom.xml b/base-logger/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>bifromq-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-logger</artifactId>

diff --git a/base-rpc/pom.xml b/base-rpc/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>bifromq-parent</artifactId>
         <groupId>com.baidu.bifromq</groupId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-rpc</artifactId>

diff --git a/base-scheduler/pom.xml b/base-scheduler/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>bifromq-parent</artifactId>
         <groupId>com.baidu.bifromq</groupId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bifromq-apiserver/pom.xml b/bifromq-apiserver/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.baidu.bifromq</groupId>
         <artifactId>bifromq-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>bifromq-apiserver</artifactId>

diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/APIServer.java b/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/APIServer.java
@@ -56,6 +56,7 @@ enum State {
     public APIServer(String host,
                      int port,
                      int tlsPort,
+                     int maxContentLength,
                      EventLoopGroup bossGroup,
                      EventLoopGroup workerGroup,
                      SslContext sslContext,
@@ -73,10 +74,10 @@ public APIServer(String host,
         IHTTPRouteMap routeMap = new HTTPRouteMap(new HTTPRequestHandlersFactory(sessionDictClient,
                 distClient, mqttBrokerClient, inboxClient, retainClient, settingProvider));
         this.serverChannel =
-            buildServerChannel(port, new NonTLSServerInitializer(routeMap, settingProvider));
+            buildServerChannel(port, new NonTLSServerInitializer(routeMap, settingProvider, maxContentLength));
         if (sslContext != null) {
             this.tlsServerChannel =
-                buildServerChannel(tlsPort, new TLSServerInitializer(sslContext, routeMap, settingProvider));
+                buildServerChannel(tlsPort, new TLSServerInitializer(sslContext, routeMap, settingProvider, maxContentLength));
         } else {
             this.tlsServerChannel = null;
         }

diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/AbstractServerInitializer.java b/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/AbstractServerInitializer.java
@@ -21,9 +21,11 @@
 abstract class AbstractServerInitializer extends ChannelInitializer<SocketChannel> {
     protected final ISettingProvider settingProvider;
     protected final IHTTPRouteMap routeMap;
+    protected final int maxContentLength;
 
-    public AbstractServerInitializer(IHTTPRouteMap routeMap, ISettingProvider settingProvider) {
+    public AbstractServerInitializer(IHTTPRouteMap routeMap, ISettingProvider settingProvider, int maxContentLength) {
         this.settingProvider = settingProvider;
         this.routeMap = routeMap;
+        this.maxContentLength = maxContentLength;
     }
 }
diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/NonTLSServerInitializer.java b/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/NonTLSServerInitializer.java
@@ -18,18 +18,20 @@
 import com.baidu.bifromq.plugin.settingprovider.ISettingProvider;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
 
 public class NonTLSServerInitializer extends AbstractServerInitializer {
-    public NonTLSServerInitializer(IHTTPRouteMap routeMap, ISettingProvider settingProvider) {
-        super(routeMap, settingProvider);
+    public NonTLSServerInitializer(IHTTPRouteMap routeMap, ISettingProvider settingProvider, int maxContentLength) {
+        super(routeMap, settingProvider, maxContentLength);
     }
 
     @Override
     protected void initChannel(SocketChannel ch) {
         final ChannelPipeline p = ch.pipeline();
         final HttpServerCodec sourceCodec = new HttpServerCodec();
         p.addLast(sourceCodec);
+        p.addLast(new HttpObjectAggregator(maxContentLength));
         p.addLast(new HTTPRequestRouter(routeMap, settingProvider));
         p.addLast(ExceptionHandler.INSTANCE);
     }

diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/TLSServerInitializer.java b/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/TLSServerInitializer.java
@@ -17,21 +17,24 @@
 import com.baidu.bifromq.apiserver.http.IHTTPRouteMap;
 import com.baidu.bifromq.plugin.settingprovider.ISettingProvider;
 import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.handler.ssl.SslContext;
 
 public class TLSServerInitializer extends AbstractServerInitializer {
     private final SslContext sslContext;
 
-    public TLSServerInitializer(SslContext sslContext, IHTTPRouteMap routeMap, ISettingProvider settingProvider) {
-        super(routeMap, settingProvider);
+    public TLSServerInitializer(SslContext sslContext, IHTTPRouteMap routeMap, ISettingProvider settingProvider,
+                                int maxContentLength) {
+        super(routeMap, settingProvider, maxContentLength);
         this.sslContext = sslContext;
     }
 
     @Override
     protected void initChannel(SocketChannel ch) {
         ch.pipeline().addLast(sslContext.newHandler(ch.alloc()));
         ch.pipeline().addLast(new HttpServerCodec());
+        ch.pipeline().addLast(new HttpObjectAggregator(maxContentLength));
         ch.pipeline().addLast(new HTTPRequestRouter(routeMap, settingProvider));
         ch.pipeline().addLast(ExceptionHandler.INSTANCE);
     }