mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-24 21:46:07 +00:00
892c06c8bc
* fix(xray): block private-range egress in default freedom finalRules (#6037)
With domainStrategy AsIs the router never resolves domains, so a domain
with a private A record (e.g. 127-0-0-1.nip.io) sails past the
geoip:private routing block and freedom's allow-all finalRules let it
reach loopback services such as the xray gRPC API and metrics listener.
Prepend a block rule for geoip:private to the default template and add
the FreedomFinalRulesPrivateEgressBlock seeder so existing installs
still carrying the stock allow-only (or legacy private-only-allow)
finalRules are upgraded in place; customized rules are left untouched.
* fix(sub): version-gate unencrypted-outbound drops in outbound subscriptions (#6033)
Commit d38c912d taught CheckXrayConfig to keep unencrypted vless/trojan
outbounds when the running core predates the v26.7.11 rejection, but
filterOutboundsRejectedByCore still consulted the embedded validator
unconditionally, so outbound subscriptions kept silently dropping those
outbounds even on downgraded cores.
Apply the same shouldSkipLegacyUnencryptedOutboundRejection gate when
filtering fetched subscription outbounds.
* fix(xray): resolve geodata assets before building outbound configs (#5928)
Saving routing or template settings validates each outbound through the
embedded config loader, and a freedom outbound whose finalRules
reference geoip:private opens geoip.dat during that build. Unlike
ApplyRoutingConfig, ValidateOutboundConfig and AddOutbound never pointed
the in-process loader at the bin folder, so xray-core resolved the file
relative to the panel executable and saving failed with
'stat /usr/local/x-ui/geoip.dat: no such file or directory'.
Call ensureXrayAssetLocation before both build paths.
* fix(api): use a real i18n key in the client get handler (#5911)
The client fetch endpoint localized its error prefix with the bare key
'get', which exists in no translation file, so every lookup of a deleted
client's email logged 'message "get" not found in language ...' noise
alongside the expected record-not-found warning. Reuse the same
pages.inbounds.toasts.obtain key the sibling list handler uses.
* fix(sub): carry host record Host header and path into Clash/JSON output (#5944)
The raw-link path overrides the host/path share params from a Host
record via applyEndpointHostPath, but the Clash and JSON renderers read
the transport settings object, which applyHostStreamOverrides never
touched — so a Host record's WebSocket Host header (and path) silently
vanished from Clash/Mihomo and JSON subscriptions whenever the inbound's
own ws settings left them empty.
Inject hostHeader/path into the ws/httpupgrade/xhttp settings of the
per-host stream, mirroring the raw-link override.
* fix(metrics): accept Unicode outbound tags in the observatory (#5972)
The observatory validator whitelisted ASCII word characters, so any
outbound whose tag carries a flag emoji or other non-ASCII text was
silently dropped from the metrics snapshot, delay history, and health
notifications. The history store is an in-process map, so the strict
charset bought nothing.
Validate tags as non-empty, bounded, control-character-free UTF-8
instead, keeping spaces and emoji while still rejecting garbage input on
the query path.
* fix(database): default sqlite to WAL to stop background-job lock storms (#6057, #6068)
With journal_mode=DELETE every write serializes the whole database and
blocks readers, so under normal multi-job load (traffic sampling, node
sync, mtproto reconcile) transactions regularly outwaited the 10s busy
timeout and jobs failed with 'database is locked'.
Move to WAL by default: readers no longer block writers and vice versa,
which removes the observed contention while writer-writer access still
serializes safely. The single-file-at-rest property is preserved where
it matters — Checkpoint() now issues wal_checkpoint(TRUNCATE), so panel
and Telegram backups read a complete main file, and sqlite folds the WAL
back into the db on clean shutdown. XUI_DB_JOURNAL_MODE=DELETE restores
the previous behavior for setups that copy the live file directly.
* fix(database): strip finalmask.tcp from REALITY inbounds on upgrade (#6038)
validateFinalMaskRealityCombo blocks saving finalmask.tcp together with
REALITY because that combination crashes Xray-core 26.7.11 on the first
connection (XTLS/Xray-core#6453), but it only runs on add/update. An
inbound saved before the validator existed sailed through the upgrade
untouched and took the core down at boot.
Add the InboundRealityFinalmaskTcpStrip seeder: one-time scan that
removes finalmask.tcp from REALITY inbounds (other finalmask transports
survive), so upgraded panels start cleanly.
* fix(xray): stop deleting hand-written direct routing rules on save (#6056)
The DNS allow-rule sync recognized 'its' rules purely by shape
(type=field, ip, port, outboundTag=direct, nothing else), so any manual
rule of that shape — e.g. routing a LAN CIDR to a NAS port over direct —
was silently stripped on every settings save.
Mark managed rules with ruleTag=xui-dns-allow (round-tripped untouched
by both xray-core and the Routing tab editor) and only strip rules that
carry the tag. Untagged legacy managed rules are adopted when their
exact ip-set/port matches a currently configured private DNS endpoint;
anything else is left alone. A stale pre-tag managed rule whose DNS
server was removed now lingers until deleted manually — the safe side of
the trade against eating user rules.
* fix(clients): resolve email lookups through client_inbounds after a move (#6059)
GetClientInboundByEmail trusted the client_traffics.inbound_id pointer
whenever that inbound still existed, but a client moved between inbounds
leaves the row pointing at its old (still existing) inbound. The lookup
then searched the wrong inbound's clients and failed with 'Client Not
Found In Inbound For Email', which broke the Telegram bot's link and QR
generation for moved clients.
When the pointed-at inbound no longer carries the email, re-resolve
through the authoritative client_inbounds link to the inbound that
actually hosts the client.
* fix(nodes): replicate inbound fallbacks to nodes (#5963)
Fallbacks live in the inbound_fallbacks table and were only merged into
settings by the master's local config builder; the runtime inbound
pushed to nodes rebuilt settings without them, and the reconcile job
additionally fingerprinted the raw DB row, so fallback edits neither
reached nodes nor triggered a re-push.
Inject settings.fallbacks in buildRuntimeInboundForAPI (mirroring the
local builder, gated on inboundCanHostFallbacks) and make ReconcileNode
push and fingerprint that same runtime-built payload, aligning the
interactive and reconcile paths.
* fix(database): survive PostgreSQL outages without a runaway restart loop (#6023)
A PostgreSQL that was down or still starting made InitDB fail instantly;
the process exited with a generic startup error and systemd restarted it
every 5s forever, flooding the journal.
Retry the initial postgres connection with backoff (~70s total) and log
the real driver error on every attempt, and cap the systemd units with
StartLimitIntervalSec/StartLimitBurst so a persistently unreachable
database stops the unit instead of looping indefinitely.
* fix(xray): force a full restart when REALITY stream settings change (#6010)
A changed inbound is normally hot-swapped over gRPC as RemoveInbound +
AddInbound, but xray-core does not reliably rebuild a REALITY listener's
authenticator on a runtime re-add — key or shortId edits appeared
applied yet clients kept authenticating against the old parameters until
someone restarted the core manually, on nodes in particular.
Treat any non-client change to an inbound that uses (or starts using)
REALITY as not hot-appliable so the panel restarts the core instead.
Client-only edits on REALITY inbounds keep flowing through the per-user
AlterInbound path and still avoid restarts.
* feat(sub): allow insecure TLS for outbound subscription fetches (#6067)
An outbound subscription served over HTTPS with a self-signed or
private-CA certificate could never be fetched: the fetch client had no
TLS options, so refreshes died with 'x509: certificate signed by unknown
authority' and there was nothing the admin could toggle.
Add a per-subscription 'Allow insecure' switch (persisted as
allow_insecure, default off) that sets InsecureSkipVerify on the fetch
transport — including when the fetch is routed through the panel egress
proxy. The SSRF-guarded dialer and redirect re-validation stay in force
either way.
* fix(reality): send PROXY protocol header in the target scanner when xver is set (#6082)
The REALITY target scanner always probed with a plain TLS handshake, so
a target fronted by an Nginx listener that requires the PROXY protocol
(matching the inbound's xver>=1) reset the connection and the panel
reported a false 'TLS handshake failed'.
Thread the inbound's xver into the scan request and, when it is >=1,
lead with the matching PROXY protocol header (v1 for xver 1, binary v2
for xver 2) built from the dialed connection's own address pair. Batch
candidate scans against public sites are unaffected (xver 0).
* fix(frontend): default sockopt fields when editing a stored inbound (#5956)
Opening an existing inbound ran rawInboundToFormValues over the raw DB
row, and only xhttpSettings was re-parsed through its Zod schema to fill
defaults. A sockopt object saved before the TProxy control existed has
no tproxy key, so the Select rendered blank; picking Off didn't help
because the wire normalizer drops tproxy=off, recreating the missing
key on the next edit.
Re-parse streamSettings.sockopt through SockoptStreamSettingsSchema on
load, mirroring the xhttpSettings handling, so absent keys (tproxy,
tcpcongestion, …) get their schema defaults every time the form opens.
388 lines
16 KiB
Go
388 lines
16 KiB
Go
package xray
|
|
|
|
import (
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
|
|
xuilogger "github.com/mhsanaei/3x-ui/v3/internal/logger"
|
|
"github.com/mhsanaei/3x-ui/v3/internal/util/json_util"
|
|
|
|
"github.com/op/go-logging"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
// ComputeHotDiff logs the section that blocks a hot apply; the package
|
|
// logger must exist before any test exercises a blocked path.
|
|
xuilogger.InitLogger(logging.ERROR)
|
|
os.Exit(m.Run())
|
|
}
|
|
|
|
func makeHotConfig() *Config {
|
|
return &Config{
|
|
LogConfig: json_util.RawMessage(`{"loglevel":"warning"}`),
|
|
RouterConfig: json_util.RawMessage(`{"domainStrategy":"AsIs","rules":[{"type":"field","inboundTag":["api"],"outboundTag":"api"}]}`),
|
|
OutboundConfigs: json_util.RawMessage(`[{"protocol":"freedom","tag":"direct"},{"protocol":"blackhole","tag":"blocked"}]`),
|
|
Policy: json_util.RawMessage(`{}`),
|
|
API: json_util.RawMessage(`{"services":["HandlerService","StatsService","RoutingService"],"tag":"api"}`),
|
|
Stats: json_util.RawMessage(`{}`),
|
|
Metrics: json_util.RawMessage(`{}`),
|
|
InboundConfigs: []InboundConfig{
|
|
{
|
|
Port: 62789,
|
|
Protocol: "tunnel",
|
|
Tag: "api",
|
|
Listen: json_util.RawMessage(`"127.0.0.1"`),
|
|
Settings: json_util.RawMessage(`{}`),
|
|
},
|
|
{
|
|
Port: 1080,
|
|
Protocol: "vless",
|
|
Tag: "inbound-1080",
|
|
Listen: json_util.RawMessage(`"0.0.0.0"`),
|
|
Settings: json_util.RawMessage(`{"clients":[]}`),
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_NoChanges(t *testing.T) {
|
|
diff, ok := ComputeHotDiff(makeHotConfig(), makeHotConfig())
|
|
if !ok {
|
|
t.Fatal("identical configs must be hot-appliable")
|
|
}
|
|
if !diff.Empty() {
|
|
t.Fatalf("identical configs must produce an empty diff, got %+v", diff)
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_FormattingOnlyChangeIsEmptyDiff(t *testing.T) {
|
|
oldCfg := makeHotConfig()
|
|
newCfg := makeHotConfig()
|
|
// Reformat every section the way a frontend textarea save would.
|
|
newCfg.LogConfig = json_util.RawMessage("{\n \"loglevel\": \"warning\"\n}")
|
|
newCfg.Policy = json_util.RawMessage("{ }")
|
|
newCfg.API = json_util.RawMessage("{\n \"services\": [\"HandlerService\", \"StatsService\", \"RoutingService\"],\n \"tag\": \"api\"\n}")
|
|
newCfg.OutboundConfigs = json_util.RawMessage("[\n {\"protocol\": \"freedom\", \"tag\": \"direct\"},\n {\"protocol\": \"blackhole\", \"tag\": \"blocked\"}\n]")
|
|
newCfg.InboundConfigs[1].Settings = json_util.RawMessage("{\n \"clients\": []\n}")
|
|
|
|
diff, ok := ComputeHotDiff(oldCfg, newCfg)
|
|
if !ok {
|
|
t.Fatal("formatting-only change must be hot-appliable")
|
|
}
|
|
if len(diff.RemovedInboundTags) != 0 || len(diff.AddedInbounds) != 0 ||
|
|
len(diff.RemovedOutboundTags) != 0 || len(diff.AddedOutbounds) != 0 {
|
|
t.Fatalf("formatting-only change must produce no handler ops, got %+v", diff)
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_CanonicalEquality(t *testing.T) {
|
|
// Key reorder in a static section (the DNS editor rebuilds the object on
|
|
// save) must not read as a change.
|
|
oldCfg := makeHotConfig()
|
|
oldCfg.DNSConfig = json_util.RawMessage(`{"servers":["1.1.1.1"],"queryStrategy":"UseIP","tag":"dns-in"}`)
|
|
newCfg := makeHotConfig()
|
|
newCfg.DNSConfig = json_util.RawMessage(`{"tag":"dns-in","queryStrategy":"UseIP","servers":["1.1.1.1"]}`)
|
|
diff, ok := ComputeHotDiff(oldCfg, newCfg)
|
|
if !ok || !diff.Empty() {
|
|
t.Fatalf("dns key reorder must be an empty hot diff, ok=%v diff=%+v", ok, diff)
|
|
}
|
|
|
|
// Explicit null and an absent section are the same thing.
|
|
newCfg = makeHotConfig()
|
|
newCfg.FakeDNS = json_util.RawMessage(`null`)
|
|
diff, ok = ComputeHotDiff(makeHotConfig(), newCfg)
|
|
if !ok || !diff.Empty() {
|
|
t.Fatalf("fakedns null vs absent must be an empty hot diff, ok=%v diff=%+v", ok, diff)
|
|
}
|
|
|
|
// A real DNS change still forces a restart — there is no reload API.
|
|
newCfg = makeHotConfig()
|
|
newCfg.DNSConfig = json_util.RawMessage(`{"servers":["8.8.8.8"]}`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("real dns change must force a restart")
|
|
}
|
|
|
|
// Large integers keep full precision during normalization: two values
|
|
// that only differ past float64 precision must still read as a change.
|
|
oldCfg = makeHotConfig()
|
|
oldCfg.Policy = json_util.RawMessage(`{"big":9007199254740993}`)
|
|
newCfg = makeHotConfig()
|
|
newCfg.Policy = json_util.RawMessage(`{"big":9007199254740992}`)
|
|
if _, ok := ComputeHotDiff(oldCfg, newCfg); ok {
|
|
t.Fatal("values differing past float64 precision must not compare equal")
|
|
}
|
|
|
|
// Reordered keys inside the first (default) outbound must not force a
|
|
// restart — the form editor rebuilds the object on save.
|
|
oldCfg = makeHotConfig()
|
|
oldCfg.OutboundConfigs = json_util.RawMessage(`[{"protocol":"freedom","settings":{"domainStrategy":"AsIs"},"tag":"direct"},{"protocol":"blackhole","tag":"blocked"}]`)
|
|
newCfg = makeHotConfig()
|
|
newCfg.OutboundConfigs = json_util.RawMessage(`[{"tag":"direct","settings":{"domainStrategy":"AsIs"},"protocol":"freedom"},{"protocol":"blackhole","tag":"blocked"}]`)
|
|
diff, ok = ComputeHotDiff(oldCfg, newCfg)
|
|
if !ok || !diff.Empty() {
|
|
t.Fatalf("first outbound key reorder must be an empty hot diff, ok=%v diff=%+v", ok, diff)
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_StaticSectionChangeNeedsRestart(t *testing.T) {
|
|
newCfg := makeHotConfig()
|
|
newCfg.LogConfig = json_util.RawMessage(`{"loglevel":"debug"}`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("log change must force a restart")
|
|
}
|
|
|
|
newCfg = makeHotConfig()
|
|
newCfg.DNSConfig = json_util.RawMessage(`{"servers":["1.1.1.1"]}`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("dns change must force a restart")
|
|
}
|
|
|
|
newCfg = makeHotConfig()
|
|
newCfg.Observatory = json_util.RawMessage(`{"subjectSelector":["wg"]}`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("observatory change must force a restart")
|
|
}
|
|
|
|
newCfg = makeHotConfig()
|
|
newCfg.Env = json_util.RawMessage(`{"XRAY_DNS_PATH":"/tmp/dns"}`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("env change must force a restart: env vars are read only at process start")
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_InboundAddRemoveChange(t *testing.T) {
|
|
oldCfg := makeHotConfig()
|
|
newCfg := makeHotConfig()
|
|
// change existing beyond the clients list, so no user-level shortcut applies
|
|
newCfg.InboundConfigs[1].Settings = json_util.RawMessage(`{"clients":[],"decryption":"none"}`)
|
|
// add new
|
|
newCfg.InboundConfigs = append(newCfg.InboundConfigs, InboundConfig{
|
|
Port: 2080, Protocol: "vmess", Tag: "inbound-2080",
|
|
Settings: json_util.RawMessage(`{}`),
|
|
})
|
|
|
|
diff, ok := ComputeHotDiff(oldCfg, newCfg)
|
|
if !ok {
|
|
t.Fatal("inbound-only change must be hot-appliable")
|
|
}
|
|
if len(diff.RemovedInboundTags) != 1 || diff.RemovedInboundTags[0] != "inbound-1080" {
|
|
t.Fatalf("expected changed inbound to be removed, got %v", diff.RemovedInboundTags)
|
|
}
|
|
if len(diff.AddedInbounds) != 2 {
|
|
t.Fatalf("expected re-add + new add, got %d", len(diff.AddedInbounds))
|
|
}
|
|
if diff.RoutingConfig != nil || len(diff.AddedOutbounds) != 0 || len(diff.RemovedOutboundTags) != 0 {
|
|
t.Fatalf("unexpected non-inbound operations: %+v", diff)
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_ClientOnlyChangeUsesUserOps(t *testing.T) {
|
|
oldCfg := makeHotConfig()
|
|
oldCfg.InboundConfigs[1].Settings = json_util.RawMessage(`{"clients":[{"email":"a","id":"uuid-a"},{"email":"b","id":"uuid-b"}],"decryption":"none"}`)
|
|
newCfg := makeHotConfig()
|
|
// b expired and is stripped from the generated config (#5712); a's id rotated.
|
|
newCfg.InboundConfigs[1].Settings = json_util.RawMessage(`{"clients":[{"email":"a","id":"uuid-a2"},{"email":"c","id":"uuid-c"}],"decryption":"none"}`)
|
|
|
|
diff, ok := ComputeHotDiff(oldCfg, newCfg)
|
|
if !ok {
|
|
t.Fatal("client-only change must be hot-appliable")
|
|
}
|
|
if len(diff.RemovedInboundTags) != 0 || len(diff.AddedInbounds) != 0 {
|
|
t.Fatalf("client-only change must not replace the handler, got %+v", diff)
|
|
}
|
|
removed := map[string]bool{}
|
|
for _, u := range diff.RemovedUsers {
|
|
if u.Tag != "inbound-1080" || u.Protocol != "vless" {
|
|
t.Fatalf("removed user op has wrong target: %+v", u)
|
|
}
|
|
removed[u.Email] = true
|
|
}
|
|
if len(removed) != 2 || !removed["a"] || !removed["b"] {
|
|
t.Fatalf("expected users a (changed) and b (gone) removed, got %v", removed)
|
|
}
|
|
added := map[string]string{}
|
|
for _, u := range diff.AddedUsers {
|
|
id, _ := u.User["id"].(string)
|
|
added[u.Email] = id
|
|
}
|
|
if len(added) != 2 || added["a"] != "uuid-a2" || added["c"] != "uuid-c" {
|
|
t.Fatalf("expected users a (new id) and c added, got %v", added)
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_ClientChangeFallsBackToReplace(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
mutate func(cfg *Config)
|
|
}{
|
|
{
|
|
name: "unsupported protocol",
|
|
mutate: func(cfg *Config) {
|
|
cfg.InboundConfigs[1].Protocol = "shadowsocks"
|
|
},
|
|
},
|
|
{
|
|
name: "client without email",
|
|
mutate: func(cfg *Config) {
|
|
cfg.InboundConfigs[1].Settings = json_util.RawMessage(`{"clients":[{"id":"uuid-a"}]}`)
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
oldCfg := makeHotConfig()
|
|
newCfg := makeHotConfig()
|
|
tc.mutate(oldCfg)
|
|
tc.mutate(newCfg)
|
|
newCfg.InboundConfigs[1].Settings = json_util.RawMessage(`{"clients":[{"email":"x","id":"uuid-x","password":"pw"}]}`)
|
|
|
|
diff, ok := ComputeHotDiff(oldCfg, newCfg)
|
|
if !ok {
|
|
t.Fatal("change must still be hot-appliable via handler replacement")
|
|
}
|
|
if len(diff.RemovedUsers) != 0 || len(diff.AddedUsers) != 0 {
|
|
t.Fatalf("expected no user ops, got %+v", diff)
|
|
}
|
|
if len(diff.RemovedInboundTags) != 1 || len(diff.AddedInbounds) != 1 {
|
|
t.Fatalf("expected handler replacement, got %+v", diff)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_ApiInboundChangeNeedsRestart(t *testing.T) {
|
|
newCfg := makeHotConfig()
|
|
newCfg.InboundConfigs[0].Port = 62790
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("api inbound change must force a restart")
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_OutboundChangeAndReorder(t *testing.T) {
|
|
oldCfg := makeHotConfig()
|
|
newCfg := makeHotConfig()
|
|
// change a non-first outbound + add one
|
|
newCfg.OutboundConfigs = json_util.RawMessage(`[{"protocol":"freedom","tag":"direct"},{"protocol":"blackhole","settings":{},"tag":"blocked"},{"protocol":"socks","tag":"warp"}]`)
|
|
|
|
diff, ok := ComputeHotDiff(oldCfg, newCfg)
|
|
if !ok {
|
|
t.Fatal("outbound-only change must be hot-appliable")
|
|
}
|
|
if len(diff.RemovedOutboundTags) != 1 || diff.RemovedOutboundTags[0] != "blocked" {
|
|
t.Fatalf("expected changed outbound to be removed, got %v", diff.RemovedOutboundTags)
|
|
}
|
|
if len(diff.AddedOutbounds) != 2 {
|
|
t.Fatalf("expected re-add + new add, got %d", len(diff.AddedOutbounds))
|
|
}
|
|
for _, raw := range diff.AddedOutbounds {
|
|
if !strings.Contains(string(raw), `"tag"`) {
|
|
t.Fatalf("added outbound JSON must be the raw element, got %s", raw)
|
|
}
|
|
}
|
|
|
|
// pure reorder of non-first outbounds must be a no-op
|
|
reordered := makeHotConfig()
|
|
reordered.OutboundConfigs = json_util.RawMessage(`[{"protocol":"freedom","tag":"direct"},{"protocol":"socks","tag":"warp"},{"protocol":"blackhole","tag":"blocked"}]`)
|
|
base := makeHotConfig()
|
|
base.OutboundConfigs = json_util.RawMessage(`[{"protocol":"freedom","tag":"direct"},{"protocol":"blackhole","tag":"blocked"},{"protocol":"socks","tag":"warp"}]`)
|
|
diff, ok = ComputeHotDiff(base, reordered)
|
|
if !ok || !diff.Empty() {
|
|
t.Fatalf("reorder of non-first outbounds must be an empty hot diff, ok=%v diff=%+v", ok, diff)
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_FirstOutboundChangeNeedsRestart(t *testing.T) {
|
|
newCfg := makeHotConfig()
|
|
// change the default (first) outbound content
|
|
newCfg.OutboundConfigs = json_util.RawMessage(`[{"protocol":"freedom","settings":{"domainStrategy":"UseIP"},"tag":"direct"},{"protocol":"blackhole","tag":"blocked"}]`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("changing the default outbound must force a restart")
|
|
}
|
|
|
|
// swap which outbound comes first
|
|
newCfg = makeHotConfig()
|
|
newCfg.OutboundConfigs = json_util.RawMessage(`[{"protocol":"blackhole","tag":"blocked"},{"protocol":"freedom","tag":"direct"}]`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("changing the first outbound must force a restart")
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_TaglessOutboundNeedsRestart(t *testing.T) {
|
|
newCfg := makeHotConfig()
|
|
newCfg.OutboundConfigs = json_util.RawMessage(`[{"protocol":"freedom","tag":"direct"},{"protocol":"blackhole"}]`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("tagless outbound must force a restart")
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_RoutingRulesChange(t *testing.T) {
|
|
newCfg := makeHotConfig()
|
|
newCfg.RouterConfig = json_util.RawMessage(`{"domainStrategy":"AsIs","rules":[{"type":"field","inboundTag":["api"],"outboundTag":"api"},{"type":"field","ip":["geoip:private"],"outboundTag":"blocked"}]}`)
|
|
|
|
diff, ok := ComputeHotDiff(makeHotConfig(), newCfg)
|
|
if !ok {
|
|
t.Fatal("rules-only routing change must be hot-appliable")
|
|
}
|
|
if diff.RoutingConfig == nil {
|
|
t.Fatal("routing diff must carry the new routing section")
|
|
}
|
|
|
|
// balancers are reloadable too
|
|
newCfg = makeHotConfig()
|
|
newCfg.RouterConfig = json_util.RawMessage(`{"domainStrategy":"AsIs","rules":[],"balancers":[{"tag":"b1","selector":["wg"]}]}`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); !ok {
|
|
t.Fatal("balancer-only routing change must be hot-appliable")
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_RoutingStrategyChangeNeedsRestart(t *testing.T) {
|
|
newCfg := makeHotConfig()
|
|
newCfg.RouterConfig = json_util.RawMessage(`{"domainStrategy":"IPIfNonMatch","rules":[{"type":"field","inboundTag":["api"],"outboundTag":"api"}]}`)
|
|
if _, ok := ComputeHotDiff(makeHotConfig(), newCfg); ok {
|
|
t.Fatal("domainStrategy change must force a restart")
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_RealityStreamChangeNeedsRestart(t *testing.T) {
|
|
oldCfg := makeHotConfig()
|
|
oldCfg.InboundConfigs[1].StreamSettings = json_util.RawMessage(`{"network":"tcp","security":"reality","realitySettings":{"privateKey":"old-key","serverNames":["a.example"]}}`)
|
|
newCfg := makeHotConfig()
|
|
newCfg.InboundConfigs[1].StreamSettings = json_util.RawMessage(`{"network":"tcp","security":"reality","realitySettings":{"privateKey":"new-key","serverNames":["a.example"]}}`)
|
|
|
|
if _, ok := ComputeHotDiff(oldCfg, newCfg); ok {
|
|
t.Fatal("a REALITY stream-settings change must force a full restart, not a gRPC hot swap")
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_SecuritySwitchToRealityNeedsRestart(t *testing.T) {
|
|
oldCfg := makeHotConfig()
|
|
oldCfg.InboundConfigs[1].StreamSettings = json_util.RawMessage(`{"network":"tcp","security":"none"}`)
|
|
newCfg := makeHotConfig()
|
|
newCfg.InboundConfigs[1].StreamSettings = json_util.RawMessage(`{"network":"tcp","security":"reality","realitySettings":{"privateKey":"k"}}`)
|
|
|
|
if _, ok := ComputeHotDiff(oldCfg, newCfg); ok {
|
|
t.Fatal("switching security to REALITY must force a full restart")
|
|
}
|
|
}
|
|
|
|
func TestComputeHotDiff_RealityClientOnlyChangeStaysHot(t *testing.T) {
|
|
oldCfg := makeHotConfig()
|
|
oldCfg.InboundConfigs[1].StreamSettings = json_util.RawMessage(`{"network":"tcp","security":"reality","realitySettings":{"privateKey":"k"}}`)
|
|
oldCfg.InboundConfigs[1].Settings = json_util.RawMessage(`{"clients":[{"email":"a","id":"uuid-a"}],"decryption":"none"}`)
|
|
newCfg := makeHotConfig()
|
|
newCfg.InboundConfigs[1].StreamSettings = json_util.RawMessage(`{"network":"tcp","security":"reality","realitySettings":{"privateKey":"k"}}`)
|
|
newCfg.InboundConfigs[1].Settings = json_util.RawMessage(`{"clients":[{"email":"a","id":"uuid-a"},{"email":"b","id":"uuid-b"}],"decryption":"none"}`)
|
|
|
|
diff, ok := ComputeHotDiff(oldCfg, newCfg)
|
|
if !ok {
|
|
t.Fatal("client-only change on a REALITY inbound must stay hot-appliable")
|
|
}
|
|
if len(diff.RemovedInboundTags) != 0 || len(diff.AddedInbounds) != 0 {
|
|
t.Fatalf("client-only change must not replace the handler, got %+v", diff)
|
|
}
|
|
if len(diff.AddedUsers) != 1 || diff.AddedUsers[0].Email != "b" {
|
|
t.Fatalf("expected user b added via AlterInbound, got %+v", diff.AddedUsers)
|
|
}
|
|
}
|