mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-09 22:04:34 +00:00
fix(vless): scope testseed to xtls-rprx-vision flow
testseed is only meaningful for the exact xtls-rprx-vision flow, but the panel was emitting it for any non-empty flow (including the UDP variant) and keeping it on the inbound after the flow was cleared via the client modal. Tighten the gate end-to-end: - VLESSSettings.toJson (inbound + outbound) now only emits testseed when the flow is exactly xtls-rprx-vision and the array is 4 positive ints; default state is empty so unmodified inbounds omit the field entirely. - canEnableVisionSeed drops the udp443 variant per spec. - Form adds a tooltip + theme-aware help text and an inline error when the user partially fills the four inputs; submit is blocked in that state. Reset clears to empty (= use server defaults). - UpdateInboundClient strips a now-orphaned testseed when the spliced client no longer leaves any XRV flow in the inbound. - MigrationRequirements cleans up legacy rows where testseed lingered after flow changes or was saved for non-XRV flows by older versions. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -81,30 +81,38 @@
|
||||
</template>
|
||||
<template v-if="inbound.canEnableVisionSeed()">
|
||||
<a-form :colon="false" :label-col="{ md: {span:8} }" :wrapper-col="{ md: {span:14} }">
|
||||
<a-form-item label="Vision Seed">
|
||||
<a-form-item
|
||||
:validate-status="testseedError() ? 'error' : ''"
|
||||
:help="testseedError() || ''">
|
||||
<template slot="label">
|
||||
Vision Seed
|
||||
<a-tooltip title="Optional. Controls XTLS Vision padding. Provide exactly 4 positive integers, or leave empty to use defaults: [900, 500, 900, 256].">
|
||||
<a-icon type="question-circle" :style="{ marginLeft: '4px' }"></a-icon>
|
||||
</a-tooltip>
|
||||
</template>
|
||||
<a-row :gutter="8">
|
||||
<a-col :span="6">
|
||||
<a-input-number
|
||||
:value="(inbound.settings.testseed && inbound.settings.testseed[0] !== undefined) ? inbound.settings.testseed[0] : 900"
|
||||
@change="(val) => updateTestseed(0, val)" :min="0" :max="9999" :style="{ width: '100%' }" placeholder="900"
|
||||
:value="(inbound.settings.testseed && inbound.settings.testseed[0] !== undefined) ? inbound.settings.testseed[0] : null"
|
||||
@change="(val) => updateTestseed(0, val)" :min="1" :max="9999" :style="{ width: '100%' }" placeholder="900"
|
||||
addon-before="[0]"></a-input-number>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<a-input-number
|
||||
:value="(inbound.settings.testseed && inbound.settings.testseed[1] !== undefined) ? inbound.settings.testseed[1] : 500"
|
||||
@change="(val) => updateTestseed(1, val)" :min="0" :max="9999" :style="{ width: '100%' }" placeholder="500"
|
||||
:value="(inbound.settings.testseed && inbound.settings.testseed[1] !== undefined) ? inbound.settings.testseed[1] : null"
|
||||
@change="(val) => updateTestseed(1, val)" :min="1" :max="9999" :style="{ width: '100%' }" placeholder="500"
|
||||
addon-before="[1]"></a-input-number>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<a-input-number
|
||||
:value="(inbound.settings.testseed && inbound.settings.testseed[2] !== undefined) ? inbound.settings.testseed[2] : 900"
|
||||
@change="(val) => updateTestseed(2, val)" :min="0" :max="9999" :style="{ width: '100%' }" placeholder="900"
|
||||
:value="(inbound.settings.testseed && inbound.settings.testseed[2] !== undefined) ? inbound.settings.testseed[2] : null"
|
||||
@change="(val) => updateTestseed(2, val)" :min="1" :max="9999" :style="{ width: '100%' }" placeholder="900"
|
||||
addon-before="[2]"></a-input-number>
|
||||
</a-col>
|
||||
<a-col :span="6">
|
||||
<a-input-number
|
||||
:value="(inbound.settings.testseed && inbound.settings.testseed[3] !== undefined) ? inbound.settings.testseed[3] : 256"
|
||||
@change="(val) => updateTestseed(3, val)" :min="0" :max="9999" :style="{ width: '100%' }" placeholder="256"
|
||||
:value="(inbound.settings.testseed && inbound.settings.testseed[3] !== undefined) ? inbound.settings.testseed[3] : null"
|
||||
@change="(val) => updateTestseed(3, val)" :min="1" :max="9999" :style="{ width: '100%' }" placeholder="256"
|
||||
addon-before="[3]"></a-input-number>
|
||||
</a-col>
|
||||
</a-row>
|
||||
@@ -116,6 +124,10 @@
|
||||
Reset
|
||||
</a-button>
|
||||
</a-space>
|
||||
<div :style="{ marginTop: '6px', fontSize: '12px', color: 'inherit', opacity: 0.65, lineHeight: 1.4 }">
|
||||
Optional. Controls XTLS Vision padding behavior (used only for xtls-rprx-vision).
|
||||
Provide exactly four positive integers to customize padding; otherwise leave empty to use safe defaults.
|
||||
</div>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
<a-divider :style="{ margin: '5px 0' }"></a-divider>
|
||||
|
||||
@@ -16,6 +16,16 @@
|
||||
inbound: new Inbound(),
|
||||
dbInbound: new DBInbound(),
|
||||
ok() {
|
||||
// Block submit when Vision Seed is XRV-gated and partially/invalidly filled.
|
||||
const seedErr = inModal.testseedError();
|
||||
if (seedErr) {
|
||||
if (typeof Vue !== "undefined" && Vue.prototype && Vue.prototype.$message) {
|
||||
Vue.prototype.$message.error(seedErr);
|
||||
} else {
|
||||
alert(seedErr);
|
||||
}
|
||||
return;
|
||||
}
|
||||
ObjectUtil.execute(inModal.confirm, inModal.inbound, inModal.dbInbound);
|
||||
},
|
||||
show({
|
||||
@@ -33,16 +43,12 @@
|
||||
} else {
|
||||
this.inbound = new Inbound();
|
||||
}
|
||||
// Always ensure testseed is initialized for VLESS protocol (even if vision flow is not set yet)
|
||||
// This ensures Vue reactivity works properly
|
||||
// Ensure VLESS settings has a testseed array reference for Vue reactivity,
|
||||
// but leave it empty so we don't auto-emit defaults — user must explicitly
|
||||
// fill all four fields, or leave blank to fall back to backend defaults.
|
||||
if (this.inbound.protocol === Protocols.VLESS && this.inbound.settings) {
|
||||
if (
|
||||
!this.inbound.settings.testseed ||
|
||||
!Array.isArray(this.inbound.settings.testseed) ||
|
||||
this.inbound.settings.testseed.length < 4
|
||||
) {
|
||||
// Create a new array to ensure Vue reactivity
|
||||
this.inbound.settings.testseed = [900, 500, 900, 256].slice();
|
||||
if (!Array.isArray(this.inbound.settings.testseed)) {
|
||||
this.inbound.settings.testseed = [];
|
||||
}
|
||||
}
|
||||
if (dbInbound) {
|
||||
@@ -61,48 +67,50 @@
|
||||
loading(loading = true) {
|
||||
inModal.confirmLoading = loading;
|
||||
},
|
||||
// Vision Seed methods - always available regardless of Vue context
|
||||
// Returns an error string when the current testseed state would be rejected,
|
||||
// or "" when it's valid (empty == use defaults; full 4 positive ints == custom).
|
||||
testseedError() {
|
||||
if (!inModal.inbound || inModal.inbound.protocol !== Protocols.VLESS) return "";
|
||||
if (typeof inModal.inbound.canEnableVisionSeed === "function"
|
||||
&& !inModal.inbound.canEnableVisionSeed()) return "";
|
||||
const seed = inModal.inbound.settings && inModal.inbound.settings.testseed;
|
||||
if (!Array.isArray(seed) || seed.length === 0) return "";
|
||||
const filled = seed.filter(v => v !== null && v !== undefined && v !== "");
|
||||
if (filled.length === 0) return "";
|
||||
if (seed.length !== 4 || filled.length !== 4 ||
|
||||
!seed.every(v => Number.isInteger(v) && v > 0)) {
|
||||
return "Provide exactly 4 positive integers or leave empty to use defaults.";
|
||||
}
|
||||
return "";
|
||||
},
|
||||
// Vision Seed helpers — always available regardless of Vue context
|
||||
updateTestseed(index, value) {
|
||||
// Use inModal.inbound explicitly to ensure correct context
|
||||
if (!inModal.inbound || !inModal.inbound.settings) return;
|
||||
// Ensure testseed is initialized
|
||||
if (
|
||||
!inModal.inbound.settings.testseed ||
|
||||
!Array.isArray(inModal.inbound.settings.testseed)
|
||||
) {
|
||||
inModal.inbound.settings.testseed = [900, 500, 900, 256];
|
||||
if (!Array.isArray(inModal.inbound.settings.testseed)) {
|
||||
inModal.inbound.settings.testseed = [];
|
||||
}
|
||||
// Ensure array has enough elements
|
||||
while (inModal.inbound.settings.testseed.length <= index) {
|
||||
inModal.inbound.settings.testseed.push(0);
|
||||
const seed = inModal.inbound.settings.testseed;
|
||||
while (seed.length <= index) seed.push(null);
|
||||
seed[index] = value;
|
||||
// If user cleared every slot, collapse back to empty so we omit testseed entirely.
|
||||
if (seed.every(v => v === null || v === undefined || v === "")) {
|
||||
inModal.inbound.settings.testseed = [];
|
||||
}
|
||||
// Update value
|
||||
inModal.inbound.settings.testseed[index] = value;
|
||||
},
|
||||
setRandomTestseed() {
|
||||
// Use inModal.inbound explicitly to ensure correct context
|
||||
if (!inModal.inbound || !inModal.inbound.settings) return;
|
||||
// Ensure testseed is initialized
|
||||
if (
|
||||
!inModal.inbound.settings.testseed ||
|
||||
!Array.isArray(inModal.inbound.settings.testseed) ||
|
||||
inModal.inbound.settings.testseed.length < 4
|
||||
) {
|
||||
inModal.inbound.settings.testseed = [900, 500, 900, 256].slice();
|
||||
}
|
||||
// Create new array with random values
|
||||
// Positive integers only (>=1) so the array passes validation and gets emitted.
|
||||
inModal.inbound.settings.testseed = [
|
||||
Math.floor(Math.random() * 1000),
|
||||
Math.floor(Math.random() * 1000),
|
||||
Math.floor(Math.random() * 1000),
|
||||
Math.floor(Math.random() * 1000),
|
||||
Math.floor(Math.random() * 999) + 1,
|
||||
Math.floor(Math.random() * 999) + 1,
|
||||
Math.floor(Math.random() * 999) + 1,
|
||||
Math.floor(Math.random() * 999) + 1,
|
||||
];
|
||||
},
|
||||
resetTestseed() {
|
||||
// Use inModal.inbound explicitly to ensure correct context
|
||||
if (!inModal.inbound || !inModal.inbound.settings) return;
|
||||
// Reset testseed to default values
|
||||
inModal.inbound.settings.testseed = [900, 500, 900, 256].slice();
|
||||
// Empty == "use server defaults [900, 500, 900, 256]"; placeholders show in the form.
|
||||
inModal.inbound.settings.testseed = [];
|
||||
},
|
||||
});
|
||||
|
||||
@@ -170,27 +178,17 @@
|
||||
});
|
||||
}
|
||||
},
|
||||
// Ensure testseed is always initialized when vision flow is enabled
|
||||
// Keep testseed as a valid array reference for Vue reactivity while the user
|
||||
// toggles flows — but do NOT auto-fill defaults. Empty means "use server defaults"
|
||||
// and is the only way the form omits testseed from the outbound JSON.
|
||||
"inModal.inbound.settings.vlesses": {
|
||||
handler() {
|
||||
if (
|
||||
inModal.inbound.protocol === Protocols.VLESS &&
|
||||
inModal.inbound.settings &&
|
||||
inModal.inbound.settings.vlesses
|
||||
!Array.isArray(inModal.inbound.settings.testseed)
|
||||
) {
|
||||
const hasVisionFlow = inModal.inbound.settings.vlesses.some(
|
||||
(c) =>
|
||||
c.flow === "xtls-rprx-vision" ||
|
||||
c.flow === "xtls-rprx-vision-udp443",
|
||||
);
|
||||
if (
|
||||
hasVisionFlow &&
|
||||
(!inModal.inbound.settings.testseed ||
|
||||
!Array.isArray(inModal.inbound.settings.testseed) ||
|
||||
inModal.inbound.settings.testseed.length < 4)
|
||||
) {
|
||||
inModal.inbound.settings.testseed = [900, 500, 900, 256];
|
||||
}
|
||||
inModal.inbound.settings.testseed = [];
|
||||
}
|
||||
},
|
||||
deep: true,
|
||||
@@ -335,35 +333,36 @@
|
||||
this.inbound.settings.encryption = "none";
|
||||
this.inbound.settings.selectedAuth = undefined;
|
||||
},
|
||||
// Vision Seed methods - must be in Vue methods for proper binding
|
||||
// Vision Seed methods - must be in Vue methods for proper template binding.
|
||||
// Mirror the inModal helpers but use Vue.set so the form re-renders.
|
||||
updateTestseed(index, value) {
|
||||
// Ensure testseed is initialized
|
||||
if (
|
||||
!this.inbound.settings.testseed ||
|
||||
!Array.isArray(this.inbound.settings.testseed)
|
||||
) {
|
||||
this.$set(this.inbound.settings, "testseed", [900, 500, 900, 256]);
|
||||
if (!Array.isArray(this.inbound.settings.testseed)) {
|
||||
this.$set(this.inbound.settings, "testseed", []);
|
||||
}
|
||||
// Ensure array has enough elements
|
||||
while (this.inbound.settings.testseed.length <= index) {
|
||||
this.inbound.settings.testseed.push(0);
|
||||
const seed = this.inbound.settings.testseed;
|
||||
while (seed.length <= index) seed.push(null);
|
||||
this.$set(seed, index, value);
|
||||
// Collapse to empty when every slot is cleared so testseed is omitted from JSON.
|
||||
if (seed.every(v => v === null || v === undefined || v === "")) {
|
||||
this.$set(this.inbound.settings, "testseed", []);
|
||||
}
|
||||
// Update value using Vue.set for reactivity
|
||||
this.$set(this.inbound.settings.testseed, index, value);
|
||||
},
|
||||
setRandomTestseed() {
|
||||
// Create new array with random values and use Vue.set for reactivity
|
||||
// Positive integers only (>=1) so the resulting array passes validation.
|
||||
const newSeed = [
|
||||
Math.floor(Math.random() * 1000),
|
||||
Math.floor(Math.random() * 1000),
|
||||
Math.floor(Math.random() * 1000),
|
||||
Math.floor(Math.random() * 1000),
|
||||
Math.floor(Math.random() * 999) + 1,
|
||||
Math.floor(Math.random() * 999) + 1,
|
||||
Math.floor(Math.random() * 999) + 1,
|
||||
Math.floor(Math.random() * 999) + 1,
|
||||
];
|
||||
this.$set(this.inbound.settings, "testseed", newSeed);
|
||||
},
|
||||
resetTestseed() {
|
||||
// Reset testseed to default values using Vue.set for reactivity
|
||||
this.$set(this.inbound.settings, "testseed", [900, 500, 900, 256]);
|
||||
// Empty == "use server defaults [900, 500, 900, 256]". Placeholders will show in the form.
|
||||
this.$set(this.inbound.settings, "testseed", []);
|
||||
},
|
||||
testseedError() {
|
||||
return inModal.testseedError();
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user