Fix: grpc transport path should not escape

calfzhou · Aug 19, 2021 · 847f419 · 847f419
1 parent 47044ec
commit 847f419
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/test/config/vmess-grpc.json b/test/config/vmess-grpc.json
@@ -24,7 +24,7 @@
                     ]
                 },
                 "grpcSettings": {
-                    "serviceName": "example"
+                    "serviceName": "example!"
                 }
             }
         }

diff --git a/test/vmess_test.go b/test/vmess_test.go
@@ -335,7 +335,7 @@ func TestClash_VmessGrpc(t *testing.T) {
 		UDP:            true,
 		ServerName:     "example.org",
 		GrpcOpts: outbound.GrpcOptions{
-			GrpcServiceName: "example",
+			GrpcServiceName: "example!",
 		},
 	})
 	if err != nil {

diff --git a/transport/gun/gun.go b/transport/gun/gun.go
@@ -211,6 +211,8 @@ func StreamGunWithTransport(transport *http2.Transport, cfg *Config) (net.Conn,
 			Scheme: "https",
 			Host:   cfg.Host,
 			Path:   fmt.Sprintf("/%s/Tun", serviceName),
+			// for unescape path
+			Opaque: fmt.Sprintf("//%s/%s/Tun", cfg.Host, serviceName),
 		},
 		Proto:      "HTTP/2",
 		ProtoMajor: 2,
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ @@
                         ]
                     },
                     "grpcSettings": {
-                        "serviceName": "example"
+                        "serviceName": "example!"
                     }
                 }
             }
@@ Expand Down @@