mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-08-13 23:01:00 +00:00
feat(xhttp): support sessionID* rename + sessionIDTable/Length (xray v26.6.22) (#5506)
* feat(xhttp): support sessionID* rename + sessionIDTable/Length (xray v26.6.22) xray-core v26.6.22 (PR #6258) renamed the XHTTP session config keys sessionPlacement/sessionKey to sessionIDPlacement/sessionIDKey (no fallback kept in core) and added sessionIDTable (predefined charset name or literal ASCII) and sessionIDLength (range, e.g. 16-32, lower bound > 0). Panel changes: - Schema (xhttp.ts): rename the two keys, add sessionIDTable/sessionIDLength, and a z.preprocess that lifts legacy keys off stored configs so an upgraded panel never silently drops a saved session setting. - Wire normalize + share-link build/parse: rename keys, emit the two new fields, and accept legacy sessionPlacement/sessionKey from old share links. - Inbound + outbound XHTTP forms: rename field paths, add a sessionIDTable autocomplete (9 predefined tables + free ASCII) and a sessionIDLength range input shown only when a table is set, with light client validation (ASCII table, length min > 0; xray enforces the room-size minimum server-side). - Subscription (service.go) and Clash (clash_service.go) builders: emit the renamed + new keys, with a legacy fallback for not-yet-resaved inbounds. - Locales: add sessionIDTable/sessionIDLength labels + hints in all 13 files. Two sibling v26.6.22 XHTTP commits need no panel change and are covered by the core bump alone: #6332 (XHTTP/3 closes QUIC/UDP) and #6320 (udpHop honors the existing dialerProxy). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(xhttp): add Session ID Table to inbound form-blocks snapshot The new sessionIDTable input renders by default in the inbound XHTTP form, so its label joins the field-structure snapshot. sessionIDLength stays conditional (only shown when a table is set), so it does not appear here. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(xhttp): migrate legacy session keys in the running xray config The Zod preprocess plus the subscription/Clash fallbacks only covered the panel UI and share-link output. The config handed to the running xray-core process is built from the raw stored streamSettings in GetXrayConfig, which did not rewrite the renamed XHTTP session keys — so a pre-upgrade inbound (or template outbound) stored with a non-default sessionPlacement was emitted unchanged and dropped by xray-core v26.6.22, until the admin re-saved it. Lift sessionPlacement/sessionKey onto sessionIDPlacement/sessionIDKey at config-generation time, in the existing inbound stream-rewrite block (next to the tls/reality/externalProxy handling) and across template outbounds. The lift is idempotent and leaves unchanged configs byte-identical so the hot-reload diff never sees a spurious change. Also tighten validateSessionIDLength to reject an inverted range (e.g. 32-16) in addition to the existing lower-bound > 0 check. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(xray): avoid summed-capacity allocation in mergeSubscriptionOutbounds CodeQL go/allocation-size-overflow flagged the pre-sized make() whose capacity was a sum of three slice lengths. Grow the slice via append on a nil slice instead; same result, no overflow-prone capacity expression.
This commit is contained in:
Rouzbeh†
@@ -534,6 +534,10 @@
|
||||
"paddingMethod": "طريقة Padding",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "جدول معرّف الجلسة",
|
||||
"sessionIDTableHint": "مجموعة الأحرف لتوليد معرّف الجلسة: اسم معرّف مسبقًا (ALPHABET، Base62، hex، number، …) أو سلسلة ASCII. اتركه فارغًا لاستخدام الإعداد الافتراضي لـ xray-core.",
|
||||
"sessionIDLength": "طول معرّف الجلسة",
|
||||
"sessionIDLengthHint": "طول أو نطاق (مثل 8-16) لمعرّف الجلسة المُولَّد. يُستخدم فقط عند تعيين جدول معرّف الجلسة؛ يجب أن يكون الحد الأدنى أكبر من 0.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -534,6 +534,10 @@
|
||||
"paddingMethod": "Padding Method",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "Session ID Table",
|
||||
"sessionIDTableHint": "Charset for generated session IDs: a predefined name (ALPHABET, Base62, hex, number, …) or a literal ASCII string. Leave empty for xray-core's default.",
|
||||
"sessionIDLength": "Session ID Length",
|
||||
"sessionIDLengthHint": "Length or range (e.g. 8-16) of generated session IDs. Only used when a Session ID Table is set; minimum must be greater than 0.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -534,6 +534,10 @@
|
||||
"paddingMethod": "Método de Padding",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "Tabla de Session ID",
|
||||
"sessionIDTableHint": "Conjunto de caracteres para generar los session ID: un nombre predefinido (ALPHABET, Base62, hex, number, …) o una cadena ASCII literal. Déjalo vacío para el valor por defecto de xray-core.",
|
||||
"sessionIDLength": "Longitud de Session ID",
|
||||
"sessionIDLengthHint": "Longitud o rango (p. ej. 8-16) del session ID generado. Solo se usa cuando hay una Tabla de Session ID definida; el mínimo debe ser mayor que 0.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -534,6 +534,10 @@
|
||||
"paddingMethod": "روش Padding",
|
||||
"sessionPlacement": "محل نشست",
|
||||
"sessionKey": "کلید نشست",
|
||||
"sessionIDTable": "جدول شناسه نشست",
|
||||
"sessionIDTableHint": "مجموعه نویسهها برای تولید شناسه نشست: یک نام از پیشتعریفشده (ALPHABET، Base62، hex، number، …) یا یک رشته ASCII. برای مقدار پیشفرض xray-core خالی بگذارید.",
|
||||
"sessionIDLength": "طول شناسه نشست",
|
||||
"sessionIDLengthHint": "طول یا بازه (مثلاً 8-16) شناسه نشست تولیدشده. فقط وقتی جدول شناسه نشست تنظیم شده باشد استفاده میشود؛ کمینه باید بزرگتر از 0 باشد.",
|
||||
"sequencePlacement": "محل Sequence",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "محل داده Uplink",
|
||||
|
||||
@@ -534,6 +534,10 @@
|
||||
"paddingMethod": "Metode Padding",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "Tabel Session ID",
|
||||
"sessionIDTableHint": "Kumpulan karakter untuk membuat session ID: nama yang telah ditentukan (ALPHABET, Base62, hex, number, …) atau string ASCII literal. Kosongkan untuk default xray-core.",
|
||||
"sessionIDLength": "Panjang Session ID",
|
||||
"sessionIDLengthHint": "Panjang atau rentang (mis. 8-16) session ID yang dibuat. Hanya digunakan saat Tabel Session ID disetel; nilai minimum harus lebih besar dari 0.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -555,6 +555,10 @@
|
||||
"paddingMethod": "Padding 方法",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "セッション ID テーブル",
|
||||
"sessionIDTableHint": "セッション ID 生成に使う文字セット：定義済みの名前（ALPHABET、Base62、hex、number など）またはリテラル ASCII 文字列。空欄で xray-core の既定値を使用します。",
|
||||
"sessionIDLength": "セッション ID の長さ",
|
||||
"sessionIDLengthHint": "生成するセッション ID の長さまたは範囲（例: 8-16）。セッション ID テーブルを設定したときのみ有効です。最小値は 0 より大きい必要があります。",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -555,6 +555,10 @@
|
||||
"paddingMethod": "Método de Padding",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "Tabela de Session ID",
|
||||
"sessionIDTableHint": "Conjunto de caracteres para gerar session IDs: um nome predefinido (ALPHABET, Base62, hex, number, …) ou uma string ASCII literal. Deixe vazio para o padrão do xray-core.",
|
||||
"sessionIDLength": "Comprimento do Session ID",
|
||||
"sessionIDLengthHint": "Comprimento ou intervalo (ex.: 8-16) do session ID gerado. Usado apenas quando uma Tabela de Session ID está definida; o mínimo deve ser maior que 0.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -555,6 +555,10 @@
|
||||
"paddingMethod": "Padding Method",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "Таблица Session ID",
|
||||
"sessionIDTableHint": "Набор символов для генерации session ID: предопределённое имя (ALPHABET, Base62, hex, number, …) или строка ASCII. Оставьте пустым для значения xray-core по умолчанию.",
|
||||
"sessionIDLength": "Длина Session ID",
|
||||
"sessionIDLengthHint": "Длина или диапазон (например, 8-16) генерируемого session ID. Используется только когда задана таблица; минимум должен быть больше 0.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -534,6 +534,10 @@
|
||||
"paddingMethod": "Padding Yöntemi",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "Oturum Kimliği Tablosu",
|
||||
"sessionIDTableHint": "Oturum kimliği üretmek için karakter kümesi: önceden tanımlı bir ad (ALPHABET, Base62, hex, number, …) veya düz ASCII dizesi. xray-core varsayılanı için boş bırakın.",
|
||||
"sessionIDLength": "Oturum Kimliği Uzunluğu",
|
||||
"sessionIDLengthHint": "Üretilen oturum kimliğinin uzunluğu veya aralığı (örn. 8-16). Yalnızca bir Oturum Kimliği Tablosu ayarlandığında kullanılır; en küçük değer 0'dan büyük olmalıdır.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -534,6 +534,10 @@
|
||||
"paddingMethod": "Padding Method",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "Таблиця Session ID",
|
||||
"sessionIDTableHint": "Набір символів для генерації session ID: попередньо визначене ім'я (ALPHABET, Base62, hex, number, …) або рядок ASCII. Залиште порожнім для значення xray-core за замовчуванням.",
|
||||
"sessionIDLength": "Довжина Session ID",
|
||||
"sessionIDLengthHint": "Довжина або діапазон (напр., 8-16) згенерованого session ID. Використовується лише коли задано таблицю; мінімум має бути більший за 0.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -555,6 +555,10 @@
|
||||
"paddingMethod": "Phương thức Padding",
|
||||
"sessionPlacement": "Session Placement",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "Bảng Session ID",
|
||||
"sessionIDTableHint": "Tập ký tự để tạo session ID: một tên định sẵn (ALPHABET, Base62, hex, number, …) hoặc chuỗi ASCII. Để trống để dùng mặc định của xray-core.",
|
||||
"sessionIDLength": "Độ dài Session ID",
|
||||
"sessionIDLengthHint": "Độ dài hoặc khoảng (ví dụ 8-16) của session ID được tạo. Chỉ dùng khi đã đặt Bảng Session ID; giá trị nhỏ nhất phải lớn hơn 0.",
|
||||
"sequencePlacement": "Sequence Placement",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink Data Placement",
|
||||
|
||||
@@ -554,6 +554,10 @@
|
||||
"paddingMethod": "Padding 方法",
|
||||
"sessionPlacement": "Session 位置",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "会话 ID 字符表",
|
||||
"sessionIDTableHint": "生成会话 ID 使用的字符集：预定义名称（ALPHABET、Base62、hex、number 等）或字面 ASCII 字符串。留空则使用 xray-core 默认值。",
|
||||
"sessionIDLength": "会话 ID 长度",
|
||||
"sessionIDLengthHint": "生成会话 ID 的长度或范围（如 8-16）。仅在设置了会话 ID 字符表时生效；最小值必须大于 0。",
|
||||
"sequencePlacement": "Sequence 位置",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink 数据位置",
|
||||
|
||||
@@ -534,6 +534,10 @@
|
||||
"paddingMethod": "Padding 方法",
|
||||
"sessionPlacement": "Session 位置",
|
||||
"sessionKey": "Session Key",
|
||||
"sessionIDTable": "工作階段 ID 字元表",
|
||||
"sessionIDTableHint": "產生工作階段 ID 使用的字元集：預定義名稱（ALPHABET、Base62、hex、number 等）或字面 ASCII 字串。留空則使用 xray-core 預設值。",
|
||||
"sessionIDLength": "工作階段 ID 長度",
|
||||
"sessionIDLengthHint": "產生工作階段 ID 的長度或範圍（如 8-16）。僅在設定了工作階段 ID 字元表時生效；最小值必須大於 0。",
|
||||
"sequencePlacement": "Sequence 位置",
|
||||
"sequenceKey": "Sequence Key",
|
||||
"uplinkDataPlacement": "Uplink 資料位置",
|
||||
|
||||
Reference in New Issue
Block a user