From 5f4575d2cc045ba1def68dddd6892eb5cae62e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 17 Oct 2024 23:09:47 +0800 Subject: [PATCH 1/7] v1.8.7 --- lerna.json | 2 +- packages/core/package.json | 4 ++-- packages/gui/package.json | 6 +++--- packages/mitmproxy/package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lerna.json b/lerna.json index 7188e81..5ecd05a 100644 --- a/lerna.json +++ b/lerna.json @@ -14,5 +14,5 @@ "ignore": [] } }, - "version": "1.8.6" + "version": "1.8.7" } diff --git a/packages/core/package.json b/packages/core/package.json index 4eccff9..090ecfd 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar", - "version": "1.8.6", + "version": "1.8.7", "description": "给开发者的加速代理工具", "main": "src/index.js", "keywords": [ @@ -17,7 +17,7 @@ "test": "mocha" }, "dependencies": { - "@docmirror/mitmproxy": "^1.8.6", + "@docmirror/mitmproxy": "^1.8.7", "agentkeepalive": "^2.1.1", "babel-preset-es2020": "^1.0.2", "charset": "^1.0.0", diff --git a/packages/gui/package.json b/packages/gui/package.json index 7187d90..ae7408c 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar-gui", - "version": "1.8.6", + "version": "1.8.7", "private": false, "license": "MPL-2.0", "main": "background.js", @@ -21,8 +21,8 @@ "name": "Greper" }, "dependencies": { - "@docmirror/dev-sidecar": "^1.8.6", - "@docmirror/mitmproxy": "^1.8.6", + "@docmirror/dev-sidecar": "^1.8.7", + "@docmirror/mitmproxy": "^1.8.7", "adm-zip": "^0.5.5", "ant-design-vue": "^1.6.5", "compressing": "^1.5.1", diff --git a/packages/mitmproxy/package.json b/packages/mitmproxy/package.json index 6c2a315..fd8f78b 100644 --- a/packages/mitmproxy/package.json +++ b/packages/mitmproxy/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/mitmproxy", - "version": "1.8.6", + "version": "1.8.7", "description": "", "main": "src/index.js", "keywords": [ From e9987d04dedcb541328eea1e1d4e1985858e5e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 17 Oct 2024 23:49:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=86=85=E7=BD=AE=20`pac.txt`=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0=EF=BC=9A`2024/09/02=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC`=20->=20`2024/10/07=20=E7=89=88=E6=9C=AC`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/gui/extra/pac/pac.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/gui/extra/pac/pac.txt b/packages/gui/extra/pac/pac.txt index 8120fb8..128f8cc 100644 --- a/packages/gui/extra/pac/pac.txt +++ b/packages/gui/extra/pac/pac.txt @@ -1,9 +1,9 @@ [AutoProxy 0.2.9] -! Checksum: l4wfvwqYVXzlCBYaVcmRxQ +! Checksum: j9+lCGr2eTNyrwZCFg8ZzQ ! Expires: 6h ! Title: GFWList4LL ! GFWList with EVERYTHING included -! Last Modified: Mon, 02 Sep 2024 11:03:48 -0400 +! Last Modified: Mon, 07 Oct 2024 11:39:43 -0400 ! ! HomePage: https://github.com/gfwlist/gfwlist ! License: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt @@ -832,6 +832,7 @@ cdninstagram.com ||facebook.com !--/^https?:\/\/[^\/]+facebook\.com/ @@||v6.facebook.com +||facebook.de ||facebook.design ||connect.facebook.net ||facebook.hu @@ -850,6 +851,7 @@ cdninstagram.com ||instagram.com ||m.me ||messenger.com +||meta.com ||oculus.com ||oculuscdn.com ||rocksdb.org @@ -1505,6 +1507,7 @@ blogspot.com ||on2.com ||opensource.google ||panoramio.com +||passwords.google ||picasaweb.com ||pki.goog ||plus.codes @@ -7359,6 +7362,7 @@ torrentprivacy.com |http://torrentproject.se ||torrenty.org ||torrentz.eu +||tortoisesvn.net ||torvpn.com ||totalvpn.com .toutiaoabc.com From f2f01694a0367197deb36c7a299502f0387a5d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 17 Oct 2024 23:50:51 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=86=85=E7=BD=AE=20`domestic-domain-allow?= =?UTF-8?q?list.txt`=20=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0=EF=BC=9A`2024/?= =?UTF-8?q?09/26=E7=89=88=E6=9C=AC`=20->=20`2024/10/14=E7=89=88=E6=9C=AC`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/extra/proxy/domestic-domain-allowlist.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/gui/extra/proxy/domestic-domain-allowlist.txt b/packages/gui/extra/proxy/domestic-domain-allowlist.txt index 2669990..b745ec9 100644 --- a/packages/gui/extra/proxy/domestic-domain-allowlist.txt +++ b/packages/gui/extra/proxy/domestic-domain-allowlist.txt @@ -1,6 +1,6 @@ [SwitchyOmega Conditions] ; Require: SwitchyOmega >= 2.3.2 -; Update Date: 2024/09/26 +; Update Date: 2024/10/14 ; Author: Pluwen ; Usage: https://github.com/FelisCatus/SwitchyOmega/wiki/RuleListUsage @@ -19,6 +19,7 @@ *.0daydown.com *.0o0.ooo *.10010.com +*.10086cloud.com *.114la.com *.114yygh.com *.115.com @@ -54,6 +55,7 @@ *.360buyimg.com *.360doc.com *.360in.com +*.360safe.com *.36kr.com *.39.net *.3dmgame.com @@ -140,6 +142,7 @@ *.ant.design *.antfin-inc.com *.antfin.com +*.antpcdn.com *.anw.red *.anyway.fm *.anzhi.com @@ -203,6 +206,7 @@ *.biliapi.net *.bilibili.com *.bilibili.tv +*.bilicomic.com *.biligame.com *.biligame.net *.bilivideo.com @@ -404,6 +408,7 @@ *.frdic.com *.freebuf.com *.freeziti.com +*.fromgeek.com *.futu5.com *.futunn.com *.fydeos.com @@ -551,6 +556,7 @@ *.jdkindle.com *.jdpay.com *.jetbrains.com +*.jfdaily.com *.jfrft.com *.jhdec.com *.jianguoyun.com @@ -637,6 +643,7 @@ *.lecloud.com *.leetcode-cn.com *.lemicp.com +*.lenovo.net *.lenovomobile.com *.letv.com *.letvimg.com @@ -841,6 +848,7 @@ *.qhimg.com *.qhmsg.com *.qhres.com +*.qianxin.com *.qichacha.com *.qidian.com *.qihucdn.com @@ -899,6 +907,7 @@ *.sc115.com *.sciencedirect.com *.sciencemag.org +*.scofd.com *.scomper.me *.sdbeta.com *.sdo.com @@ -958,7 +967,6 @@ *.steamcn.com *.steamcontent.com *.steamdb.info -*.steamstatic.com *.subhd.tv *.sui.com *.suning.com From 7584fed3468af8688e3c6ec6d69f3e9f564df67c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 18 Oct 2024 00:43:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?bugfix:=20=E5=BD=93=E6=9F=90=E4=B8=AA?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=9C=AA=E9=85=8D=E7=BD=AE=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BD=86=E5=90=AF=E5=8A=A8=E4=BA=86?= =?UTF-8?q?=E5=BD=A9=E8=9B=8B=E5=8A=9F=E8=83=BD=E6=97=B6=EF=BC=8C=E5=BD=A9?= =?UTF-8?q?=E8=9B=8B=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mitmproxy/src/lib/proxy/middleware/overwall.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js index 7b15a34..a1ab44e 100644 --- a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js +++ b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js @@ -15,7 +15,7 @@ function matched (hostname, overWallTargetMap) { return 'overwall config' } if (pacClient == null) { - return false + return null } const ret = pacClient.FindProxyForURL('https://' + hostname, hostname) if (ret && ret.indexOf('PROXY ') === 0) { @@ -23,7 +23,7 @@ function matched (hostname, overWallTargetMap) { return 'overwall pac' } else { log.debug(`matchHostname: matched overwall: Not-Matched '${hostname}' -> '${ret}' in pac.txt`) - return false + return null } } @@ -148,7 +148,11 @@ function createOverwallMiddleware (overWallConfig) { return { sslConnectInterceptor: (req, cltSocket, head) => { const hostname = req.url.split(':')[0] - return matched(hostname, overWallTargetMap) + const ret = matched(hostname, overWallTargetMap) + if (ret == null) { + return null // 返回 null，由下一个拦截器校验 + } + return true // 拦截 }, requestIntercept (context, req, res, ssl, next) { const { rOptions, log, RequestCounter } = context @@ -157,7 +161,7 @@ function createOverwallMiddleware (overWallConfig) { } const hostname = rOptions.hostname const matchedResult = matched(hostname, overWallTargetMap) - if (!matchedResult) { + if (matchedResult == null) { return } const cacheKey = '__over_wall_proxy__' From b8945e37685c5ca1de8c3d8a0a6c02982332ebc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 18 Oct 2024 00:48:36 +0800 Subject: [PATCH 5/7] =?UTF-8?q?bugfix:=20=E5=BD=93=E6=9F=90=E4=B8=AA?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=9C=AA=E9=85=8D=E7=BD=AE=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BD=86=E5=90=AF=E5=8A=A8=E4=BA=86?= =?UTF-8?q?=E5=BD=A9=E8=9B=8B=E5=8A=9F=E8=83=BD=E6=97=B6=EF=BC=8C=E5=BD=A9?= =?UTF-8?q?=E8=9B=8B=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/mitmproxy/src/lib/proxy/middleware/overwall.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js index a1ab44e..72f0aa6 100644 --- a/packages/mitmproxy/src/lib/proxy/middleware/overwall.js +++ b/packages/mitmproxy/src/lib/proxy/middleware/overwall.js @@ -152,6 +152,9 @@ function createOverwallMiddleware (overWallConfig) { if (ret == null) { return null // 返回 null，由下一个拦截器校验 } + if (ret === false) { + return false // 不拦截，预留这个判断，避免以后修改 matched 方法的代码出BUG + } return true // 拦截 }, requestIntercept (context, req, res, ssl, next) { @@ -161,7 +164,7 @@ function createOverwallMiddleware (overWallConfig) { } const hostname = rOptions.hostname const matchedResult = matched(hostname, overWallTargetMap) - if (matchedResult == null) { + if (matchedResult == null || matchedResult === false) { return } const cacheKey = '__over_wall_proxy__' From c68e504e69178d1c0fb75d9131d9987e62726bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 18 Oct 2024 01:14:13 +0800 Subject: [PATCH 6/7] v1.8.8 --- lerna.json | 2 +- packages/core/package.json | 4 ++-- packages/gui/package.json | 6 +++--- packages/mitmproxy/package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lerna.json b/lerna.json index 5ecd05a..d735ae4 100644 --- a/lerna.json +++ b/lerna.json @@ -14,5 +14,5 @@ "ignore": [] } }, - "version": "1.8.7" + "version": "1.8.8" } diff --git a/packages/core/package.json b/packages/core/package.json index 090ecfd..7d976cb 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar", - "version": "1.8.7", + "version": "1.8.8", "description": "给开发者的加速代理工具", "main": "src/index.js", "keywords": [ @@ -17,7 +17,7 @@ "test": "mocha" }, "dependencies": { - "@docmirror/mitmproxy": "^1.8.7", + "@docmirror/mitmproxy": "^1.8.8", "agentkeepalive": "^2.1.1", "babel-preset-es2020": "^1.0.2", "charset": "^1.0.0", diff --git a/packages/gui/package.json b/packages/gui/package.json index ae7408c..ae24c9b 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar-gui", - "version": "1.8.7", + "version": "1.8.8", "private": false, "license": "MPL-2.0", "main": "background.js", @@ -21,8 +21,8 @@ "name": "Greper" }, "dependencies": { - "@docmirror/dev-sidecar": "^1.8.7", - "@docmirror/mitmproxy": "^1.8.7", + "@docmirror/dev-sidecar": "^1.8.8", + "@docmirror/mitmproxy": "^1.8.8", "adm-zip": "^0.5.5", "ant-design-vue": "^1.6.5", "compressing": "^1.5.1", diff --git a/packages/mitmproxy/package.json b/packages/mitmproxy/package.json index fd8f78b..1512675 100644 --- a/packages/mitmproxy/package.json +++ b/packages/mitmproxy/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/mitmproxy", - "version": "1.8.7", + "version": "1.8.8", "description": "", "main": "src/index.js", "keywords": [ From c92038be621519e12fec135fbe1e4151efd27154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Fri, 18 Oct 2024 09:39:53 +0800 Subject: [PATCH 7/7] =?UTF-8?q?Github=20Actions:=20`test-and-upload.yml`?= =?UTF-8?q?=20=E5=9C=A8PR=E6=8F=90=E4=BA=A4=E6=97=B6=E4=B9=9F=E4=BC=9A?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-and-upload.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-and-upload.yml b/.github/workflows/test-and-upload.yml index 214d44c..5cc7195 100644 --- a/.github/workflows/test-and-upload.yml +++ b/.github/workflows/test-and-upload.yml @@ -5,6 +5,9 @@ on: branches: - master - release + pull_request: + branches: + - master jobs: test-and-upload: