fix wrong socks package import;

fix some double free; fix twice websocket client handshake event handle
selcarpa · Jul 21, 2023 · 496262d · 496262d
1 parent f84247d
commit 496262d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/main/kotlin/inbounds/Socks.kt b/src/main/kotlin/inbounds/Socks.kt
@@ -1,8 +1,8 @@
 package inbounds
 
 
-import io.netty.contrib.handler.codec.socks.SocksMessage
-import io.netty.contrib.handler.codec.socks.SocksProtocolVersion
+import io.netty.contrib.handler.codec.socksx.SocksMessage
+import io.netty.contrib.handler.codec.socksx.SocksVersion
 import io.netty.contrib.handler.codec.socksx.v5.*
 import io.netty5.channel.ChannelHandlerContext
 import io.netty5.channel.SimpleChannelInboundHandler
@@ -23,8 +23,8 @@ class SocksServerHandler(private val inbound: Inbound) : SimpleChannelInboundHan
     private var authed = false
 
     public override fun messageReceived(ctx: ChannelHandlerContext, socksRequest: SocksMessage) {
-        when (socksRequest.protocolVersion()!!) {
-            SocksProtocolVersion.SOCKS5 -> socks5Connect(ctx, socksRequest)
+        when (socksRequest.version()!!) {
+            SocksVersion.SOCKS5 -> socks5Connect(ctx, socksRequest)
             else -> {
                 ctx.close()
             }
@@ -52,10 +52,10 @@ class SocksServerHandler(private val inbound: Inbound) : SimpleChannelInboundHan
                 if (inbound.socks5Setting?.auth != null || !authed) {
                     ctx.close()
                 }
-                if ((socksRequest as Socks5CommandRequest).type() === Socks5CommandType.CONNECT) {
+                if (socksRequest.type() === Socks5CommandType.CONNECT) {
                     ctx.pipeline().addLast(SocksServerConnectHandler(inbound))
-                    ctx.pipeline().remove(this)
                     ctx.fireChannelRead(socksRequest)
+                    ctx.pipeline().remove(this)
                 } else {
                     ctx.close()
                 }

diff --git a/src/main/kotlin/stream/Surfer.kt b/src/main/kotlin/stream/Surfer.kt
@@ -5,6 +5,7 @@ import io.netty.contrib.handler.proxy.HttpProxyHandler
 import io.netty.contrib.handler.proxy.ProxyConnectionEvent
 import io.netty.contrib.handler.proxy.Socks5ProxyHandler
 import io.netty5.bootstrap.Bootstrap
+import io.netty5.buffer.Buffer
 import io.netty5.channel.*
 import io.netty5.channel.nio.AbstractNioByteChannel
 import io.netty5.channel.socket.DatagramPacket
@@ -489,7 +490,13 @@ open class RelayInboundHandler(private val relayChannel: Channel, private val in
                 relayChannel.pipeline().names(),
                 msg.javaClass.name
             )
-            relayChannel.writeAndFlush(msg).addListener {
+            relayChannel.writeAndFlush(
+                if (msg is Buffer) {
+                    msg.copy()
+                }else{
+                    msg
+                }
+            ).addListener {
                 if (!it.isSuccess) {
                     logger.error(
                         "relay inbound write message:${msg.javaClass.name} to [${

diff --git a/src/main/kotlin/stream/Websocket.kt b/src/main/kotlin/stream/Websocket.kt
@@ -24,10 +24,6 @@ class WebsocketDuplexHandler(private val handleShakePromise: Promise<Channel>) :
         if (evt is WebSocketHandshakeCompletionEvent) {
             handleShakePromise.setSuccess(ctx.channel())
         }
-        if (evt is WebSocketClientHandshakeCompletionEvent) {
-            handleShakePromise.setSuccess(ctx.channel())
-            super.channelInboundEvent(ctx, evt)
-        }
     }