mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-12 07:36:07 +00:00
MHSanaei
814cda3fb4
Bump xtls/xray-core to 50231eaf (v26.7.11) and the three binary pins (DockerInit.sh, release.yml x2) in lockstep. Adapt the panel to the upstream changes: - Shadowsocks "none"/"plain" and VMess "none"/"zero" were removed from the core. A migration rewrites stored none/plain SS methods to a supported cipher and none/zero VMess security to "auto" (on both the clients column and inbound settings JSON); the SS build-time heal does the same so a row injected after boot cannot brick startup. The removed values are dropped from every frontend option list, schema and adapter, and coerced to "auto" at the Go link/sub/Clash emit sites and both link importers. Fix the CipherType_NONE sentinel that no longer compiles. - Unencrypted vless/trojan outbounds to a public address are now refused by the core. Validate outbounds through the vendored config loader when saving the xray template and when storing/merging outbound subscriptions, so one such outbound cannot keep the core from starting. - New TCP finalmask type "xmc" (Minecraft mimicry): add it to the sub link allowlist, the frontend enum and the FinalMask form (hostname, usernames, required password), and document it. - streamSettings gained a "method" alias for "network"; canonicalize it to "network" at inbound save time and in the form adapters/schema so a method-keyed config keeps its transport. - New root "env" config key is passed through xray.Config, compared in Equals, and forces a restart in the hot diff. - REALITY now defaults minClientVer to 26.3.27; update the form placeholder.
58 lines
1.6 KiB
Go
58 lines
1.6 KiB
Go
package service
|
|
|
|
import (
|
|
"encoding/json"
|
|
"testing"
|
|
)
|
|
|
|
// TestCanonicalizeStreamNetworkKey covers xray-core v26.7.11's "method" alias
|
|
// for streamSettings "network": a config keyed on "method" (from an imported
|
|
// or API-authored inbound) must be folded back to the panel-canonical
|
|
// "network" key that every downstream reader — link generation, port-conflict
|
|
// detection, flow eligibility — depends on.
|
|
func TestCanonicalizeStreamNetworkKey(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
in string
|
|
wantNetwork string
|
|
wantMethod bool
|
|
}{
|
|
{
|
|
name: "method alias becomes network",
|
|
in: `{"method": "ws", "security": "tls"}`,
|
|
wantNetwork: "ws",
|
|
},
|
|
{
|
|
name: "method wins when both present",
|
|
in: `{"method": "grpc", "network": "tcp"}`,
|
|
wantNetwork: "grpc",
|
|
},
|
|
{
|
|
name: "plain network untouched",
|
|
in: `{"network": "tcp"}`,
|
|
wantNetwork: "tcp",
|
|
},
|
|
}
|
|
for _, tc := range tests {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
got := canonicalizeStreamNetworkKey(tc.in)
|
|
var stream map[string]any
|
|
if err := json.Unmarshal([]byte(got), &stream); err != nil {
|
|
t.Fatalf("result is not valid JSON: %v", err)
|
|
}
|
|
if stream["network"] != tc.wantNetwork {
|
|
t.Fatalf("network = %v, want %q", stream["network"], tc.wantNetwork)
|
|
}
|
|
if _, hasMethod := stream["method"]; hasMethod {
|
|
t.Fatalf("method key must be removed, got %s", got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestCanonicalizeStreamNetworkKey_EmptyPassthrough(t *testing.T) {
|
|
if got := canonicalizeStreamNetworkKey(""); got != "" {
|
|
t.Fatalf("empty stream must round-trip, got %q", got)
|
|
}
|
|
}
|