Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-11 07:02:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 S3/WebDAV 数据同步支持设置跳过 HTTPS 证书验证 Fix https://github.com/siyuan-note/siyuan/issues/6609

Browse source
This commit is contained in:
Liang Ding 2022-11-16 19:39:15 +08:00
parent f9e670a3f6
commit ad3f7d8964
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
5 changed files with 55 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
app/src/config/repos.ts
View file

@ -77,6 +77,14 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.s3.pathStyle ? "" : "selected"} value="false">Virtual-hosted-style</option>
<option ${window.siyuan.config.sync.s3.pathStyle ? "selected" : ""} value="true">Path-style</option>
</select>
</div>
<div class="b3-label b3-label--noborder">
<div>TLS verify</div>
<div class="fn__hr"></div>
<select class="b3-select fn__block" id="s3SkipTlsVerify">
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select>
</div>`;
}
return `${tip}
@ -112,6 +120,14 @@ const renderProvider = (provider: number) => {
<option ${window.siyuan.config.sync.s3.pathStyle ? "" : "selected"} value="false">Virtual-hosted-style</option>
<option ${window.siyuan.config.sync.s3.pathStyle ? "selected" : ""} value="true">Path-style</option>
</select>
</label>
<label class="b3-label b3-label--noborder fn__flex">
<div class="fn__flex-center fn__size200">TLS Verify</div>
<div class="fn__space"></div>
<select class="b3-select fn__flex-1" id="s3SkipTlsVerify">
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
<option ${window.siyuan.config.sync.s3.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select>
</label>`;
} else if (provider === 3) {
const tip = `<div class="b3-label b3-label--inner">
@ -137,6 +153,14 @@ const renderProvider = (provider: number) => {
<div>Password</div>
<div class="fn__hr"></div>
<input id="password" class="b3-text-field fn__block" value="${window.siyuan.config.sync.webdav.password}">
</div>
<div class="b3-label b3-label--noborder">
<div>TLS verify</div>
<div class="fn__hr"></div>
<select class="b3-select fn__block" id="webdavSkipTlsVerify">
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select>
</div>`;
}
return `${tip}
@ -154,6 +178,14 @@ const renderProvider = (provider: number) => {
<div class="fn__flex-center fn__size200">Password</div>
<div class="fn__space"></div>
<input id="password" class="b3-text-field fn__flex-1" value="${window.siyuan.config.sync.webdav.password}">
</label>
<label class="b3-label b3-label--noborder fn__flex">
<div class="fn__flex-center fn__size200">TLS Verify</div>
<div class="fn__space"></div>
<select class="b3-select fn__flex-1" id="webdavSkipTlsVerify">
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
<option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
</select>
</label>`;
}
return "";
@ -222,6 +254,7 @@ const bindProviderEvent = () => {
bucket: (providerPanelElement.querySelector("#bucket") as HTMLInputElement).value,
pathStyle: (providerPanelElement.querySelector("#pathStyle") as HTMLInputElement).value === "true",
region: (providerPanelElement.querySelector("#region") as HTMLInputElement).value,
skipTlsVerify: (providerPanelElement.querySelector("#s3SkipTlsVerify") as HTMLInputElement).value === "true",
};
fetchPost("/api/sync/setSyncProviderS3", {s3}, () => {
window.siyuan.config.sync.s3 = s3;
@ -231,6 +264,7 @@ const bindProviderEvent = () => {
endpoint: (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value,
username: (providerPanelElement.querySelector("#username") as HTMLInputElement).value,
password: (providerPanelElement.querySelector("#password") as HTMLInputElement).value,
skipTlsVerify: (providerPanelElement.querySelector("#webdavSkipTlsVerify") as HTMLInputElement).value === "true",
};
fetchPost("/api/sync/setSyncProviderWebDAV", {webdav}, () => {
window.siyuan.config.sync.webdav = webdav;

2
app/src/types/index.d.ts vendored
View file

@ -340,11 +340,13 @@ declare interface IConfig {
secretKey: string
bucket: string
region: string
skipTlsVerify: boolean
}
webdav: {
endpoint: string
username: string
password: string
skipTlsVerify: boolean
}
},
lang: string