mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-18 08:07:14 +00:00
refactor(mtproto): manage ad-tags per client only
The inbound-level ad-tag duplicated the per-client override for no gain: the fork's global tag applied to every secret anyway, so one value had two homes and they could drift. The inbound form field, the settings key, and the global ad-tag in the generated config and in the PUT /secrets body are gone; the tag is set on each client instead. Existing inbound-level values are intentionally not migrated; a leftover settings key is stripped on the next save.
This commit is contained in:
@@ -128,7 +128,6 @@ func TestApplySecrets(t *testing.T) {
|
||||
inst := mtgInst(1,
|
||||
SecretEntry{Name: "alice", Secret: "ee01"},
|
||||
SecretEntry{Name: "bob", Secret: "ee02", AdTag: "fedcba9876543210fedcba9876543210"})
|
||||
inst.AdTag = "0123456789abcdef0123456789abcdef"
|
||||
if got := applySecrets(serverPort(t, srv), "sesame", inst); got != tc.want {
|
||||
t.Fatalf("applySecrets = %v, want %v", got, tc.want)
|
||||
}
|
||||
@@ -138,11 +137,11 @@ func TestApplySecrets(t *testing.T) {
|
||||
if gotAuth != "Bearer sesame" {
|
||||
t.Fatalf("expected the bearer token on the request, got %q", gotAuth)
|
||||
}
|
||||
if gotBody.Secrets["alice"].Secret != "ee01" || gotBody.AdTag != "0123456789abcdef0123456789abcdef" {
|
||||
t.Fatalf("payload must carry the secret and ad-tag: %+v", gotBody)
|
||||
if gotBody.Secrets["alice"].Secret != "ee01" {
|
||||
t.Fatalf("payload must carry the secret: %+v", gotBody)
|
||||
}
|
||||
if gotBody.Secrets["alice"].AdTag != "" || gotBody.Secrets["bob"].AdTag != "fedcba9876543210fedcba9876543210" {
|
||||
t.Fatalf("payload must carry per-client ad-tag overrides only where set: %+v", gotBody)
|
||||
t.Fatalf("payload must carry per-client ad-tags only where set: %+v", gotBody)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user