xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-09-04 01:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(hysteria): standard geco share links and persistent uTLS None (#6325)

Browse Source 
- Export standard gecko obfs query params in hysteria2 share links
- Enforce packet size bounds across Go and TypeScript link handlers
- Persist uTLS None explicitly and initialize new TLS inbounds to chrome
- Tear down stackTun safely without closeMu deadlock against WriteNotify

Co-authored-by: rqzbeh <rqzbeh@users.noreply.github.com>
This commit is contained in:
Rouzbeh†
2026-09-03 18:05:07 +03:30
committed by GitHub
parent f9898e0b24
commit 540caa4e93
14 changed files with 514 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/salamander_uri_test.go
+37 -4
View File
@@ -11,13 +11,22 @@ import (
)
func TestExtraSalamanderKeys(t *testing.T) {
if got := extraSalamanderKeys(map[string]any{"password": "pw"}); len(got) != 0 {
if got := extraSalamanderKeys(map[string]any{"password": "pw"}, false); len(got) != 0 {
t.Fatalf("expressible settings reported extras: %v", got)
}
got := extraSalamanderKeys(map[string]any{"password": "pw", "packetSize": "512-1200"})
if want := []string{"packetSize"}; !reflect.DeepEqual(got, want) {
// packetSize exports as the v2rayN gecko fields when expressed; a truly
// unexpressible key always is. An inexpressible packetSize stays extra.
in := map[string]any{"password": "pw", "headerType": "dns"}
if got, want := extraSalamanderKeys(in, false), []string{"headerType"}; !reflect.DeepEqual(got, want) {
t.Fatalf("extraSalamanderKeys = %v, want %v", got, want)
}
full := map[string]any{"password": "pw", "packetSize": "512-1200", "headerType": "dns"}
if got, want := extraSalamanderKeys(full, true), []string{"headerType"}; !reflect.DeepEqual(got, want) {
t.Fatalf("expressed packetSize not excluded: %v, want %v", got, want)
}
if got, want := extraSalamanderKeys(full, false), []string{"headerType", "packetSize"}; !reflect.DeepEqual(got, want) {
t.Fatalf("unexpressed packetSize not reported: %v, want %v", got, want)
}
}
func TestGenHysteriaLinkWarnsOnceForUnsupportedSalamanderSettings(t *testing.T) {
@@ -46,10 +55,34 @@ func TestGenHysteriaLinkWarnsOnceForUnsupportedSalamanderSettings(t *testing.T)
}
const unsupportedID = 910002
in := makeInbound(unsupportedID, `{"password":"pw","packetSize":"512-1200"}`)
in := makeInbound(unsupportedID, `{"password":"pw","headerType":"dns"}`)
(&SubService{}).genHysteriaLink(in, "user")
(&SubService{}).genHysteriaLink(in, "user")
if got := countWarnings(unsupportedID); got != 1 {
t.Fatalf("unsupported-settings warning count = %d, want 1", got)
}
}
// A mask with BOTH an expressible packetSize and another key must still warn
// about the leftover key while emitting the gecko URI.
func TestGenHysteriaLinkGeckoStillWarnsOnExtraKeys(t *testing.T) {
in := &model.Inbound{
Id: 910003, Listen: "203.0.113.1", Port: 443, Protocol: model.Hysteria,
Settings: `{"version":2,"clients":[{"auth":"secret","email":"user"}]}`,
StreamSettings: `{"security":"tls","finalmask":{"udp":[{"type":"salamander","settings":{"password":"pw","packetSize":"512-1200","headerType":"dns"}}]}}`,
}
got := (&SubService{}).genHysteriaLink(in, "user")
if !strings.Contains(got, "obfs=gecko") {
t.Fatalf("gecko not emitted for valid packetSize:\n %s", got)
}
needle := "inbound 910003: salamander settings"
found := 0
for _, line := range logger.GetLogs(100, "warning") {
if strings.Contains(line, needle) {
found++
}
}
if found == 0 {
t.Fatal("leftover salamander key did not warn alongside the gecko export")
}
}