vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make the registry client more tolerant about HTTP status codes

Browse source 
Generally, all 2xx and 3xx codes should be treated as success.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2015-07-24 16:14:04 -07:00
parent 060465882b
commit be404d7557
5 changed files with 40 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
registry/client/auth/session.go
View file

@ -10,6 +10,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/docker/distribution/registry/client"
"github.com/docker/distribution/registry/client/transport" "github.com/docker/distribution/registry/client/transport"
) )
@ -209,7 +210,7 @@ func (th *tokenHandler) fetchToken(params map[string]string) (token string, err
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if !client.SuccessStatus(resp.StatusCode) {
return "", fmt.Errorf("token auth attempt for registry: %s request failed with status: %d %s", req.URL, resp.StatusCode, http.StatusText(resp.StatusCode)) return "", fmt.Errorf("token auth attempt for registry: %s request failed with status: %d %s", req.URL, resp.StatusCode, http.StatusText(resp.StatusCode))
} }

12
registry/client/blob_writer.go
View file

@ -44,7 +44,7 @@ func (hbu *httpBlobUpload) ReadFrom(r io.Reader) (n int64, err error) {
return 0, err return 0, err
} }
if resp.StatusCode != http.StatusAccepted { if !SuccessStatus(resp.StatusCode) {
return 0, hbu.handleErrorResponse(resp) return 0, hbu.handleErrorResponse(resp)
} }
@ -79,7 +79,7 @@ func (hbu *httpBlobUpload) Write(p []byte) (n int, err error) {
return 0, err return 0, err
} }
if resp.StatusCode != http.StatusAccepted { if !SuccessStatus(resp.StatusCode) {
return 0, hbu.handleErrorResponse(resp) return 0, hbu.handleErrorResponse(resp)
} }
@ -142,7 +142,7 @@ func (hbu *httpBlobUpload) Commit(ctx context.Context, desc distribution.Descrip
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusCreated { if !SuccessStatus(resp.StatusCode) {
return distribution.Descriptor{}, hbu.handleErrorResponse(resp) return distribution.Descriptor{}, hbu.handleErrorResponse(resp)
} }
@ -160,12 +160,10 @@ func (hbu *httpBlobUpload) Cancel(ctx context.Context) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if resp.StatusCode == http.StatusNotFound || SuccessStatus(resp.StatusCode) {
case http.StatusNoContent, http.StatusNotFound:
return nil return nil
default:
return hbu.handleErrorResponse(resp)
} }
return hbu.handleErrorResponse(resp)
} }
func (hbu *httpBlobUpload) Close() error { func (hbu *httpBlobUpload) Close() error {

6
registry/client/errors.go
View file

@ -61,3 +61,9 @@ func handleErrorResponse(resp *http.Response) error {
} }
return &UnexpectedHTTPStatusError{Status: resp.Status} return &UnexpectedHTTPStatusError{Status: resp.Status}
} }
// SuccessStatus returns true if the argument is a successful HTTP response
// code (in the range 200 - 399 inclusive).
func SuccessStatus(status int) bool {
return status >= 200 && status <= 399
}

64
registry/client/repository.go
View file

