mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-12 17:05:01 +03:00
ec0a57fc4f
xray-core 26.9.9 dropped finalmask.quicParams.udpHop for the client-only
"udphop" UDP mask {mode, interval, remoteIPs, remotePorts}. The panel kept
writing the old key, so hysteria/xhttp outbounds and JSON-subscription
clients silently stopped hopping ports.
An inbound keeps quicParams.udpHop: it is panel metadata advertised as the
link's mport, and a udphop mask on a listener fails with "udphop: client
only". The conversion (maskcompat.UpgradeLegacyUDPHop, intervalRemote mode)
runs only where a client config is produced:
- UDPHopClientMaskFix seeder over hosts, sub-JSON finalmask, cached
outbound-subscription outbounds and template outbounds (never inbounds);
- GetXrayConfig heals template outbounds at build time;
- the JSON subscription upgrades each generated client stream;
- the Go and frontend link importers upgrade a legacy fm= param.
The finalmask editor gains a side prop: the client side lifts the dead key
on mount and offers a udphop mask editor (also for xhttp's HTTP/3 dial);
the inbound side keeps the UDP Hop switch, labelled as advertised.
117 lines
5.0 KiB
Go
117 lines
5.0 KiB
Go
package sub
|
|
|
|
import (
|
|
"encoding/json"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
|
|
)
|
|
|
|
// MASQUE has no share-link format, so the JSON subscription is the only way a client
|
|
// gets one: a masque outbound authenticating with the client's email and password.
|
|
func TestSubJsonServiceMasqueClientConfig(t *testing.T) {
|
|
inbound := &model.Inbound{
|
|
Listen: "203.0.113.9", Port: 8443, Protocol: model.MASQUE, Remark: "masque",
|
|
Settings: `{"clients":[{"email":"ivy@example.test","password":"pw-ivy"}],"address":["10.14.0.1/24"]}`,
|
|
StreamSettings: `{"network":"masque","security":"tls",
|
|
"masqueSettings":{"path":"/.well-known/masque/ip/*/*/"},
|
|
"tlsSettings":{"serverName":"masque.example.test","alpn":["h3"],
|
|
"certificates":[{"certificateFile":"/etc/ssl/m.crt","keyFile":"/etc/ssl/m.key"}],
|
|
"settings":{"fingerprint":"chrome"}}}`,
|
|
}
|
|
client := model.Client{Email: "ivy@example.test", Password: "pw-ivy"}
|
|
|
|
configs := NewSubJsonService("", "", "", "", nil).getConfig(&SubService{address: "sub.example.com"}, inbound, client, "sub.example.com")
|
|
if len(configs) != 1 {
|
|
t.Fatalf("got %d configs, want one", len(configs))
|
|
}
|
|
var config struct {
|
|
Outbounds []struct {
|
|
Protocol string `json:"protocol"`
|
|
Settings map[string]any `json:"settings"`
|
|
StreamSettings map[string]any `json:"streamSettings"`
|
|
} `json:"outbounds"`
|
|
}
|
|
if err := json.Unmarshal(configs[0], &config); err != nil {
|
|
t.Fatalf("decode config: %v", err)
|
|
}
|
|
proxy := config.Outbounds[0]
|
|
if proxy.Protocol != "masque" {
|
|
t.Fatalf("first outbound protocol = %q, want masque", proxy.Protocol)
|
|
}
|
|
if proxy.Settings["address"] != "203.0.113.9" || proxy.Settings["port"] != float64(8443) {
|
|
t.Fatalf("masque settings = %v, want the inbound address and port", proxy.Settings)
|
|
}
|
|
wantMasque := map[string]any{"path": "/.well-known/masque/ip/*/*/", "user": "ivy@example.test", "pass": "pw-ivy"}
|
|
if got := proxy.StreamSettings["masqueSettings"]; !reflect.DeepEqual(got, wantMasque) {
|
|
t.Fatalf("masqueSettings = %v, want %v", got, wantMasque)
|
|
}
|
|
tls, _ := proxy.StreamSettings["tlsSettings"].(map[string]any)
|
|
if proxy.StreamSettings["network"] != "masque" || proxy.StreamSettings["security"] != "tls" ||
|
|
tls["serverName"] != "masque.example.test" || tls["certificates"] != nil {
|
|
t.Fatalf("stream = %v, want masque over client-side TLS to masque.example.test", proxy.StreamSettings)
|
|
}
|
|
}
|
|
|
|
// The subscription SQL allowlist decides which inbounds a subId can see at all; left
|
|
// off it, a MASQUE client's JSON subscription would come back empty.
|
|
func TestGetInboundsBySubIdIncludesMasque(t *testing.T) {
|
|
initSubDB(t)
|
|
db := database.GetDB()
|
|
|
|
in := &model.Inbound{Port: 8443, Protocol: model.MASQUE, Enable: true, Tag: "masque-sub", Settings: `{"clients":[],"address":["10.14.0.1/24"]}`}
|
|
if err := db.Create(in).Error; err != nil {
|
|
t.Fatalf("create inbound: %v", err)
|
|
}
|
|
rec := &model.ClientRecord{Email: "u@masque", SubID: "submasque", Enable: true}
|
|
if err := db.Create(rec).Error; err != nil {
|
|
t.Fatalf("create client: %v", err)
|
|
}
|
|
if err := db.Create(&model.ClientInbound{ClientId: rec.Id, InboundId: in.Id}).Error; err != nil {
|
|
t.Fatalf("create link: %v", err)
|
|
}
|
|
|
|
inbounds, err := (&SubService{}).getInboundsBySubId("submasque")
|
|
if err != nil {
|
|
t.Fatalf("getInboundsBySubId: %v", err)
|
|
}
|
|
if len(inbounds) != 1 || inbounds[0].Id != in.Id {
|
|
t.Fatalf("masque inbound not returned for subId: %+v", inbounds)
|
|
}
|
|
}
|
|
|
|
// An inbound keeps its hop range in quicParams.udpHop (udphop refuses to run on a server),
|
|
// but the client config must carry the udphop mask: the core ignores the old key since 26.9.9.
|
|
func TestSubJsonServiceTurnsInboundHopIntoClientUDPHopMask(t *testing.T) {
|
|
inbound := &model.Inbound{
|
|
Listen: "203.0.113.10", Port: 443, Protocol: model.Hysteria, Remark: "hy",
|
|
Settings: `{"version":2,"clients":[{"email":"ivy@example.test","auth":"a"}]}`,
|
|
StreamSettings: `{"network":"hysteria","security":"tls",
|
|
"hysteriaSettings":{"version":2},
|
|
"tlsSettings":{"serverName":"hy.example.test","alpn":["h3"]},
|
|
"finalmask":{"quicParams":{"udpHop":{"ports":"20000-30000","interval":"5-10"}}}}`,
|
|
}
|
|
client := model.Client{Email: "ivy@example.test", Auth: "a"}
|
|
|
|
configs := NewSubJsonService("", "", "", "", nil).getConfig(&SubService{address: "sub.example.com"}, inbound, client, "sub.example.com")
|
|
if len(configs) != 1 {
|
|
t.Fatalf("got %d configs, want one", len(configs))
|
|
}
|
|
var config struct {
|
|
Outbounds []struct {
|
|
Protocol string `json:"protocol"`
|
|
StreamSettings map[string]any `json:"streamSettings"`
|
|
} `json:"outbounds"`
|
|
}
|
|
if err := json.Unmarshal(configs[0], &config); err != nil {
|
|
t.Fatalf("decode config: %v", err)
|
|
}
|
|
got, _ := json.Marshal(config.Outbounds[0].StreamSettings["finalmask"])
|
|
const want = `{"udp":[{"settings":{"interval":"5-10","mode":"intervalRemote","remotePorts":"20000-30000"},"type":"udphop"}]}`
|
|
if string(got) != want {
|
|
t.Fatalf("client finalmask\n got: %s\nwant: %s", got, want)
|
|
}
|
|
}
|