github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-09-14 06:09:00 +00:00
Code Issues Projects Releases Wiki Activity

fix logic for handling regionEndpoint

Browse Source 
With the current logic we only verifies the region and return if it's
empty; we were not validating the regionEndpoint parameter.

Signed-off-by: Ankur Kothiwal <ankur.kothiwal@cern.com>
This commit is contained in:
Ankur Kothiwal
2024-05-07 17:03:12 +02:00
parent c49220d492
commit eb6123f5ed
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
registry/storage/driver/s3-aws/s3.go
View File

@@ -223,12 +223,13 @@ func FromParameters(ctx context.Context, parameters map[string]interface{}) (*Dr
} }
regionName := parameters["region"] regionName := parameters["region"]
if regionName == nil || fmt.Sprint(regionName) == "" {
return nil, fmt.Errorf("no region parameter provided")
}
region := fmt.Sprint(regionName) region := fmt.Sprint(regionName)
// Don't check the region value if a custom endpoint is provided. // Don't check the region value if a custom endpoint is provided.
if regionEndpoint == "" { if regionEndpoint == "" {
if regionName == nil || region == "" {
return nil, fmt.Errorf("no region parameter provided")
}
if _, ok := validRegions[region]; !ok { if _, ok := validRegions[region]; !ok {
return nil, fmt.Errorf("invalid region provided: %v", region) return nil, fmt.Errorf("invalid region provided: %v", region)
} }