fix: servername/sni priority over wss host

fix: VMess URI alterId parseInt
2026-03-23 03:02:35 +08:00 · 2023-08-22 18:21:34 +08:00 · 2023-08-22 17:28:39 +08:00 · 2023-08-22 15:29:55 +08:00 · 2023-08-22 00:42:53 +08:00 · 2023-08-22 00:08:53 +08:00
8 changed files with 152 additions and 73 deletions
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sub-store",
-  "version": "2.14.14",
+  "version": "2.14.21",
  "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
  "main": "src/main.js",
  "scripts": {
--- a/backend/src/core/proxy-utils/index.js
+++ b/backend/src/core/proxy-utils/index.js
@@ -1,5 +1,5 @@
 import download from '@/utils/download';
-
+import { isIPv4, isIPv6 } from '@/utils';
 import PROXY_PROCESSORS, { ApplyProcessor } from './processors';
 import PROXY_PREPROCESSORS from './preprocessors';
 import PROXY_PRODUCERS from './producers';
@@ -36,6 +36,10 @@ function parse(raw) {
        if (lastParser) {
            const [proxy, error] = tryParse(lastParser, line);
            if (!error) {
+                // 前面已经处理过普通情况下的 SNI, 这里显式设置 SNI, 防止之后解析成 IP 后丢失域名 SNI
+                if (proxy.tls && !proxy.sni && !isIP(proxy.server)) {
+                    proxy.sni = proxy.server;
+                }
                proxies.push(proxy);
                success = true;
            }
@@ -182,3 +186,7 @@ function safeMatch(parser, line) {
        return false;
    }
 }
+
+function isIP(ip) {
+    return isIPv4(ip) || isIPv6(ip);
+}
--- a/backend/src/core/proxy-utils/parsers/index.js
+++ b/backend/src/core/proxy-utils/parsers/index.js
@@ -218,12 +218,16 @@ function URI_VMess() {
                port: params.port,
                cipher: getIfPresent(params.scy, 'auto'),
                uuid: params.id,
-                alterId: getIfPresent(params.aid, 0),
+                alterId: parseInt(getIfPresent(params.aid, 0)),
                tls: params.tls === 'tls' || params.tls === true,
                'skip-cert-verify': isPresent(params.verify_cert)
                    ? !params.verify_cert
                    : undefined,
            };
+            // https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)
+            if (proxy.tls && proxy.sni) {
+                proxy.sni = params.sni;
+            }
            // handle obfs
            if (params.net === 'ws') {
                proxy.network = 'ws';
@@ -231,7 +235,9 @@ function URI_VMess() {
                    path: getIfNotBlank(params.path),
                    headers: { Host: getIfNotBlank(params.host) },
                };
-                if (proxy.tls && params.host) {
+                // https://github.com/MetaCubeX/Clash.Meta/blob/Alpha/docs/config.yaml#L413
+                // sni 优先级应高于 host
+                if (proxy.tls && !proxy.sni && params.host) {
                    proxy.sni = params.host;
                }
            }
@@ -289,6 +295,16 @@ function Clash_All() {
        if (proxy.type === 'vmess') {
            proxy.sni = proxy.servername;
            delete proxy.servername;
+            if (proxy.tls && !proxy.sni) {
+                if (proxy.network === 'ws') {
+                    proxy.sni = proxy['ws-opts']?.headers?.Host;
+                } else if (proxy.network === 'http') {
+                    let httpHost = proxy['http-opts']?.headers?.Host;
+                    proxy.sni = Array.isArray(httpHost)
+                        ? httpHost[0]
+                        : httpHost;
+                }
+            }
        }

        return proxy;
--- a/backend/src/core/proxy-utils/producers/clash.js
+++ b/backend/src/core/proxy-utils/producers/clash.js
@@ -55,6 +55,26 @@ export default function Clash_Producer() {
                        }
                    }

+                    if (
+                        ['vmess', 'vless'].includes(proxy.type) &&
+                        proxy.network === 'http'
+                    ) {
+                        let httpPath = proxy['http-opts']?.path;
+                        if (
+                            isPresent(proxy, 'http-opts.path') &&
+                            !Array.isArray(httpPath)
+                        ) {
+                            proxy['http-opts'].path = [httpPath];
+                        }
+                        let httpHost = proxy['http-opts']?.headers?.Host;
+                        if (
+                            isPresent(proxy, 'http-opts.headers.Host') &&
+                            !Array.isArray(httpHost)
+                        ) {
+                            proxy['http-opts'].headers.Host = [httpHost];
+                        }
+                    }
+
                    delete proxy['tls-fingerprint'];
                    return '  - ' + JSON.stringify(proxy) + '\n';
                })
--- a/backend/src/core/proxy-utils/producers/loon.js
+++ b/backend/src/core/proxy-utils/producers/loon.js
@@ -144,12 +144,14 @@ function vmess(proxy) {
            );
        } else if (proxy.network === 'http') {
            result.append(`,transport=http`);
+            let httpPath = proxy['http-opts']?.path;
+            let httpHost = proxy['http-opts']?.headers?.Host;
            result.appendIfPresent(
-                `,path=${proxy['http-opts'].path}`,
+                `,path=${Array.isArray(httpPath) ? httpPath[0] : httpPath}`,
                'http-opts.path',
            );
            result.appendIfPresent(
-                `,host=${proxy['http-opts'].headers.Host}`,
+                `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`,
                'http-opts.headers.Host',
            );
        } else {
@@ -206,12 +208,14 @@ function vless(proxy) {
            );
        } else if (proxy.network === 'http') {
            result.append(`,transport=http`);
+            let httpPath = proxy['http-opts']?.path;
+            let httpHost = proxy['http-opts']?.headers?.Host;
            result.appendIfPresent(
-                `,path=${proxy['http-opts'].path}`,
+                `,path=${Array.isArray(httpPath) ? httpPath[0] : httpPath}`,
                'http-opts.path',
            );
            result.appendIfPresent(
-                `,host=${proxy['http-opts'].headers.Host}`,
+                `,host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`,
                'http-opts.headers.Host',
            );
        } else {
--- a/backend/src/core/proxy-utils/producers/qx.js
+++ b/backend/src/core/proxy-utils/producers/qx.js
@@ -62,18 +62,20 @@ function shadowsocks(proxy) {
        );
    }

