alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Enables s3 driver, limits permission check to scope of rootdirectory

Browse source 
Signed-off-by: Brian Bland <brian.bland@docker.com>
This commit is contained in:
Brian Bland 2015-01-12 13:02:22 -08:00
parent df4441d03c
commit 16a258ce69
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/registry/main.go
View file

@ -18,6 +18,7 @@ import (
"github.com/docker/distribution/registry" "github.com/docker/distribution/registry"
_ "github.com/docker/distribution/storagedriver/filesystem" _ "github.com/docker/distribution/storagedriver/filesystem"
_ "github.com/docker/distribution/storagedriver/inmemory" _ "github.com/docker/distribution/storagedriver/inmemory"
_ "github.com/docker/distribution/storagedriver/s3"
) )
func main() { func main() {

4
storagedriver/s3/s3.go
View file

@ -168,7 +168,9 @@ func New(params DriverParameters) (*Driver, error) {
} }
} }
if _, err := bucket.List("", "", "", 1); err != nil { // Validate that the given credentials have at least read permissions in the
// given bucket scope.
if _, err := bucket.List(strings.TrimRight(params.RootDirectory, "/"), "", "", 1); err != nil {
return nil, err return nil, err
} }