Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 08:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 S3 数据同步加入单个请求默认超时 30s https://github.com/siyuan-note/siyuan/issues/6610

Browse source
This commit is contained in:
Liang Ding 2022-11-16 18:10:09 +08:00
parent 66204003f3
commit f6b290e7bf
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
kernel/model/repository.go
View file

@ -824,16 +824,17 @@ func newRepository() (ret *dejavu.Repo, err error) {
case conf.ProviderSiYuan:
cloudRepo = cloud.NewSiYuan(&cloud.BaseCloud{Conf: cloudConf})
case conf.ProviderS3:
cloudRepo = cloud.NewS3(&cloud.BaseCloud{Conf: cloudConf})
s3HTTPClient := &http.Client{Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: cloudConf.S3.SkipTlsVerify}}}
s3HTTPClient.Timeout = 30 * time.Second
cloudRepo = cloud.NewS3(&cloud.BaseCloud{Conf: cloudConf}, s3HTTPClient)
case conf.ProviderWebDAV:
webdavClient := gowebdav.NewClient(cloudConf.Endpoint, cloudConf.Username, cloudConf.Password)
a := cloudConf.Username + ":" + cloudConf.Password
webdavClient := gowebdav.NewClient(cloudConf.Endpoint, cloudConf.WebDAV.Username, cloudConf.WebDAV.Password)
a := cloudConf.WebDAV.Username + ":" + cloudConf.WebDAV.Password
auth := "Basic " + base64.StdEncoding.EncodeToString([]byte(a))
webdavClient.SetHeader("Authorization", auth)
webdavClient.SetHeader("User-Agent", util.UserAgent)
webdavClient.SetTimeout(30 * time.Second)
// WebDAV 数据同步跳过 HTTPS 证书校验 https://github.com/siyuan-note/siyuan/issues/6556
webdavClient.SetTransport(&http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}})
webdavClient.SetTransport(&http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: cloudConf.WebDAV.SkipTlsVerify}})
cloudRepo = cloud.NewWebDAV(&cloud.BaseCloud{Conf: cloudConf}, webdavClient)
default:
err = fmt.Errorf("unknown cloud provider [%d]", Conf.Sync.Provider)
@ -1049,15 +1050,17 @@ func buildCloudConf() (ret *cloud.Conf, err error) {
ret.Endpoint = "https://siyuan-data.b3logfile.com/"
case conf.ProviderS3:
ret.Endpoint = Conf.Sync.S3.Endpoint
ret.AccessKey = Conf.Sync.S3.AccessKey
ret.SecretKey = Conf.Sync.S3.SecretKey
ret.Bucket = Conf.Sync.S3.Bucket
ret.Region = Conf.Sync.S3.Region
ret.PathStyle = Conf.Sync.S3.PathStyle
ret.S3.AccessKey = Conf.Sync.S3.AccessKey
ret.S3.SecretKey = Conf.Sync.S3.SecretKey
ret.S3.Bucket = Conf.Sync.S3.Bucket
ret.S3.Region = Conf.Sync.S3.Region
ret.S3.PathStyle = Conf.Sync.S3.PathStyle
ret.S3.SkipTlsVerify = Conf.Sync.S3.SkipTlsVerify
case conf.ProviderWebDAV:
ret.Endpoint = Conf.Sync.WebDAV.Endpoint
ret.Username = Conf.Sync.WebDAV.Username
ret.Password = Conf.Sync.WebDAV.Password
ret.WebDAV.Username = Conf.Sync.WebDAV.Username
ret.WebDAV.Password = Conf.Sync.WebDAV.Password
ret.WebDAV.SkipTlsVerify = Conf.Sync.WebDAV.SkipTlsVerify
default:
err = fmt.Errorf("invalid provider [%d]", Conf.Sync.Provider)
return