mirror of
https://github.com/usememos/memos.git
synced 2026-11-20 19:09:09 +01:00
feat(storage): add insecure_skip_tls_verify option for S3
Adds an opt-in toggle to skip TLS certificate verification when connecting to the S3 endpoint, for self-hosted S3-compatible backends (e.g. rustfs, MinIO) that use self-signed certificates. Exposed in both the store/API protos and the storage settings UI, mirroring the existing use_path_style toggle. When enabled, the AWS client uses an HTTP transport with InsecureSkipVerify; default behavior is unchanged. This governs backend-initiated S3 calls (uploads, deletes, thumbnails, and image/document streaming). Video/audio playback redirects the browser to a presigned URL, so that path still requires the browser to trust the cert. Closes #6039
This commit is contained in:
@@ -444,10 +444,11 @@ func convertInstanceStorageSettingFromStore(settingpb *storepb.InstanceStorageSe
|
||||
setting.S3Config = &v1pb.InstanceSetting_StorageSetting_S3Config{
|
||||
AccessKeyId: settingpb.S3Config.AccessKeyId,
|
||||
// AccessKeySecret is write-only: never returned in responses.
|
||||
Endpoint: settingpb.S3Config.Endpoint,
|
||||
Region: settingpb.S3Config.Region,
|
||||
Bucket: settingpb.S3Config.Bucket,
|
||||
UsePathStyle: settingpb.S3Config.UsePathStyle,
|
||||
Endpoint: settingpb.S3Config.Endpoint,
|
||||
Region: settingpb.S3Config.Region,
|
||||
Bucket: settingpb.S3Config.Bucket,
|
||||
UsePathStyle: settingpb.S3Config.UsePathStyle,
|
||||
InsecureSkipTlsVerify: settingpb.S3Config.InsecureSkipTlsVerify,
|
||||
}
|
||||
}
|
||||
return setting
|
||||
@@ -464,12 +465,13 @@ func convertInstanceStorageSettingToStore(setting *v1pb.InstanceSetting_StorageS
|
||||
}
|
||||
if setting.S3Config != nil {
|
||||
settingpb.S3Config = &storepb.StorageS3Config{
|
||||
AccessKeyId: setting.S3Config.AccessKeyId,
|
||||
AccessKeySecret: setting.S3Config.AccessKeySecret,
|
||||
Endpoint: setting.S3Config.Endpoint,
|
||||
Region: setting.S3Config.Region,
|
||||
Bucket: setting.S3Config.Bucket,
|
||||
UsePathStyle: setting.S3Config.UsePathStyle,
|
||||
AccessKeyId: setting.S3Config.AccessKeyId,
|
||||
AccessKeySecret: setting.S3Config.AccessKeySecret,
|
||||
Endpoint: setting.S3Config.Endpoint,
|
||||
Region: setting.S3Config.Region,
|
||||
Bucket: setting.S3Config.Bucket,
|
||||
UsePathStyle: setting.S3Config.UsePathStyle,
|
||||
InsecureSkipTlsVerify: setting.S3Config.InsecureSkipTlsVerify,
|
||||
}
|
||||
}
|
||||
return settingpb
|
||||
|
||||
Reference in New Issue
Block a user