3b5a2bbebc
Add check for unauthorized error code and explicitly set the error code if the content could not be parsed. Updated repository test for unauthorized tests and nit feedback. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
71 lines
1.7 KiB
Go
71 lines
1.7 KiB
Go
package client
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"net/http"
|
|
|
|
"github.com/docker/distribution/registry/api/v2"
|
|
)
|
|
|
|
// UnexpectedHTTPStatusError is returned when an unexpected HTTP status is
|
|
// returned when making a registry api call.
|
|
type UnexpectedHTTPStatusError struct {
|
|
Status string
|
|
}
|
|
|
|
func (e *UnexpectedHTTPStatusError) Error() string {
|
|
return fmt.Sprintf("Received unexpected HTTP status: %s", e.Status)
|
|
}
|
|
|
|
// UnexpectedHTTPResponseError is returned when an expected HTTP status code
|
|
// is returned, but the content was unexpected and failed to be parsed.
|
|
type UnexpectedHTTPResponseError struct {
|
|
ParseErr error
|
|
Response []byte
|
|
}
|
|
|
|
func (e *UnexpectedHTTPResponseError) Error() string {
|
|
shortenedResponse := string(e.Response)
|
|
if len(shortenedResponse) > 15 {
|
|
shortenedResponse = shortenedResponse[:12] + "..."
|
|
}
|
|
return fmt.Sprintf("Error parsing HTTP response: %s: %q", e.ParseErr.Error(), shortenedResponse)
|
|
}
|
|
|
|
func parseHTTPErrorResponse(r io.Reader) error {
|
|
var errors v2.Errors
|
|
body, err := ioutil.ReadAll(r)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := json.Unmarshal(body, &errors); err != nil {
|
|
return &UnexpectedHTTPResponseError{
|
|
ParseErr: err,
|
|
Response: body,
|
|
}
|
|
}
|
|
return &errors
|
|
}
|
|
|
|
func handleErrorResponse(resp *http.Response) error {
|
|
if resp.StatusCode == 401 {
|
|
err := parseHTTPErrorResponse(resp.Body)
|
|
if uErr, ok := err.(*UnexpectedHTTPResponseError); ok {
|
|
return &v2.Error{
|
|
Code: v2.ErrorCodeUnauthorized,
|
|
Message: "401 Unauthorized",
|
|
Detail: uErr.Response,
|
|
}
|
|
}
|
|
return err
|
|
}
|
|
if resp.StatusCode >= 400 && resp.StatusCode < 500 {
|
|
return parseHTTPErrorResponse(resp.Body)
|
|
}
|
|
return &UnexpectedHTTPStatusError{Status: resp.Status}
|
|
}
|