Fix http and socks5 outbound

selcarpa · Mar 14, 2024 · d5a4ff5 · d5a4ff5
1 parent ec5074c
commit d5a4ff5
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -123,9 +123,51 @@ java -jar surfer.jar -c=config.json
 
 ```json5
 {
-  protocol: "galaxy"
+  protocol: "galaxy",
+  //optional
+  tag: ""
+}
+```
+
+##### direct outbound by http proxy
+
+```json5
+{
+  protocol: "http",
+  httpSetting: {
+    host: "",
+    port: 20809,
+    //optional
+    auth: {
+      //optional, if not set, no authentication
+      username: "username",
+      password: "password"
+    },
+  },
+  //optional
+  tag: ""
 }
 ```
+##### direct outbound by socks5 proxy
+
+```json5
+{
+  protocol: "socks5",
+  socks5Setting: {
+    host: "",
+    port: 20808,
+    //optional
+    auth: {
+      //optional, if not set, no authentication
+      username: "username",
+      password: "password"
+    },
+  },
+  //optional
+  tag: ""
+}
+```
+
 
 #### Rule
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "one.tain"
-version = "1.15-SNAPSHOT"
+version = "1.16-SNAPSHOT"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/model/config/Configuration.kt b/src/main/kotlin/model/config/Configuration.kt
@@ -88,7 +88,7 @@ data class Auth(val password: String, val username: String)
 data class Outbound(
     val protocol: String,
     val trojanSetting: TrojanSetting?,
-    val sock5Setting: Sock5OutboundSetting?,
+    val socks5Setting: Socks5OutboundSetting?,
     val httpSetting: HttpOutboundSetting?,
     val outboundStreamBy: OutboundStreamBy?,
     val tag: String?,
@@ -103,7 +103,7 @@ data class OutboundStreamBy(
 )
 
 @Serializable
-data class Sock5OutboundSetting(val auth: Auth?, val port: Int, val host: String)
+data class Socks5OutboundSetting(val auth: Auth?, val port: Int, val host: String)
 
 @Serializable
 data class HttpOutboundSetting(val auth: Auth?, val port: Int, val host: String)

diff --git a/src/main/kotlin/protocol/Trojan.kt b/src/main/kotlin/protocol/Trojan.kt
@@ -154,12 +154,16 @@ class TrojanProxy(
     private fun addPreHandledWs(ctx: ChannelHandlerContext) {
         val uri = URI(
             "${
-                if (streamBy == Protocol.WS) {
-                    "ws"
-                } else if (streamBy == Protocol.WSS) {
-                    "wss"
-                } else {
-                    throw IllegalArgumentException("unsupported stream")
+                when (streamBy) {
+                    Protocol.WS -> {
+                        "ws"
+                    }
+                    Protocol.WSS -> {
+                        "wss"
+                    }
+                    else -> {
+                        throw IllegalArgumentException("unsupported stream")
+                    }
                 }
             }://${outboundStreamBy.wsOutboundSetting!!.host}:${outboundStreamBy.wsOutboundSetting!!.port}/${
                 outboundStreamBy.wsOutboundSetting.path.removePrefix(

diff --git a/src/main/kotlin/stream/Surfer.kt b/src/main/kotlin/stream/Surfer.kt
@@ -19,7 +19,7 @@ import io.netty.util.concurrent.Promise
 import model.*
 import model.config.HttpOutboundSetting
 import model.config.Outbound
-import model.config.Sock5OutboundSetting
+import model.config.Socks5OutboundSetting
 import model.protocol.Odor
 import model.protocol.Protocol
 import mu.KotlinLogging
@@ -80,12 +80,19 @@ private fun outbound(
     if (Protocol.valueOfOrNull(outbound.protocol) == Protocol.GALAXY) {
         return galaxy(connectListener, odor, eventLoopGroup)
     }
+    val desProtocol = Protocol.valueOfOrNull(
+        if (outbound.outboundStreamBy != null) {
+            outbound.outboundStreamBy.type
+        } else {
+            outbound.protocol
+        }
+    )
 
-    setOdorRedirect(outbound, odor)
+    setOdorRedirect(desProtocol, outbound, odor)
 
-    return when (Protocol.valueOfOrNull(outbound.protocol)) {
+    return when (desProtocol) {
         Protocol.SOCKS5 -> socks5Stream(
-            connectListener, outbound.sock5Setting!!, eventLoopGroup, odor
+            connectListener, outbound.socks5Setting!!, eventLoopGroup, odor
         )
 
         Protocol.HTTP -> httpStream(
@@ -103,31 +110,30 @@ private fun outbound(
         }
 
         else -> {
-            logger.error { "stream type ${outbound.outboundStreamBy!!.type} not supported" }
-
+            logger.error { "stream type ${desProtocol.name} not supported" }
         }
     }
 }
 
-fun setOdorRedirect(outbound: Outbound, odor: Odor) {
+fun setOdorRedirect(protocol: Protocol, outbound: Outbound, odor: Odor) {
     if (outbound.serverDns) {
         odor.notDns = true
     }
-    when (Protocol.valueOfOrNull(outbound.outboundStreamBy!!.type)) {
+    when (protocol) {
 
         Protocol.WSS, Protocol.WS -> {
-            odor.redirectPort = outbound.outboundStreamBy.wsOutboundSetting!!.port
-            odor.redirectHost = outbound.outboundStreamBy.wsOutboundSetting.host
+            odor.redirectPort = outbound.outboundStreamBy!!.wsOutboundSetting!!.port
+            odor.redirectHost = outbound.outboundStreamBy.wsOutboundSetting!!.host
         }
 
         Protocol.TCP, Protocol.TLS -> {
-            odor.redirectPort = outbound.outboundStreamBy.tcpOutboundSetting!!.port
-            odor.redirectHost = outbound.outboundStreamBy.tcpOutboundSetting.host
+            odor.redirectPort = outbound.outboundStreamBy!!.tcpOutboundSetting!!.port
+            odor.redirectHost = outbound.outboundStreamBy.tcpOutboundSetting!!.host
         }
 
         Protocol.SOCKS5 -> {
-            odor.redirectPort = outbound.sock5Setting!!.port
-            odor.redirectHost = outbound.sock5Setting.host
+            odor.redirectPort = outbound.socks5Setting!!.port
+            odor.redirectHost = outbound.socks5Setting.host
         }
 
         Protocol.HTTP -> {
@@ -200,7 +206,7 @@ private fun httpStream(
 
 private fun socks5Stream(
     connectListener: FutureListener<Channel>,
-    socks5OutboundSetting: Sock5OutboundSetting,
+    socks5OutboundSetting: Socks5OutboundSetting,
     eventLoopGroup: EventLoopGroup,
     odor: Odor
 ) {