From 50b98a92a8716c862ea10d04256cc1b24deddb0e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Wed, 4 Jan 2023 17:28:54 +0000
Subject: [PATCH] =?UTF-8?q?bypassProxy=E3=81=AFproxyBypassHosts=E3=81=AB?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E3=82=92=E5=A7=94=E8=AD=B2=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .config/example.yml                                    | 10 ++++++----
 packages/backend/src/core/CaptchaService.ts            |  1 -
 .../backend/src/core/FetchInstanceMetadataService.ts   |  2 +-
 .../backend/src/core/activitypub/LdSignatureService.ts |  1 -
 .../src/server/api/endpoints/notes/translate.ts        |  1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index 93dea1f254..cabf167fba 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -122,10 +122,12 @@ id: 'aid'
 # Proxy for HTTP/HTTPS
 #proxy: http://127.0.0.1:3128
 
-#proxyBypassHosts: [
-#  'example.com',
-#  '192.0.2.8'
-#]
+proxyBypassHosts:
+  - api.deepl.com
+  - api-free.deepl.com
+  - www.recaptcha.net
+  - hcaptcha.com
+  - challenges.cloudflare.com
 
 # Proxy for SMTP/SMTPS
 #proxySmtp: http://127.0.0.1:3128   # use HTTP/1.1 CONNECT
diff --git a/packages/backend/src/core/CaptchaService.ts b/packages/backend/src/core/CaptchaService.ts
index e2dc68a8b0..6b5cb4db32 100644
--- a/packages/backend/src/core/CaptchaService.ts
+++ b/packages/backend/src/core/CaptchaService.ts
@@ -38,7 +38,6 @@ export class CaptchaService {
 			},
 			{
 				noOkError: true,
-				bypassProxy: true,
 			}
 		).catch(err => {
 			throw `${err.message ?? err}`;
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 17a363b415..cb9d099a22 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -190,7 +190,7 @@ export class FetchInstanceMetadataService {
 	
 		const faviconUrl = url + '/favicon.ico';
 	
-		const favicon = await this.httpRequestService.fetch(faviconUrl, {}, { noOkError: true, bypassProxy: false });
+		const favicon = await this.httpRequestService.fetch(faviconUrl, {}, { noOkError: true });
 	
 		if (favicon.ok) {
 			return faviconUrl;
diff --git a/packages/backend/src/core/activitypub/LdSignatureService.ts b/packages/backend/src/core/activitypub/LdSignatureService.ts
index c6764e7ee9..4e4b7dce2d 100644
--- a/packages/backend/src/core/activitypub/LdSignatureService.ts
+++ b/packages/backend/src/core/activitypub/LdSignatureService.ts
@@ -126,7 +126,6 @@ class LdSignature {
 			},
 			{
 				noOkError: true,
-				bypassProxy: false,
 			}
 		).then(res => {
 			if (!res.ok) {
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index 070625c6a5..71c50ebba5 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -96,7 +96,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				},
 				{
 					noOkError: false,
-					bypassProxy: true,
 				}
 			);