2ec0471bb5
Client attempts to parse the body of every error it receives as JSON
regardless of the content-type. This commit rectifies by only parsing
he error body as JSON if the Content-Type header is set to
either "application/json" or "application/vnd.api+json".
Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
(cherry picked from commit 45b7b9cec3
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
140 lines
4.6 KiB
Go
140 lines
4.6 KiB
Go
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
type nopCloser struct {
|
|
io.Reader
|
|
}
|
|
|
|
func (nopCloser) Close() error { return nil }
|
|
|
|
func TestHandleErrorResponse401ValidBody(t *testing.T) {
|
|
json := `{"errors":[{"code":"UNAUTHORIZED","message":"action requires authentication"}]}`
|
|
response := &http.Response{
|
|
Status: "401 Unauthorized",
|
|
StatusCode: 401,
|
|
Body: nopCloser{bytes.NewBufferString(json)},
|
|
Header: http.Header{"Content-Type": []string{"application/json; charset=utf-8"}},
|
|
}
|
|
err := HandleErrorResponse(response)
|
|
|
|
expectedMsg := "unauthorized: action requires authentication"
|
|
if !strings.Contains(err.Error(), expectedMsg) {
|
|
t.Errorf("Expected %q, got: %q", expectedMsg, err.Error())
|
|
}
|
|
}
|
|
|
|
func TestHandleErrorResponse401WithInvalidBody(t *testing.T) {
|
|
json := "{invalid json}"
|
|
response := &http.Response{
|
|
Status: "401 Unauthorized",
|
|
StatusCode: 401,
|
|
Body: nopCloser{bytes.NewBufferString(json)},
|
|
Header: http.Header{"Content-Type": []string{"application/json; charset=utf-8"}},
|
|
}
|
|
err := HandleErrorResponse(response)
|
|
|
|
expectedMsg := "unauthorized: authentication required"
|
|
if !strings.Contains(err.Error(), expectedMsg) {
|
|
t.Errorf("Expected %q, got: %q", expectedMsg, err.Error())
|
|
}
|
|
}
|
|
|
|
func TestHandleErrorResponseExpectedStatusCode400ValidBody(t *testing.T) {
|
|
json := `{"errors":[{"code":"DIGEST_INVALID","message":"provided digest does not match"}]}`
|
|
response := &http.Response{
|
|
Status: "400 Bad Request",
|
|
StatusCode: 400,
|
|
Body: nopCloser{bytes.NewBufferString(json)},
|
|
Header: http.Header{"Content-Type": []string{"application/json"}},
|
|
}
|
|
err := HandleErrorResponse(response)
|
|
|
|
expectedMsg := "digest invalid: provided digest does not match"
|
|
if !strings.Contains(err.Error(), expectedMsg) {
|
|
t.Errorf("Expected %q, got: %q", expectedMsg, err.Error())
|
|
}
|
|
}
|
|
|
|
func TestHandleErrorResponseExpectedStatusCode404EmptyErrorSlice(t *testing.T) {
|
|
json := `{"randomkey": "randomvalue"}`
|
|
response := &http.Response{
|
|
Status: "404 Not Found",
|
|
StatusCode: 404,
|
|
Body: nopCloser{bytes.NewBufferString(json)},
|
|
Header: http.Header{"Content-Type": []string{"application/json; charset=utf-8"}},
|
|
}
|
|
err := HandleErrorResponse(response)
|
|
|
|
expectedMsg := `error parsing HTTP 404 response body: no error details found in HTTP response body: "{\"randomkey\": \"randomvalue\"}"`
|
|
if !strings.Contains(err.Error(), expectedMsg) {
|
|
t.Errorf("Expected %q, got: %q", expectedMsg, err.Error())
|
|
}
|
|
}
|
|
|
|
func TestHandleErrorResponseExpectedStatusCode404InvalidBody(t *testing.T) {
|
|
json := "{invalid json}"
|
|
response := &http.Response{
|
|
Status: "404 Not Found",
|
|
StatusCode: 404,
|
|
Body: nopCloser{bytes.NewBufferString(json)},
|
|
Header: http.Header{"Content-Type": []string{"application/json"}},
|
|
}
|
|
err := HandleErrorResponse(response)
|
|
|
|
expectedMsg := "error parsing HTTP 404 response body: invalid character 'i' looking for beginning of object key string: \"{invalid json}\""
|
|
if !strings.Contains(err.Error(), expectedMsg) {
|
|
t.Errorf("Expected %q, got: %q", expectedMsg, err.Error())
|
|
}
|
|
}
|
|
|
|
func TestHandleErrorResponseUnexpectedStatusCode501(t *testing.T) {
|
|
response := &http.Response{
|
|
Status: "501 Not Implemented",
|
|
StatusCode: 501,
|
|
Body: nopCloser{bytes.NewBufferString("{\"Error Encountered\" : \"Function not implemented.\"}")},
|
|
Header: http.Header{"Content-Type": []string{"application/json"}},
|
|
}
|
|
err := HandleErrorResponse(response)
|
|
|
|
expectedMsg := "received unexpected HTTP status: 501 Not Implemented"
|
|
if !strings.Contains(err.Error(), expectedMsg) {
|
|
t.Errorf("Expected %q, got: %q", expectedMsg, err.Error())
|
|
}
|
|
}
|
|
|
|
func TestHandleErrorResponseInsufficientPrivileges403(t *testing.T) {
|
|
json := `{"details":"requesting higher privileges than access token allows"}`
|
|
response := &http.Response{
|
|
Status: "403 Forbidden",
|
|
StatusCode: 403,
|
|
Body: nopCloser{bytes.NewBufferString(json)},
|
|
Header: http.Header{"Content-Type": []string{"application/json"}},
|
|
}
|
|
err := HandleErrorResponse(response)
|
|
|
|
expectedMsg := "denied: requesting higher privileges than access token allows"
|
|
if !strings.Contains(err.Error(), expectedMsg) {
|
|
t.Errorf("Expected %q, got: %q", expectedMsg, err.Error())
|
|
}
|
|
}
|
|
|
|
func TestHandleErrorResponseNonJson(t *testing.T) {
|
|
msg := `{"details":"requesting higher privileges than access token allows"}`
|
|
response := &http.Response{
|
|
Status: "403 Forbidden",
|
|
StatusCode: 403,
|
|
Body: nopCloser{bytes.NewBufferString(msg)},
|
|
}
|
|
err := HandleErrorResponse(response)
|
|
|
|
if !strings.Contains(err.Error(), msg) {
|
|
t.Errorf("Expected %q, got: %q", msg, err.Error())
|
|
}
|
|
}
|