[proxy]修复在Windows上URL特殊字符不能访问的问题

Author: iwind

teaconst/const.go

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	TeaVersion = "0.1.9.1"
+	TeaVersion = "0.1.9.2"
 
 	TeaProcessName = "teaweb" // 进程名
 	TeaProductName = "TeaWeb" // 产品名

teaproxy/http_serve_mux.go

@@ -2,7 +2,6 @@ package teaproxy
 
 import (
 	"net/http"
-	"path/filepath"
 )
 
 // 自定义ServeMux
@@ -12,7 +11,7 @@ type HTTPServeMux struct {
 
 func (this *HTTPServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// 解决因为URL中包含多个/而自动跳转的问题
-	r.URL.Path = filepath.Clean(r.URL.Path)
+	r.URL.Path = CleanPath(r.URL.Path)
 
 	this.ServeMux.ServeHTTP(w, r)
 }

teaproxy/request_backend.go

@@ -9,7 +9,6 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"path/filepath"
 	"strings"
 	"time"
 )
@@ -61,11 +60,10 @@ func (this *Request) callBackend(writer *ResponseWriter) error {
 
 	// new uri
 	if this.backend.HasRequestURI() {
-		uri := filepath.Clean(this.Format(this.backend.RequestPath()))
-
+		uri := this.Format(this.backend.RequestPath())
 		u, err := url.ParseRequestURI(uri)
 		if err == nil {
-			this.raw.URL.Path = u.Path
+			this.raw.URL.Path = CleanPath(u.Path)
 			this.raw.URL.RawQuery = u.RawQuery
 
 			args := this.Format(this.backend.RequestArgs())

teaproxy/utils.go

@@ -0,0 +1,23 @@
+package teaproxy
+
+// 清理Path中的多于信息
+func CleanPath(path string) string {
+	l := len(path)
+	if l == 0 {
+		return "/"
+	}
+	result := []byte{'/'}
+	isSlash := true
+	for i := 0; i < l; i++ {
+		if path[i] == '\\' || path[i] == '/' {
+			if !isSlash {
+				isSlash = true
+				result = append(result, '/')
+			}
+		} else {
+			isSlash = false
+			result = append(result, path[i])
+		}
+	}
+	return string(result)
+}

teaproxy/utils_test.go

@@ -0,0 +1,23 @@
+package teaproxy
+
+import (
+	"github.com/iwind/TeaGo/assert"
+	"testing"
+)
+
+func TestCleanPath(t *testing.T) {
+	a := assert.NewAssertion(t)
+
+	a.IsTrue(CleanPath("") == "/")
+	a.IsTrue(CleanPath("/hello/world") == "/hello/world")
+	a.IsTrue(CleanPath("\\hello\\world") == "/hello/world")
+	a.IsTrue(CleanPath("/\\hello\\//world") == "/hello/world")
+	a.IsTrue(CleanPath("hello/world") == "/hello/world")
+	a.IsTrue(CleanPath("/hello////world") == "/hello/world")
+}
+
+func BenchmarkCleanPath(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = CleanPath("/hello///world/very/long/very//long")
+	}
+}