diff options
| author | MHSanaei <ho3ein.sanaei@gmail.com> | 2023-03-30 18:03:19 +0300 |
|---|---|---|
| committer | MHSanaei <ho3ein.sanaei@gmail.com> | 2023-03-30 18:03:19 +0300 |
| commit | 48d6362a69be900a2ae52be6bdb3a7700420b44d (patch) | |
| tree | 5e35c988f3012be94daeb333d42a6c75aa9018eb /web/assets/js/model | |
| parent | 3f2adbd70a7cf61408c717bd40c215fde80a152b (diff) | |
shadow socks base64 + new methods
Diffstat (limited to 'web/assets/js/model')
| -rw-r--r-- | web/assets/js/model/xray.js | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 775d56c8..eb6d07f3 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -17,16 +17,15 @@ const VmessMethods = { }; const SSMethods = { - // AES_256_CFB: 'aes-256-cfb', - // AES_128_CFB: 'aes-128-cfb', - // CHACHA20: 'chacha20', - // CHACHA20_IETF: 'chacha20-ietf', - CHACHA20_POLY1305: 'chacha20-poly1305', - AES_256_GCM: 'aes-256-gcm', - AES_128_GCM: 'aes-128-gcm', + AES_128_GCM: 'aes-128-gcm', + AES_256_GCM: 'aes-256-gcm', + CHACHA20_POLY1305: 'chacha20-poly1305', + CHACHA20_IETF_POLY1305: 'chacha20-ietf-poly1305', + XCHACHA20_POLY1305: 'xchacha20-poly1305', + XCHACHA20_IETF_POLY1305: 'xchacha20-ietf-poly1305', BLAKE3_AES_128_GCM: '2022-blake3-aes-128-gcm', - BLAKE3_AES_256_GCM: '2022-blake3-aes-256-gcm', - BLAKE3_CHACHA20_POLY1305: '2022-blake3-chacha20-poly1305', + BLAKE3_AES_256_GCM: '2022-blake3-aes-256-gcm', + BLAKE3_CHACHA20_POLY1305: '2022-blake3-chacha20-poly1305', }; const RULE_IP = { @@ -940,7 +939,6 @@ class Inbound extends XrayCommonClass { case Protocols.VMESS: case Protocols.VLESS: case Protocols.TROJAN: - case Protocols.SHADOWSOCKS: break; default: return false; @@ -992,7 +990,6 @@ class Inbound extends XrayCommonClass { case Protocols.VMESS: case Protocols.VLESS: case Protocols.TROJAN: - case Protocols.SHADOWSOCKS: return true; default: return false; @@ -1186,12 +1183,7 @@ class Inbound extends XrayCommonClass { if (!ObjectUtil.isEmpty(server)) { address = server; } - if (settings.method == SSMethods.BLAKE3_AES_128_GCM || settings.method == SSMethods.BLAKE3_AES_256_GCM || settings.method == SSMethods.BLAKE3_CHACHA20_POLY1305) { - return `ss://${settings.method}:${settings.password}@${address}:${this.port}#${encodeURIComponent(remark)}`; - } else { - return 'ss://' + safeBase64(settings.method + ':' + settings.password + '@' + address + ':' + this.port) - + '#' + encodeURIComponent(remark); - } + return 'ss://' + safeBase64(settings.method + ':' + settings.password) + `@${address}:${this.port}#${encodeURIComponent(remark)}`; } genTrojanLink(address = '', remark = '', clientIndex = 0) { |