TrueCloudLab/distribution
13
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #10249 from jlhawn/distribution_version_header_10247

Browse source 
Split API Version header when checking for v2
This commit is contained in:
Jessie Frazelle 2015-01-27 11:48:42 -08:00
commit b7db855fc6
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docs/endpoint.go
View file

@ -231,10 +231,13 @@ func (e *Endpoint) pingV2() (RegistryInfo, error) {
// Ensure it supports the v2 Registry API. // Ensure it supports the v2 Registry API.
var supportsV2 bool var supportsV2 bool
for _, versionName := range resp.Header[http.CanonicalHeaderKey("Docker-Distribution-API-Version")] { HeaderLoop:
if versionName == "registry/2.0" { for _, supportedVersions := range resp.Header[http.CanonicalHeaderKey("Docker-Distribution-API-Version")] {
supportsV2 = true for _, versionName := range strings.Fields(supportedVersions) {
break if versionName == "registry/2.0" {
supportsV2 = true
break HeaderLoop
}
} }
} }

4
docs/endpoint_test.go
View file

@ -42,7 +42,9 @@ func TestValidateEndpointAmbiguousAPIVersion(t *testing.T) {
}) })
requireBasicAuthHandlerV2 := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { requireBasicAuthHandlerV2 := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Add("Docker-Distribution-API-Version", "registry/2.0") // This mock server supports v2.0, v2.1, v42.0, and v100.0
w.Header().Add("Docker-Distribution-API-Version", "registry/100.0 registry/42.0")
w.Header().Add("Docker-Distribution-API-Version", "registry/2.0 registry/2.1")
requireBasicAuthHandler.ServeHTTP(w, r) requireBasicAuthHandler.ServeHTTP(w, r)
}) })