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

Print error for failed HTTP auth request.

Browse source 
Signed-off-by: Kenny Leung <kleung@google.com>
This commit is contained in:
Kenny Leung 2015-12-08 14:24:03 -08:00
parent ce17efc71e
commit e128a821db
4 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,7 +240,8 @@ func (th *tokenHandler) fetchToken(params map[string]string) (token *tokenRespon
defer resp.Body.Close() defer resp.Body.Close()
if !client.SuccessStatus(resp.StatusCode) { if !client.SuccessStatus(resp.StatusCode) {
return nil, fmt.Errorf("token auth attempt for registry: %s request failed with status: %d %s", req.URL, resp.StatusCode, http.StatusText(resp.StatusCode)) err := client.HandleErrorResponse(resp)
return nil, fmt.Errorf("token auth attempt for registry: %s request failed with status: %d %s: %q", req.URL, resp.StatusCode, http.StatusText(resp.StatusCode), err)
} }
decoder := json.NewDecoder(resp.Body) decoder := json.NewDecoder(resp.Body)

2
registry/client/blob_writer.go
View file

@ -33,7 +33,7 @@ func (hbu *httpBlobUpload) handleErrorResponse(resp *http.Response) error {
if resp.StatusCode == http.StatusNotFound { if resp.StatusCode == http.StatusNotFound {
return distribution.ErrBlobUploadUnknown return distribution.ErrBlobUploadUnknown
} }
return handleErrorResponse(resp) return HandleErrorResponse(resp)
} }
func (hbu *httpBlobUpload) ReadFrom(r io.Reader) (n int64, err error) { func (hbu *httpBlobUpload) ReadFrom(r io.Reader) (n int64, err error) {

6
registry/client/errors.go
View file

@ -47,7 +47,11 @@ func parseHTTPErrorResponse(r io.Reader) error {
return errors return errors
} }
func handleErrorResponse(resp *http.Response) error { // HandleErrorResponse returns error parsed from HTTP response for an
// unsuccessful HTTP response code (in the range 400 - 499 inclusive). An
// UnexpectedHTTPStatusError returned for response code outside of expected
// range.
func HandleErrorResponse(resp *http.Response) error {
if resp.StatusCode == 401 { if resp.StatusCode == 401 {
err := parseHTTPErrorResponse(resp.Body) err := parseHTTPErrorResponse(resp.Body)
if uErr, ok := err.(*UnexpectedHTTPResponseError); ok { if uErr, ok := err.(*UnexpectedHTTPResponseError); ok {

20
registry/client/repository.go
View file

@ -91,7 +91,7 @@ func (r *registry) Repositories(ctx context.Context, entries []string, last stri
returnErr = io.EOF returnErr = io.EOF
} }
} else { } else {
return 0, handleErrorResponse(resp) return 0, HandleErrorResponse(resp)
} }
return numFilled, returnErr return numFilled, returnErr
@ -213,7 +213,7 @@ func (ms *manifests) Tags() ([]string, error) {
return tagsResponse.Tags, nil return tagsResponse.Tags, nil
} }
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,7 +238,7 @@ func (ms *manifests) ExistsByTag(tag string) (bool, error) {
} else if resp.StatusCode == http.StatusNotFound { } else if resp.StatusCode == http.StatusNotFound {
return false, nil return false, nil
} }
return false, handleErrorResponse(resp) return false, HandleErrorResponse(resp)
} }
func (ms *manifests) Get(dgst digest.Digest) (*schema1.SignedManifest, error) { func (ms *manifests) Get(dgst digest.Digest) (*schema1.SignedManifest, error) {
@ -297,7 +297,7 @@ func (ms *manifests) GetByTag(tag string, options ...distribution.ManifestServic
} }
return &sm, nil return &sm, nil
} }
return nil, handleErrorResponse(resp) return nil, HandleErrorResponse(resp)
} }
func (ms *manifests) Put(m *schema1.SignedManifest) error { func (ms *manifests) Put(m *schema1.SignedManifest) error {
@ -323,7 +323,7 @@ func (ms *manifests) Put(m *schema1.SignedManifest) error {
// TODO(dmcgowan): make use of digest header // TODO(dmcgowan): make use of digest header
return nil return nil
} }
return handleErrorResponse(resp) return HandleErrorResponse(resp)
} }
func (ms *manifests) Delete(dgst digest.Digest) error { func (ms *manifests) Delete(dgst digest.Digest) error {
@ -345,7 +345,7 @@ func (ms *manifests) Delete(dgst digest.Digest) error {
if SuccessStatus(resp.StatusCode) { if SuccessStatus(resp.StatusCode) {
return nil return nil
} }
return handleErrorResponse(resp) return HandleErrorResponse(resp)
} }
type blobs struct { type blobs struct {
@ -401,7 +401,7 @@ func (bs *blobs) Open(ctx context.Context, dgst digest.Digest) (distribution.Rea
if resp.StatusCode == http.StatusNotFound { if resp.StatusCode == http.StatusNotFound {
return distribution.ErrBlobUnknown return distribution.ErrBlobUnknown
} }
return handleErrorResponse(resp) return HandleErrorResponse(resp)
}), nil }), nil
} }
@ -457,7 +457,7 @@ func (bs *blobs) Create(ctx context.Context) (distribution.BlobWriter, error) {
location: location, location: location,
}, nil }, nil
} }
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) {
@ -505,7 +505,7 @@ func (bs *blobStatter) Stat(ctx context.Context, dgst digest.Digest) (distributi
} else if resp.StatusCode == http.StatusNotFound { } else if resp.StatusCode == http.StatusNotFound {
return distribution.Descriptor{}, distribution.ErrBlobUnknown return distribution.Descriptor{}, distribution.ErrBlobUnknown
} }
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 {
@ -542,7 +542,7 @@ func (bs *blobStatter) Clear(ctx context.Context, dgst digest.Digest) error {
if SuccessStatus(resp.StatusCode) { if SuccessStatus(resp.StatusCode) {
return nil return nil
} }
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 {