daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6255 from vieux/improve_trusted_detection 

improve trusted location detection
master
unclejack 2014-06-08 00:28:18 +03:00
parent df9d5752ec 5cef006c5a
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 {
if strings.HasSuffix(hostname, trusted) {
if hostname == trusted || strings.HasSuffix(hostname, "."+trusted) {
return true
}
}

2
docs/registry_test.go
View File

@ -235,7 +235,7 @@ func TestValidRepositoryName(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)
if trustedLocation(req) == true {
t.Fatalf("'%s' shouldn't be detected as a trusted location", url)