@ -70,8 +70,7 @@ func (r *registry) Repositories(ctx context.Context, entries []string, last stri
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if SuccessStatus(resp.StatusCode) {
case http.StatusOK:
var ctlg struct { var ctlg struct {
Repositories []string `json:"repositories"` Repositories []string `json:"repositories"`
} }
@ -90,8 +89,7 @@ func (r *registry) Repositories(ctx context.Context, entries []string, last stri
if link == "" { if link == "" {
returnErr = io.EOF returnErr = io.EOF
} }
} else {
default:
return 0, handleErrorResponse(resp) return 0, handleErrorResponse(resp)
} }
@ -199,8 +197,7 @@ func (ms *manifests) Tags() ([]string, error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if SuccessStatus(resp.StatusCode) {
case http.StatusOK:
b, err := ioutil.ReadAll(resp.Body) b, err := ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
@ -214,11 +211,10 @@ func (ms *manifests) Tags() ([]string, error) {
} }
return tagsResponse.Tags, nil return tagsResponse.Tags, nil
case http.StatusNotFound: } else if resp.StatusCode == http.StatusNotFound {
return nil, nil return nil, nil
default:
return nil, handleErrorResponse(resp)
} }
return nil, handleErrorResponse(resp)
} }
func (ms *manifests) Exists(dgst digest.Digest) (bool, error) { func (ms *manifests) Exists(dgst digest.Digest) (bool, error) {
@ -238,14 +234,12 @@ func (ms *manifests) ExistsByTag(tag string) (bool, error) {
return false, err return false, err
} }
switch resp.StatusCode { if SuccessStatus(resp.StatusCode) {
case http.StatusOK:
return true, nil return true, nil
case http.StatusNotFound: } else if resp.StatusCode == http.StatusNotFound {
return false, nil return false, nil
default:
return false, handleErrorResponse(resp)
} }
return false, handleErrorResponse(resp)
} }
func (ms *manifests) Get(dgst digest.Digest) (*manifest.SignedManifest, error) { func (ms *manifests) Get(dgst digest.Digest) (*manifest.SignedManifest, error) {
@ -294,8 +288,9 @@ func (ms *manifests) GetByTag(tag string, options ...distribution.ManifestServic
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if resp.StatusCode == http.StatusNotModified {
case http.StatusOK: return nil, nil
} else if SuccessStatus(resp.StatusCode) {
var sm manifest.SignedManifest var sm manifest.SignedManifest
decoder := json.NewDecoder(resp.Body) decoder := json.NewDecoder(resp.Body)
@ -303,11 +298,8 @@ func (ms *manifests) GetByTag(tag string, options ...distribution.ManifestServic
return nil, err return nil, err
} }
return &sm, nil return &sm, nil
case http.StatusNotModified:
return nil, nil
default:
return nil, handleErrorResponse(resp)
} }
return nil, handleErrorResponse(resp)
} }
func (ms *manifests) Put(m *manifest.SignedManifest) error { func (ms *manifests) Put(m *manifest.SignedManifest) error {
@ -329,13 +321,11 @@ func (ms *manifests) Put(m *manifest.SignedManifest) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if SuccessStatus(resp.StatusCode) {
case http.StatusAccepted:
// TODO(dmcgowan): make use of digest header // TODO(dmcgowan): make use of digest header
return nil return nil
default:
return handleErrorResponse(resp)
} }
return handleErrorResponse(resp)
} }
func (ms *manifests) Delete(dgst digest.Digest) error { func (ms *manifests) Delete(dgst digest.Digest) error {
@ -354,12 +344,10 @@ func (ms *manifests) Delete(dgst digest.Digest) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if SuccessStatus(resp.StatusCode) {
case http.StatusAccepted:
return nil return nil
default:
return handleErrorResponse(resp)
} }
return handleErrorResponse(resp)
} }
type blobs struct { type blobs struct {
@ -461,8 +449,7 @@ func (bs *blobs) Create(ctx context.Context) (distribution.BlobWriter, error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if SuccessStatus(resp.StatusCode) {
case http.StatusAccepted:
// TODO(dmcgowan): Check for invalid UUID // TODO(dmcgowan): Check for invalid UUID
uuid := resp.Header.Get("Docker-Upload-UUID") uuid := resp.Header.Get("Docker-Upload-UUID")
location, err := sanitizeLocation(resp.Header.Get("Location"), u) location, err := sanitizeLocation(resp.Header.Get("Location"), u)
@ -477,9 +464,8 @@ func (bs *blobs) Create(ctx context.Context) (distribution.BlobWriter, error) {
startedAt: time.Now(), startedAt: time.Now(),
location: location, location: location,
}, nil }, nil
default:
return nil, handleErrorResponse(resp)
} }
return nil, handleErrorResponse(resp)
} }
func (bs *blobs) Resume(ctx context.Context, id string) (distribution.BlobWriter, error) { func (bs *blobs) Resume(ctx context.Context, id string) (distribution.BlobWriter, error) {
@ -508,8 +494,7 @@ func (bs *blobStatter) Stat(ctx context.Context, dgst digest.Digest) (distributi
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if SuccessStatus(resp.StatusCode) {
case http.StatusOK:
lengthHeader := resp.Header.Get("Content-Length") lengthHeader := resp.Header.Get("Content-Length")
length, err := strconv.ParseInt(lengthHeader, 10, 64) length, err := strconv.ParseInt(lengthHeader, 10, 64)
if err != nil { if err != nil {
@ -521,11 +506,10 @@ func (bs *blobStatter) Stat(ctx context.Context, dgst digest.Digest) (distributi
Size: length, Size: length,
Digest: dgst, Digest: dgst,
}, nil }, nil
case http.StatusNotFound: } else if resp.StatusCode == http.StatusNotFound {
return distribution.Descriptor{}, distribution.ErrBlobUnknown return distribution.Descriptor{}, distribution.ErrBlobUnknown
default:
return distribution.Descriptor{}, handleErrorResponse(resp)
} }
return distribution.Descriptor{}, handleErrorResponse(resp)
} }
func buildCatalogValues(maxEntries int, last string) url.Values { func buildCatalogValues(maxEntries int, last string) url.Values {
@ -559,12 +543,10 @@ func (bs *blobStatter) Clear(ctx context.Context, dgst digest.Digest) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
switch resp.StatusCode { if SuccessStatus(resp.StatusCode) {
case http.StatusAccepted:
return nil return nil
default:
return handleErrorResponse(resp)
} }
return handleErrorResponse(resp)
} }
func (bs *blobStatter) SetDescriptor(ctx context.Context, dgst digest.Digest, desc distribution.Descriptor) error { func (bs *blobStatter) SetDescriptor(ctx context.Context, dgst digest.Digest, desc distribution.Descriptor) error {

7
registry/client/transport/http_reader.go
View file

@ -154,10 +154,11 @@ func (hrs *httpReadSeeker) reader() (io.Reader, error) {
return nil, err return nil, err
} }
switch { // Normally would use client.SuccessStatus, but that would be a cyclic
case resp.StatusCode == 200: // import
if resp.StatusCode >= 200 && resp.StatusCode <= 399 {
hrs.rc = resp.Body hrs.rc = resp.Body
default: } else {
defer resp.Body.Close() defer resp.Body.Close()
return nil, fmt.Errorf("unexpected status resolving reader: %v", resp.Status) return nil, fmt.Errorf("unexpected status resolving reader: %v", resp.Status)
} }