mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-04 09:27:15 +00:00
fix(hysteria): standard geco share links and persistent uTLS None (#6325)
- 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†
@@ -0,0 +1,152 @@
|
||||
package sub
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/util/link"
|
||||
)
|
||||
|
||||
// A salamander mask carrying packetSize (Gecko mode) must export the
|
||||
// v2rayN-native gecko URI fields, not an fm=<json> dump.
|
||||
func TestGenHysteriaLinkEmitsGeckoParamsForPacketSize(t *testing.T) {
|
||||
in := &model.Inbound{
|
||||
Id: 920001, 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"}}]}}`,
|
||||
}
|
||||
got := (&SubService{}).genHysteriaLink(in, "user")
|
||||
for _, want := range []string{"obfs=gecko", "obfs-password=pw", "minPacketSize=512", "maxPacketSize=1200"} {
|
||||
if !strings.Contains(got, want) {
|
||||
t.Fatalf("missing %q\n got: %s", want, got)
|
||||
}
|
||||
}
|
||||
if strings.Contains(got, "obfs=salamander") {
|
||||
t.Fatalf("gecko mask exported as plain salamander:\n %s", got)
|
||||
}
|
||||
if strings.Contains(got, "fm=") {
|
||||
t.Fatalf("expressed salamander mask must not leak into fm= dump:\n %s", got)
|
||||
}
|
||||
}
|
||||
|
||||
// Password-only masks keep the plain salamander export.
|
||||
func TestGenHysteriaLinkSalamanderWithoutPacketSizeUnchanged(t *testing.T) {
|
||||
in := &model.Inbound{
|
||||
Id: 920002, 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"}}]}}`,
|
||||
}
|
||||
got := (&SubService{}).genHysteriaLink(in, "user")
|
||||
if !strings.Contains(got, "obfs=salamander") || !strings.Contains(got, "obfs-password=pw") {
|
||||
t.Fatalf("password-only mask lost its standard export:\n %s", got)
|
||||
}
|
||||
for _, bad := range []string{"minPacketSize=", "maxPacketSize="} {
|
||||
if strings.Contains(got, bad) {
|
||||
t.Fatalf("unexpected %s in:\n %s", bad, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Import side: obfs=gecko + min/max rebuild a standard salamander+packetSize mask.
|
||||
func TestParseLinkAcceptsGeckoObfs(t *testing.T) {
|
||||
parsed, err := link.ParseLink(
|
||||
"hysteria2://secret@203.0.113.1:443?security=tls&obfs=gecko&obfs-password=pw&minPacketSize=512&maxPacketSize=1200#geo")
|
||||
if err != nil {
|
||||
t.Fatalf("ParseLink: %v", err)
|
||||
}
|
||||
rawStream, _ := parsed.Outbound["streamSettings"].(map[string]any)
|
||||
if rawStream == nil {
|
||||
t.Fatalf("no streamSettings in outbound: %v", parsed.Outbound)
|
||||
}
|
||||
streamJSON, err := json.Marshal(rawStream)
|
||||
if err != nil {
|
||||
t.Fatalf("marshal stream: %v", err)
|
||||
}
|
||||
var stream map[string]any
|
||||
if err := json.Unmarshal(streamJSON, &stream); err != nil {
|
||||
t.Fatalf("stream json: %v", err)
|
||||
}
|
||||
fm, _ := stream["finalmask"].(map[string]any)
|
||||
if fm == nil {
|
||||
t.Fatalf("no finalmask rebuilt: %s", streamJSON)
|
||||
}
|
||||
udp, _ := fm["udp"].([]any)
|
||||
var mask map[string]any
|
||||
for _, m := range udp {
|
||||
if mm, ok := m.(map[string]any); ok && mm["type"] == "salamander" {
|
||||
mask = mm
|
||||
}
|
||||
}
|
||||
if mask == nil {
|
||||
t.Fatalf("no salamander mask rebuilt: %s", streamJSON)
|
||||
}
|
||||
settings, _ := mask["settings"].(map[string]any)
|
||||
if pw, _ := settings["password"].(string); pw != "pw" {
|
||||
t.Fatalf("password = %v", settings["password"])
|
||||
}
|
||||
if ps, _ := settings["packetSize"].(string); ps != "512-1200" {
|
||||
t.Fatalf("packetSize = %v, want 512-1200", settings["packetSize"])
|
||||
}
|
||||
}
|
||||
|
||||
// Half-specified or out-of-bounds gecko ranges must be dropped, not stored.
|
||||
func TestParseLinkRejectsInvalidGeckoPacketSize(t *testing.T) {
|
||||
cases := map[string]string{
|
||||
"half min only": "hysteria2://secret@203.0.113.1:443?security=tls&obfs=gecko&obfs-password=pw&minPacketSize=512#geo",
|
||||
"half max only": "hysteria2://secret@203.0.113.1:443?security=tls&obfs=gecko&obfs-password=pw&maxPacketSize=1200#geo",
|
||||
"non-numeric": "hysteria2://secret@203.0.113.1:443?security=tls&obfs=gecko&obfs-password=pw&minPacketSize=abc&maxPacketSize=def#geo",
|
||||
"zero min": "hysteria2://secret@203.0.113.1:443?security=tls&obfs=gecko&obfs-password=pw&minPacketSize=0&maxPacketSize=1200#geo",
|
||||
"inverted": "hysteria2://secret@203.0.113.1:443?security=tls&obfs=gecko&obfs-password=pw&minPacketSize=1200&maxPacketSize=512#geo",
|
||||
"over cap": "hysteria2://secret@203.0.113.1:443?security=tls&obfs=gecko&obfs-password=pw&minPacketSize=512&maxPacketSize=4096#geo",
|
||||
}
|
||||
for name, uri := range cases {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
parsed, err := link.ParseLink(uri)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseLink: %v", err)
|
||||
}
|
||||
rawStream, _ := parsed.Outbound["streamSettings"].(map[string]any)
|
||||
streamJSON, _ := json.Marshal(rawStream)
|
||||
var stream map[string]any
|
||||
_ = json.Unmarshal(streamJSON, &stream)
|
||||
fm, _ := stream["finalmask"].(map[string]any)
|
||||
if fm == nil {
|
||||
t.Fatalf("no finalmask rebuilt: %s", streamJSON)
|
||||
}
|
||||
udp, _ := fm["udp"].([]any)
|
||||
for _, m := range udp {
|
||||
if mm, ok := m.(map[string]any); ok && mm["type"] == "salamander" {
|
||||
settings, _ := mm["settings"].(map[string]any)
|
||||
if ps, _ := settings["packetSize"].(string); ps != "" {
|
||||
t.Fatalf("invalid gecko stored packetSize %q", ps)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Export side must mirror the TS bounds exactly (1 <= min <= max <= 2048).
|
||||
func TestParseHysteriaPacketSizeBounds(t *testing.T) {
|
||||
if got := parseHysteriaPacketSize("0-1200"); got != "" {
|
||||
t.Fatalf("min below 1 accepted: %q", got)
|
||||
}
|
||||
if got := parseHysteriaPacketSize("1200-512"); got != "" {
|
||||
t.Fatalf("inverted range accepted: %q", got)
|
||||
}
|
||||
if got := parseHysteriaPacketSize("512-4096"); got != "" {
|
||||
t.Fatalf("range over xray cap accepted: %q", got)
|
||||
}
|
||||
if got := parseHysteriaPacketSize(" 512 - 1200 "); got != "" {
|
||||
t.Fatalf("padded range must be rejected: %q", got)
|
||||
}
|
||||
if got := parseHysteriaPacketSize("+512-1200"); got != "" {
|
||||
t.Fatalf("plus-prefixed range must be rejected: %q", got)
|
||||
}
|
||||
if got := parseHysteriaPacketSize("512-1200"); got != "512-1200" {
|
||||
t.Fatalf("valid range = %q", got)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user