pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-11-07 05:35:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(node): rewrite a node's settings blob without decoding all of it

Browse Source 
Dedupe, tombstone stripping and the lifecycle lift decoded a node's
whole settings blob into generic maps and wrote it back indented, so a
deeply nested value anywhere in it cost the square of its depth on every
merge (10 KB became 50 MB). They now split the blob one level deep, read
only email, expiryTime and enable of each client entry, keep everything
else as raw text and write the result compactly.
This commit is contained in:
MHSanaei
2026-10-31 10:39:13 +01:00
parent 8ca321138b
commit a203056949
2 changed files with 123 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/client_add_dedupe_test.go
+21
View File
@@ -2,12 +2,14 @@ package service
import (
"encoding/json"
"strings"
"testing"
"github.com/google/uuid"
"github.com/mhsanaei/3x-ui/v3/internal/database"
"github.com/mhsanaei/3x-ui/v3/internal/database/model"
"github.com/mhsanaei/3x-ui/v3/internal/xray"
)
func mustUnmarshal(t *testing.T, raw string, v any) {
@@ -93,3 +95,22 @@ func TestDedupeSettingsClients(t *testing.T) {
t.Fatal("invalid settings must not be rewritten")
}
}
// A node's settings blob may nest any value deeply beside its clients; decoding the whole
// blob and re-indenting it cost the square of the depth for every one of these rewrites.
func TestSettingsClientRewritesStayLinearInTheBlob(t *testing.T) {
deep := strings.Repeat("[", 5000) + strings.Repeat("]", 5000)
settings := `{"decoy":` + deep + `,"clients":[{"email":"a@x","expiryTime":-86400000,"enable":true},{"email":"A@x"}]}`
out, changed := dedupeSettingsClients(settings)
if !changed || len(out) > 2*len(settings) {
t.Fatalf("dedupe changed=%v, output %d bytes from %d", changed, len(out), len(settings))
}
lifted, changed := liftClientLifecycleInSettings(out, map[string]*xray.ClientTraffic{"a@x": {Email: "a@x", ExpiryTime: 1700000000000}})
if !changed || len(lifted) > 2*len(settings) || !strings.Contains(lifted, `"expiryTime":1700000000000`) || !strings.Contains(lifted, `"enable":false`) {
t.Fatalf("lift changed=%v, output %d bytes: %.120s", changed, len(lifted), lifted)
}
clients, err := ParseInboundSettingsClients(lifted)
if err != nil || len(clients) != 1 || clients[0].Email != "a@x" {
t.Fatalf("clients after the rewrites = %+v, %v", clients, err)
}
}