Local-GitHub-Proxy/Sub-Store
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git synced 2025-07-29 12:42:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: double quotes in Surge vmess ws-headers Host

Browse Source
This commit is contained in:
xream 2023-08-21 21:20:31 +08:00
parent 20afa0ad22
commit 9e54507bbb
No known key found for this signature in database
GPG Key ID: 1D2C5225471789F9
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "sub-store", "name": "sub-store",
"version": "2.14.13", "version": "2.14.14",
"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.", "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
"main": "src/main.js", "main": "src/main.js",
"scripts": { "scripts": {

3
backend/src/core/proxy-utils/parsers/peggy/surge.js
View File

@ -25,6 +25,9 @@ const grammars = String.raw`
proxy.network = "ws"; proxy.network = "ws";
$set(proxy, "ws-opts.path", obfs.path); $set(proxy, "ws-opts.path", obfs.path);
$set(proxy, "ws-opts.headers", obfs['ws-headers']); $set(proxy, "ws-opts.headers", obfs['ws-headers']);
if (proxy['ws-opts'] && proxy['ws-opts']['headers'] && proxy['ws-opts']['headers'].Host) {
proxy['ws-opts']['headers'].Host = proxy['ws-opts']['headers'].Host.replace(/^"(.*)"$/, '$1')
}
} }
} }
} }

3
backend/src/core/proxy-utils/parsers/peggy/surge.peg
View File

@ -23,6 +23,9 @@
proxy.network = "ws"; proxy.network = "ws";
$set(proxy, "ws-opts.path", obfs.path); $set(proxy, "ws-opts.path", obfs.path);
$set(proxy, "ws-opts.headers", obfs['ws-headers']); $set(proxy, "ws-opts.headers", obfs['ws-headers']);
if (proxy['ws-opts'] && proxy['ws-opts']['headers'] && proxy['ws-opts']['headers'].Host) {
proxy['ws-opts']['headers'].Host = proxy['ws-opts']['headers'].Host.replace(/^"(.*)"$/, '$1')
}
} }
} }
} }

8
backend/src/core/proxy-utils/producers/surge.js
View File

@ -301,7 +301,13 @@ function handleTransport(result, proxy) {
if (isPresent(proxy, 'ws-opts.headers')) { if (isPresent(proxy, 'ws-opts.headers')) {
const headers = proxy['ws-opts'].headers; const headers = proxy['ws-opts'].headers;
const value = Object.keys(headers) const value = Object.keys(headers)
.map((k) => `${k}:${headers[k]}`) .map((k) => {
let v = headers[k];
if (['Host'].includes(k)) {
v = `"${v}"`;
}
return `${k}:${v}`;
})
.join('|'); .join('|');
if (isNotBlank(value)) { if (isNotBlank(value)) {
result.append(`,ws-headers=${value}`); result.append(`,ws-headers=${value}`);