Browse Source

Open up v2 http status code checks for put and head checks

Under certain cases, such as when putting a manifest or check for the existence
of a layer, the status code checks in session_v2.go were too narrow for their
purpose. In the case of putting a manifest, the handler only cares that an
error is not returned. Whether it is a 304 or 202 does not matter, as long as
the server reports success. Having the client only accept specific http codes
inhibits future protocol evolution.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Stephen J Day 10 years ago
parent
commit
86aea582b6
1 changed files with 7 additions and 4 deletions
  1. 7 4
      registry/session_v2.go

+ 7 - 4
registry/session_v2.go

@@ -124,14 +124,15 @@ func (r *Session) HeadV2ImageBlob(ep *Endpoint, imageName, sumType, sum string,
 		return false, err
 	}
 	res.Body.Close() // close early, since we're not needing a body on this call .. yet?
-	switch res.StatusCode {
-	case 200:
+	switch {
+	case res.StatusCode >= 200 && res.StatusCode < 400:
 		// return something indicating no push needed
 		return true, nil
-	case 404:
+	case res.StatusCode == 404:
 		// return something indicating blob push needed
 		return false, nil
 	}
+
 	return false, utils.NewHTTPRequestError(fmt.Sprintf("Server error: %d trying head request for %s - %s:%s", res.StatusCode, imageName, sumType, sum), res)
 }
 
@@ -278,7 +279,9 @@ func (r *Session) PutV2ImageManifest(ep *Endpoint, imageName, tagName string, ma
 		return err
 	}
 	defer res.Body.Close()
-	if res.StatusCode != 200 {
+
+	// All 2xx and 3xx responses can be accepted for a put.
+	if res.StatusCode >= 400 {
 		if res.StatusCode == 401 {
 			return errLoginRequired
 		}