From 692bccd06f41dbc1ddcfa0bba1f3bb5fb1d4a9ea Mon Sep 17 00:00:00 2001
From: H1JK <hell0jack@protonmail.com>
Date: Fri, 26 Aug 2022 19:06:14 +0800
Subject: [PATCH] Fix query escape

---
 test/go.mod                   | 1 -
 test/go.sum                   | 2 --
 transport/v2raygrpc/client.go | 2 +-
 transport/v2raygrpc/server.go | 3 ++-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/go.mod b/test/go.mod
index 7f69a438..cc8ce442 100644
--- a/test/go.mod
+++ b/test/go.mod
@@ -19,7 +19,6 @@ require (
 
 require (
 	berty.tech/go-libtor v1.0.385 // indirect
-	ekyu.moe/leb128 v0.0.0-20190626180622-d3722dc409a8 // indirect
 	github.com/Microsoft/go-winio v0.5.1 // indirect
 	github.com/ajg/form v1.5.1 // indirect
 	github.com/cretz/bine v0.2.0 // indirect
diff --git a/test/go.sum b/test/go.sum
index 91635062..3a9624d6 100644
--- a/test/go.sum
+++ b/test/go.sum
@@ -1,7 +1,5 @@
 berty.tech/go-libtor v1.0.385 h1:RWK94C3hZj6Z2GdvePpHJLnWYobFr3bY/OdUJ5aoEXw=
 berty.tech/go-libtor v1.0.385/go.mod h1:9swOOQVb+kmvuAlsgWUK/4c52pm69AdbJsxLzk+fJEw=
-ekyu.moe/leb128 v0.0.0-20190626180622-d3722dc409a8 h1:zWcNapXDoFEobgJquW8jOgnVClkRLV9StPmi+LhtTGQ=
-ekyu.moe/leb128 v0.0.0-20190626180622-d3722dc409a8/go.mod h1:hphPjsG3qJdFKRttMyBWptntD0vAUE3NUenOGL0914A=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
diff --git a/transport/v2raygrpc/client.go b/transport/v2raygrpc/client.go
index 277f6774..355950b4 100644
--- a/transport/v2raygrpc/client.go
+++ b/transport/v2raygrpc/client.go
@@ -65,7 +65,7 @@ func NewClient(ctx context.Context, dialer N.Dialer, serverAddr M.Socksaddr, opt
 		url: &url.URL{
 			Scheme: "https",
 			Host:   serverAddr.String(),
-			Path:   fmt.Sprintf("/%s/Tun", options.ServiceName),
+			Path:   fmt.Sprintf("/%s/Tun", url.QueryEscape(options.ServiceName)),
 		},
 	}
 }
diff --git a/transport/v2raygrpc/server.go b/transport/v2raygrpc/server.go
index 9688af9a..51d3048b 100644
--- a/transport/v2raygrpc/server.go
+++ b/transport/v2raygrpc/server.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"strings"
 
@@ -42,7 +43,7 @@ func NewServer(ctx context.Context, options option.V2RayGRPCOptions, tlsConfig *
 	server := &Server{
 		handler:      handler,
 		errorHandler: errorHandler,
-		path:         fmt.Sprintf("/%s/Tun", options.ServiceName),
+		path:         fmt.Sprintf("/%s/Tun", url.QueryEscape(options.ServiceName)),
 		tlsConfig:    tlsConfig,
 		h2Server:     &http2.Server{},
 	}