jgaunt/duplicacy
1
0
Fork 0
mirror of https://github.com/gilbertchen/duplicacy synced 2025-12-11 13:53:16 +00:00
Code Issues Releases Wiki Activity

Merge e0e4cbf7e2 into 065ae50868

Browse Source
This commit is contained in:
Philipp Bandow
2024-12-19 15:03:46 +01:00
committed by GitHub
parent 065ae50868 e0e4cbf7e2
commit 10845e93f6
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/duplicacy_s3storage.go
View File

@@ -33,8 +33,13 @@ type S3Storage struct {
func CreateS3Storage(regionName string, endpoint string, bucketName string, storageDir string, func CreateS3Storage(regionName string, endpoint string, bucketName string, storageDir string,
accessKey string, secretKey string, threads int, accessKey string, secretKey string, threads int,
isSSLSupported bool, isMinioCompatible bool) (storage *S3Storage, err error) { isSSLSupported bool, isMinioCompatible bool) (storage *S3Storage, err error) {
return CreateS3StorageWithToken(regionName, endpoint, bucketName, storageDir, accessKey, secretKey, "", threads, isSSLSupported, isMinioCompatible)
}
token := "" // CreatesS3StorageWithToken create an amazon s3 storage object using an optional security token.
func CreateS3StorageWithToken(regionName string, endpoint string, bucketName string, storageDir string,
accessKey string, secretKey string, token string, threads int,
isSSLSupported bool, isMinioCompatible bool) (storage *S3Storage, err error) {
auth := credentials.NewStaticCredentials(accessKey, secretKey, token) auth := credentials.NewStaticCredentials(accessKey, secretKey, token)

9
src/duplicacy_storage.go
View File

@@ -456,7 +456,7 @@ func CreateStorage(preference Preference, resetPassword bool, threads int) (stor
SavePassword(preference, "ssh_password", password) SavePassword(preference, "ssh_password", password)
} }
return sftpStorage return sftpStorage
} else if matched[1] == "s3" || matched[1] == "s3c" || matched[1] == "minio" || matched[1] == "minios" { } else if matched[1] == "s3" || matched[1] == "s3c" || matched[1] == "minio" || matched[1] == "minios" || matched[1] == "s3-token" {
// urlRegex := regexp.MustCompile(`^(\w+)://([\w\-]+@)?([^/]+)(/(.+))?`) // urlRegex := regexp.MustCompile(`^(\w+)://([\w\-]+@)?([^/]+)(/(.+))?`)
@@ -493,7 +493,12 @@ func CreateStorage(preference Preference, resetPassword bool, threads int) (stor
} else { } else {
isMinioCompatible := (matched[1] == "minio" || matched[1] == "minios") isMinioCompatible := (matched[1] == "minio" || matched[1] == "minios")
isSSLSupported := (matched[1] == "s3" || matched[1] == "minios") isSSLSupported := (matched[1] == "s3" || matched[1] == "minios")
storage, err = CreateS3Storage(region, endpoint, bucket, storageDir, accessKey, secretKey, threads, isSSLSupported, isMinioCompatible) if matched[1] == "s3-token" {
token := GetPassword(preference, "s3_token", "Enter S3 Token (Optional):", true, resetPassword)
storage, err = CreateS3StorageWithToken(region, endpoint, bucket, storageDir, accessKey, secretKey, token, threads, isSSLSupported, isMinioCompatible)
} else {
storage, err = CreateS3Storage(region, endpoint, bucket, storageDir, accessKey, secretKey, threads, isSSLSupported, isMinioCompatible)
}
if err != nil { if err != nil {
LOG_ERROR("STORAGE_CREATE", "Failed to load the S3 storage at %s: %v", storageURL, err) LOG_ERROR("STORAGE_CREATE", "Failed to load the S3 storage at %s: %v", storageURL, err)
return nil return nil