[proxy]https在对方访问的URL是IP时才会从SNI中获取域名，否则使用URL中的域名

Author: iwind

teaproxy/listener.go

@@ -407,15 +407,17 @@ func (this *Listener) handleHTTP(writer http.ResponseWriter, rawRequest *http.Re
 	reqHost := rawRequest.Host
 
 	// TLS域名
-	if rawRequest.TLS != nil {
-		serverName := rawRequest.TLS.ServerName
-		if len(serverName) > 0 {
-			// 端口
-			index := strings.LastIndex(reqHost, ":")
-			if index >= 0 {
-				reqHost = serverName + reqHost[index:]
-			} else {
-				reqHost = serverName
+	if this.isIP(reqHost) {
+		if rawRequest.TLS != nil {
+			serverName := rawRequest.TLS.ServerName
+			if len(serverName) > 0 {
+				// 端口
+				index := strings.LastIndex(reqHost, ":")
+				if index >= 0 {
+					reqHost = serverName + reqHost[index:]
+				} else {
+					reqHost = serverName
+				}
 			}
 		}
 	}
@@ -748,3 +750,18 @@ func (this *Listener) connectTCPBackend(clientConn net.Conn, serverName string)
 	delete(this.connectingTCPMap, clientConn)
 	this.connectingTCPLocker.Unlock()
 }
+
+func (this *Listener) isIP(host string) bool {
+	// IPv6
+	if strings.Index(host, "[") > -1 {
+		return true
+	}
+
+	for _, b := range host {
+		if b >= 'a' && b <= 'z' {
+			return false
+		}
+	}
+
+	return true
+}

teaproxy/listener_test.go

@@ -5,8 +5,11 @@ import (
 	"github.com/TeaWeb/code/teaconfigs"
 	"github.com/TeaWeb/code/teaconfigs/shared"
 	"github.com/TeaWeb/code/teatesting"
+	"github.com/iwind/TeaGo/assert"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
+	"runtime"
+	"strings"
 	"testing"
 	"time"
 )
@@ -331,3 +334,39 @@ func printListener(listener *Listener, t *testing.T) {
 		}, t)
 	}
 }
+
+func TestDetectIPOrDomain(t *testing.T) {
+	a := assert.NewAssertion(t)
+	a.IsTrue(testIsIP("192.168.1.101"))
+	a.IsTrue(testIsIP("192.168.1.102:1000"))
+	a.IsTrue(testIsIP("[1:2:3:4]:1000"))
+	a.IsTrue(!testIsIP("192.168.1.com"))
+	a.IsTrue(!testIsIP("192.168.1.com:12345"))
+	a.IsTrue(!testIsIP("local345:12345"))
+}
+
+func BenchmarkIPOrDomain(b *testing.B) {
+	runtime.GOMAXPROCS(1)
+
+	for i := 0; i < b.N; i++ {
+		_ = testIsIP("192.168.1.101")
+		_ = testIsIP("192.168.1.101:1000")
+		_ = testIsIP("www.example.com")
+		_ = testIsIP("www.example.com:12345")
+	}
+}
+
+func testIsIP(host string) bool {
+	// IPv6
+	if strings.Index(host, "[") > -1 {
+		return true
+	}
+
+	for _, b := range host {
+		if b >= 'a' && b <= 'z' {
+			return false
+		}
+	}
+
+	return true
+}