mirror of
https://github.com/genuinetools/reg.git
synced 2024-09-28 11:46:20 -04:00
0ff43808ca
* Add more useful error for bad credentials. The www-authenticate: basic response currently gets caught by the token transport, which fails to parse it and spits out a rather oblique "malformed auth challenge header" error. Make the token transport ignore basic auth types, and make the error transport handle a 401 response. * Format authchallenge.go correctly.
46 lines
1.2 KiB
Go
46 lines
1.2 KiB
Go
package registry
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
)
|
|
|
|
type httpStatusError struct {
|
|
Response *http.Response
|
|
Body []byte // Copied from `Response.Body` to avoid problems with unclosed bodies later. Nobody calls `err.Response.Body.Close()`, ever.
|
|
}
|
|
|
|
func (err *httpStatusError) Error() string {
|
|
return fmt.Sprintf("http: non-successful response (status=%v body=%q)", err.Response.StatusCode, err.Body)
|
|
}
|
|
|
|
var _ error = &httpStatusError{}
|
|
|
|
// ErrorTransport defines the data structure for returning errors from the round tripper.
|
|
type ErrorTransport struct {
|
|
Transport http.RoundTripper
|
|
}
|
|
|
|
// RoundTrip defines the round tripper for the error transport.
|
|
func (t *ErrorTransport) RoundTrip(request *http.Request) (*http.Response, error) {
|
|
resp, err := t.Transport.RoundTrip(request)
|
|
if err != nil {
|
|
return resp, err
|
|
}
|
|
|
|
if resp.StatusCode >= 500 || resp.StatusCode == http.StatusUnauthorized {
|
|
defer resp.Body.Close()
|
|
body, err := ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("http: failed to read response body (status=%v, err=%q)", resp.StatusCode, err)
|
|
}
|
|
|
|
return nil, &httpStatusError{
|
|
Response: resp,
|
|
Body: body,
|
|
}
|
|
}
|
|
|
|
return resp, err
|
|
}
|