-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );

-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }

    // tfo
    appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -150,18 +152,20 @@ function trojan(proxy) {
        append(`,over-tls=true`);
    }

-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );

-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }

    // tfo
    appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -206,12 +210,14 @@ function vmess(proxy) {
        } else {
            throw new Error(`network ${proxy.network} is unsupported`);
        }
+        let httpPath = proxy[`${proxy.network}-opts`]?.path;
+        let httpHost = proxy[`${proxy.network}-opts`]?.headers?.Host;
        appendIfPresent(
-            `,obfs-uri=${proxy[`${proxy.network}-opts`].path}`,
+            `,obfs-uri=${Array.isArray(httpPath) ? httpPath[0] : httpPath}`,
            `${proxy.network}-opts.path`,
        );
        appendIfPresent(
-            `,obfs-host=${proxy[`${proxy.network}-opts`].headers.Host}`,
+            `,obfs-host=${Array.isArray(httpHost) ? httpHost[0] : httpHost}`,
            `${proxy.network}-opts.headers.Host`,
        );
    } else {
@@ -219,18 +225,20 @@ function vmess(proxy) {
        if (proxy.tls) append(`,obfs=over-tls`);
    }

-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );

-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }

    // AEAD
    if (isPresent(proxy, 'aead')) {
@@ -266,18 +274,20 @@ function http(proxy) {
    }
    appendIfPresent(`,over-tls=${proxy.tls}`, 'tls');

-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );

