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

feat(sub): refine Happ routing presets, serverDescription escaping, and auto-detect placement (#6488)

Browse Source 
* feat(sub): refine Happ routing presets, serverDescription escaping, and auto-detect placement

* fix(sub): address PR review findings on routing parity, agent regex, and i18n
This commit is contained in:
Pejman Yousefi
2026-09-13 14:23:57 +03:30
committed by GitHub
parent c7518c4038
commit cba8f0672f
10 changed files with 306 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/happ_test.go
+124 -1
View File
@@ -1,8 +1,10 @@
package sub
import (
"encoding/base64"
"net/http"
"net/http/httptest"
"strings"
"testing"
"github.com/gin-gonic/gin"
@@ -53,12 +55,15 @@ func TestApplyCommonHeaders_HappClientHeaders(t *testing.T) {
ctx.Request = httptest.NewRequest(http.MethodGet, "/sub/test", nil)
ctx.Request.Header.Set("User-Agent", "Happ/1.2.0 (iPhone; iOS 17.5)")
controller.ApplyCommonHeaders(ctx, "upload=0; download=100; total=1000; expire=1800000000", "12", "MyTitle", "", "", "", false, "", false)
controller.ApplyCommonHeaders(ctx, "upload=0; download=100; total=1000; expire=1800000000", "12", "MyTitle", "", "", "", false, "happ://routing/onadd/existing-rules", false)
h := recorder.Header()
if h.Get("Routing-Enable") != "0" {
t.Fatalf("Routing-Enable = %q, want 0 for Happ with disabled routing", h.Get("Routing-Enable"))
}
if h.Get("Routing") != "happ://routing/onadd/existing-rules" {
t.Fatalf("Routing = %q, want happ://routing/onadd/existing-rules for Happ with configured routing", h.Get("Routing"))
}
if h.Get("Hide-Settings") != "0" {
t.Fatalf("Hide-Settings = %q, want 0 for Happ with disabled hideSettings", h.Get("Hide-Settings"))
}
@@ -109,6 +114,28 @@ func TestApplyCommonHeaders_HappClientHeaders(t *testing.T) {
}
}
func TestApplyCommonHeaders_HappRoutingOffDeeplink(t *testing.T) {
gin.SetMode(gin.TestMode)
cfg := HappConfig{AutoDetect: true}
controller := &SUBController{happConfig: cfg}
recorder := httptest.NewRecorder()
ctx, _ := gin.CreateTestContext(recorder)
ctx.Request = httptest.NewRequest(http.MethodGet, "/sub/test", nil)
ctx.Request.Header.Set("User-Agent", "Happ/1.2.0 (iPhone)")
// When rules is happ://routing/off, Routing-Enable is 0 and Routing is happ://routing/off
controller.ApplyCommonHeaders(ctx, "", "", "Title", "", "", "", false, "happ://routing/off", false)
h := recorder.Header()
if h.Get("Routing-Enable") != "0" {
t.Fatalf("Routing-Enable = %q, want 0 when rules is happ://routing/off", h.Get("Routing-Enable"))
}
if h.Get("Routing") != "happ://routing/off" {
t.Fatalf("Routing = %q, want happ://routing/off", h.Get("Routing"))
}
}
func TestApplyHappHeaders_Gating(t *testing.T) {
gin.SetMode(gin.TestMode)
@@ -165,6 +192,9 @@ func TestApplyHappHeaders_Gating(t *testing.T) {
if got := recorder.Header().Get("Hide-Settings"); got != "" {
t.Fatalf("Hide-Settings emitted when AutoDetect is false: %q", got)
}
if got := recorder.Header().Get("Routing"); got != "" {
t.Fatalf("Routing emitted when AutoDetect is false: %q", got)
}
})
}
@@ -225,3 +255,96 @@ func TestApplyHappHeaders_Aliases(t *testing.T) {
})
}
}
func TestAppendHappServerDescription(t *testing.T) {
desc := "VIP Server"
encoded := base64.StdEncoding.EncodeToString([]byte(desc))
got := appendHappServerDescription("My Node", desc)
want := "My Node?serverDescription=" + encoded
if got != want {
t.Fatalf("appendHappServerDescription = %q, want %q", got, want)
}
if gotEmpty := appendHappServerDescription("My Node", ""); gotEmpty != "My Node" {
t.Fatalf("appendHappServerDescription with empty desc = %q, want My Node", gotEmpty)
}
}
func TestAppendQueryAndFragment_PreservesServerDescription(t *testing.T) {
desc := "Fast Server"
encoded := base64.StdEncoding.EncodeToString([]byte(desc))
t.Run("preserves serverDescription with encoded title", func(t *testing.T) {
fragment := "Server 01?serverDescription=" + encoded
link := appendQueryAndFragment("vless://user@host:443", nil, fragment, "", false)
want := "vless://user@host:443#Server%2001?serverDescription=" + encoded
if link != want {
t.Fatalf("appendQueryAndFragment = %q, want %q", link, want)
}
})
t.Run("properly escapes remark containing literal question mark without serverDescription", func(t *testing.T) {
fragment := "Fast? Server"
link := appendQueryAndFragment("vless://user@host:443", nil, fragment, "", false)
want := "vless://user@host:443#Fast%3F%20Server"
if link != want {
t.Fatalf("appendQueryAndFragment = %q, want %q", link, want)
}
})
t.Run("properly escapes remark containing literal question mark with serverDescription", func(t *testing.T) {
fragment := "Fast? Server?serverDescription=" + encoded
link := appendQueryAndFragment("vless://user@host:443", nil, fragment, "", false)
want := "vless://user@host:443#Fast%3F%20Server?serverDescription=" + encoded
if link != want {
t.Fatalf("appendQueryAndFragment = %q, want %q", link, want)
}
})
t.Run("escapes fragment when serverDescription tail contains invalid base64", func(t *testing.T) {
fragment := "Node 1?serverDescription=not-base64!!!"
link := appendQueryAndFragment("vless://user@host:443", nil, fragment, "", false)
want := "vless://user@host:443#Node%201%3FserverDescription%3Dnot-base64%21%21%21"
if link != want {
t.Fatalf("appendQueryAndFragment = %q, want %q", link, want)
}
})
t.Run("escapes fragment when serverDescription tail contains newline injection", func(t *testing.T) {
fragment := "Node 1?serverDescription=" + encoded + "\nevil://inject"
link := appendQueryAndFragment("vless://user@host:443", nil, fragment, "", false)
if strings.Contains(link, "\n") {
t.Fatalf("appendQueryAndFragment emitted raw newline: %q", link)
}
})
}
func TestIsHappClient(t *testing.T) {
matching := []string{
"Happ/1.2.0 (iPhone; iOS 17.5)",
"happ/2.0",
"happ",
"HAPP/1.0",
"Mozilla/5.0 Happ/1.0",
}
for _, ua := range matching {
if !IsHappClient(ua) {
t.Errorf("IsHappClient(%q) = false, want true", ua)
}
}
nonMatching := []string{
"Happy/2.0",
"happier-client",
"Happening/1.0",
"unhappy",
"v2rayNG/1.8.5",
"",
}
for _, ua := range nonMatching {
if IsHappClient(ua) {
t.Errorf("IsHappClient(%q) = true, want false", ua)
}
}
}