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

Merge pull request #6255 from vieux/improve_trusted_detection

Browse source 
improve trusted location detection
This commit is contained in:
unclejack 2014-06-08 00:28:18 +03:00
commit 80db172a18
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/registry.go
View file

@ -766,7 +766,7 @@ func trustedLocation(req *http.Request) bool {
} }
for _, trusted := range trusteds { for _, trusted := range trusteds {
if strings.HasSuffix(hostname, trusted) { if hostname == trusted || strings.HasSuffix(hostname, "."+trusted) {
return true return true
} }
} }

2
docs/registry_test.go
View file

@ -235,7 +235,7 @@ func TestValidRepositoryName(t *testing.T) {
} }
func TestTrustedLocation(t *testing.T) { func TestTrustedLocation(t *testing.T) {
for _, url := range []string{"http://example.com", "https://example.com:7777", "http://docker.io", "http://test.docker.io"} { for _, url := range []string{"http://example.com", "https://example.com:7777", "http://docker.io", "http://test.docker.io", "https://fakedocker.com"} {
req, _ := http.NewRequest("GET", url, nil) req, _ := http.NewRequest("GET", url, nil)
if trustedLocation(req) == true { if trustedLocation(req) == true {
t.Fatalf("'%s' shouldn't be detected as a trusted location", url) t.Fatalf("'%s' shouldn't be detected as a trusted location", url)