-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }

    // tfo
    appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -306,18 +316,20 @@ function socks5(proxy) {
    }
    appendIfPresent(`,over-tls=${proxy.tls}`, 'tls');

-    // tls fingerprint
-    appendIfPresent(
-        `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
-        'tls-fingerprint',
-    );
+    if (needTls(proxy)) {
+        // tls fingerprint
+        appendIfPresent(
+            `,tls-cert-sha256=${proxy['tls-fingerprint']}`,
+            'tls-fingerprint',
+        );

-    // tls verification
-    appendIfPresent(
-        `,tls-verification=${!proxy['skip-cert-verify']}`,
-        'skip-cert-verify',
-    );
-    appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+        // tls verification
+        appendIfPresent(
+            `,tls-verification=${!proxy['skip-cert-verify']}`,
+            'skip-cert-verify',
+        );
+        appendIfPresent(`,tls-host=${proxy.sni}`, 'sni');
+    }

    // tfo
    appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
@@ -332,11 +344,5 @@ function socks5(proxy) {
 }

 function needTls(proxy) {
-    return (
-        proxy.tls ||
-        proxy.sni ||
-        typeof proxy['skip-cert-verify'] !== 'undefined' ||
-        typeof proxy['tls-fingerprint'] !== 'undefined' ||
-        typeof proxy['tls-host'] !== 'undefined'
-    );
+    return proxy.tls;
 }
--- a/backend/src/core/proxy-utils/producers/stash.js
+++ b/backend/src/core/proxy-utils/producers/stash.js
@@ -58,6 +58,26 @@ export default function Stash_Producer() {
                        }
                    }

+                    if (
+                        ['vmess', 'vless'].includes(proxy.type) &&
+                        proxy.network === 'http'
+                    ) {
+                        let httpPath = proxy['http-opts']?.path;
+                        if (
+                            isPresent(proxy, 'http-opts.path') &&
+                            !Array.isArray(httpPath)
+                        ) {
+                            proxy['http-opts'].path = [httpPath];
+                        }
+                        let httpHost = proxy['http-opts']?.headers?.Host;
+                        if (
+                            isPresent(proxy, 'http-opts.headers.Host') &&
+                            !Array.isArray(httpHost)
+                        ) {
+                            proxy['http-opts'].headers.Host = [httpHost];
+                        }
+                    }
+
                    delete proxy['tls-fingerprint'];
                    return '  - ' + JSON.stringify(proxy) + '\n';
                })
--- a/backend/src/core/proxy-utils/producers/uri.js
+++ b/backend/src/core/proxy-utils/producers/uri.js
@@ -65,10 +65,15 @@ export default function URI_Producer() {
                    net: proxy.network || 'tcp',
                    tls: proxy.tls ? 'tls' : '',
                };
+                if (proxy.tls && proxy.sni) {
+                    result.sni = proxy.sni;
+                }
                // obfs
                if (proxy.network === 'ws') {
                    result.path = proxy['ws-opts'].path || '/';
-                    result.host = proxy['ws-opts'].headers.Host || proxy.server;
+                    if (proxy['ws-opts'].headers.Host) {
+                        result.host = proxy['ws-opts'].headers.Host;
+                    }
                }
                result = 'vmess://' + Base64.encode(JSON.stringify(result));
                break;
Author	SHA1	Message	Date
xream	497bc264e3	fix: servername/sni priority over wss host	2023-08-22 18:21:34 +08:00
xream	feb207b333	fix: servername/sni priority over wss host	2023-08-22 17:28:39 +08:00
xream	9ac1112b37	fix: VMess URI alterId parseInt	2023-08-22 15:29:55 +08:00
xream	96769598ef	fix: QX tls	2023-08-22 00:42:53 +08:00
xream	f8ed6a3342	fix: QX tls	2023-08-22 00:08:53 +08:00
xream	99b19c410d	fix: vmess/vless http-opts.path/http-opts.headers.Host must be an array in some clients	2023-08-21 22:16:07 +08:00