You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2021/06/02 03:46:54 UTC

[apisix-java-plugin-runner] branch main updated: fix: TCP half-packet causes decoding exception (#24)

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/apisix-java-plugin-runner.git


The following commit(s) were added to refs/heads/main by this push:
     new e221d51  fix: TCP half-packet causes decoding exception (#24)
e221d51 is described below

commit e221d51dfb91035e008aba49fcd4ac3a6c73c798
Author: tzssangglass <tz...@gmail.com>
AuthorDate: Wed Jun 2 11:46:46 2021 +0800

    fix: TCP half-packet causes decoding exception (#24)
---
 .../apisix/plugin/runner/codec/DelayedDecoder.java | 42 ++++++++++++++++++++++
 .../plugin/runner/server/ApplicationRunner.java    |  4 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/runner-core/src/main/java/org/apache/apisix/plugin/runner/codec/DelayedDecoder.java b/runner-core/src/main/java/org/apache/apisix/plugin/runner/codec/DelayedDecoder.java
new file mode 100644
index 0000000..c950390
--- /dev/null
+++ b/runner-core/src/main/java/org/apache/apisix/plugin/runner/codec/DelayedDecoder.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.apisix.plugin.runner.codec;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+
+public class DelayedDecoder extends LengthFieldBasedFrameDecoder {
+
+    public DelayedDecoder() {
+        super(16777215, 0, 0);
+    }
+
+    @Override
+    protected ByteBuf decode(ChannelHandlerContext ctx, ByteBuf in) {
+        in.readByte();
+        int length = in.readMedium();
+        if (in.readableBytes() < length) {
+            return null;
+        }
+        in.readerIndex(0);
+
+        int readLength = in.readableBytes();
+        return in.retainedSlice(0, readLength);
+    }
+}
\ No newline at end of file
diff --git a/runner-core/src/main/java/org/apache/apisix/plugin/runner/server/ApplicationRunner.java b/runner-core/src/main/java/org/apache/apisix/plugin/runner/server/ApplicationRunner.java
index ca7e68c..5b0f889 100644
--- a/runner-core/src/main/java/org/apache/apisix/plugin/runner/server/ApplicationRunner.java
+++ b/runner-core/src/main/java/org/apache/apisix/plugin/runner/server/ApplicationRunner.java
@@ -20,6 +20,7 @@ package org.apache.apisix.plugin.runner.server;
 import io.netty.channel.unix.DomainSocketAddress;
 import io.netty.handler.logging.LoggingHandler;
 import lombok.RequiredArgsConstructor;
+import org.apache.apisix.plugin.runner.codec.DelayedDecoder;
 import org.apache.apisix.plugin.runner.handler.IOHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,7 +65,8 @@ public class ApplicationRunner implements CommandLineRunner {
 //            if (Objects.nonNull(channelHandlers)) {
 //                channel.pipeline().addLast(channelHandlers);
 //            }
-            channel.pipeline().addFirst("logger", new LoggingHandler());
+            channel.pipeline().addFirst("logger", new LoggingHandler())
+                    .addAfter("logger", "delayedDecoder", new DelayedDecoder());
         });
 
         if (Objects.nonNull(handler)) {