dan9i10/xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-05-08 14:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enforce same-port different-address browser dialer rejection

Browse Source 
Agent-Logs-Url: https://github.com/XTLS/Xray-core/sessions/b21c3fc4-8476-4107-975a-9d921d55ffea

Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-26 16:42:56 +00:00
committed by GitHub
parent 64f783f2b0
commit a54c54a559
2 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
transport/internet/browser_dialer/dialer.go
View File

@@ -175,7 +175,7 @@ func getDialerByAddress(addr string) (*dialerInstance, error) {
} }
_, port, err := net.SplitHostPort(listenAddr) _, port, err := net.SplitHostPort(listenAddr)
if err != nil { if err != nil {
return nil, errors.New("invalid sockopt.browserDialer: ", addr) return nil, errors.New("invalid sockopt.browserDialer listen address: ", listenAddr)
} }
key := listenAddr + path key := listenAddr + path

74
transport/internet/browser_dialer/dialer_test.go
View File

@@ -1,8 +1,8 @@
package browser_dialer package browser_dialer
import ( import (
"net" "net/http"
"strconv" "strings"
"testing" "testing"
) )
@@ -25,38 +25,60 @@ func TestParseBrowserDialerAddressRequireUUIDPath(t *testing.T) {
} }
} }
func TestEnsureDialerWithAddressReusesSameListenAddress(t *testing.T) { func TestGetDialerByAddressReusesExistingServerForSameListenAddress(t *testing.T) {
listener, err := net.Listen("tcp", "127.0.0.1:0") listenAddr := "127.0.0.1:39000"
if err != nil { server := &dialerServer{
t.Fatal(err) server: &http.Server{Addr: listenAddr},
pageRoutes: make(map[string]*dialerInstance),
} }
port := listener.Addr().(*net.TCPAddr).Port
listener.Close()
addr1 := net.JoinHostPort("127.0.0.1", strconv.Itoa(port)) + "/123e4567-e89b-12d3-a456-426614174000" mu.Lock()
addr2 := net.JoinHostPort("127.0.0.1", strconv.Itoa(port)) + "/123e4567-e89b-12d3-a456-426614174001" oldDialers, oldServers := sockoptDialers, dialerServers
if err := EnsureDialerWithAddress(addr1); err != nil { sockoptDialers = make(map[string]*dialerInstance)
t.Fatalf("failed to ensure first browser dialer: %v", err) dialerServers = map[string]*dialerServer{listenAddr: server}
mu.Unlock()
t.Cleanup(func() {
mu.Lock()
sockoptDialers = oldDialers
dialerServers = oldServers
mu.Unlock()
})
if _, err := getDialerByAddress(listenAddr + "/123e4567-e89b-12d3-a456-426614174000"); err != nil {
t.Fatalf("failed to create first dialer: %v", err)
} }
if err := EnsureDialerWithAddress(addr2); err != nil { if _, err := getDialerByAddress(listenAddr + "/123e4567-e89b-12d3-a456-426614174001"); err != nil {
t.Fatalf("failed to reuse browser dialer listener on same address: %v", err) t.Fatalf("failed to create second dialer on same listener: %v", err)
}
if len(dialerServers) != 1 {
t.Fatalf("expected one shared listener, got %d", len(dialerServers))
} }
} }
func TestEnsureDialerWithAddressRejectsSamePortDifferentAddress(t *testing.T) { func TestGetDialerByAddressRejectsSamePortDifferentAddress(t *testing.T) {
listener, err := net.Listen("tcp", "127.0.0.1:0") listenAddr := "127.0.0.1:39001"
if err != nil { server := &dialerServer{
t.Fatal(err) server: &http.Server{Addr: listenAddr},
pageRoutes: make(map[string]*dialerInstance),
} }
port := listener.Addr().(*net.TCPAddr).Port
listener.Close()
addr1 := net.JoinHostPort("127.0.0.1", strconv.Itoa(port)) + "/123e4567-e89b-12d3-a456-426614174010" mu.Lock()
addr2 := net.JoinHostPort("127.0.0.2", strconv.Itoa(port)) + "/123e4567-e89b-12d3-a456-426614174011" oldDialers, oldServers := sockoptDialers, dialerServers
if err := EnsureDialerWithAddress(addr1); err != nil { sockoptDialers = make(map[string]*dialerInstance)
t.Fatalf("failed to ensure first browser dialer: %v", err) dialerServers = map[string]*dialerServer{listenAddr: server}
} mu.Unlock()
if err := EnsureDialerWithAddress(addr2); err == nil { t.Cleanup(func() {
mu.Lock()
sockoptDialers = oldDialers
dialerServers = oldServers
mu.Unlock()
})
_, err := getDialerByAddress("127.0.0.2:39001/123e4567-e89b-12d3-a456-426614174011")
if err == nil {
t.Fatal("expected error for same port with different listen address") t.Fatal("expected error for same port with different listen address")
} }
if !strings.Contains(err.Error(), "cannot use the same port with a different listen address") {
t.Fatalf("unexpected error: %v", err)
}
} }