From e9839200c006026ef1769f7cab732e2312c969c5 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 10 Jan 2025 22:35:28 +0800 Subject: [PATCH] :art: Improve S3/WebDAV endpoint setting https://ld246.com/article/1736518497899 --- app/src/config/repos.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/config/repos.ts b/app/src/config/repos.ts index 5df808bb7..700b5c83d 100644 --- a/app/src/config/repos.ts +++ b/app/src/config/repos.ts @@ -317,17 +317,17 @@ const bindProviderEvent = () => { } (providerPanelElement.querySelector("#timeout") as HTMLInputElement).value = timeout.toString(); let endpoint = (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value; - endpoint = endpoint.replace("http://http(s)://", "http://"); + endpoint = endpoint.trim().replace("http://http(s)://", "https://"); if (!endpoint.startsWith("http")) { endpoint = "http://" + endpoint; } const s3 = { endpoint: endpoint, - accessKey: (providerPanelElement.querySelector("#accessKey") as HTMLInputElement).value, - secretKey: (providerPanelElement.querySelector("#secretKey") as HTMLInputElement).value, - bucket: (providerPanelElement.querySelector("#bucket") as HTMLInputElement).value, + accessKey: (providerPanelElement.querySelector("#accessKey") as HTMLInputElement).value.trim(), + secretKey: (providerPanelElement.querySelector("#secretKey") as HTMLInputElement).value.trim(), + bucket: (providerPanelElement.querySelector("#bucket") as HTMLInputElement).value.trim(), pathStyle: (providerPanelElement.querySelector("#pathStyle") as HTMLInputElement).value === "true", - region: (providerPanelElement.querySelector("#region") as HTMLInputElement).value, + region: (providerPanelElement.querySelector("#region") as HTMLInputElement).value.trim(), skipTlsVerify: (providerPanelElement.querySelector("#s3SkipTlsVerify") as HTMLInputElement).value === "true", timeout: timeout, concurrentReqs: concurrentReqs, @@ -352,14 +352,14 @@ const bindProviderEvent = () => { } (providerPanelElement.querySelector("#timeout") as HTMLInputElement).value = timeout.toString(); let endpoint = (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value; - endpoint = endpoint.replace("http://http(s)://", "http://"); + endpoint = endpoint.trim().replace("http://http(s)://", "https://"); if (!endpoint.startsWith("http")) { endpoint = "http://" + endpoint; } const webdav = { endpoint: endpoint, - username: (providerPanelElement.querySelector("#username") as HTMLInputElement).value, - password: (providerPanelElement.querySelector("#password") as HTMLInputElement).value, + username: (providerPanelElement.querySelector("#username") as HTMLInputElement).value.trim(), + password: (providerPanelElement.querySelector("#password") as HTMLInputElement).value.trim(), skipTlsVerify: (providerPanelElement.querySelector("#webdavSkipTlsVerify") as HTMLInputElement).value === "true", timeout: timeout, concurrentReqs: concurrentReqs,