Merge pull request #108 from upvestco/error-statuses

Error statuses clarification

service/runtime/handler.go

@@ -230,11 +230,19 @@ func (h *Handler) ServeHTTP(rw http.ResponseWriter, inReq *http.Request) {
 
 	sign := signerCfg.SignBuilder.GetDefaultPrivateKey()
 
-	httpClient := signer.NewHTTPClient(h.requestSigner, sign)
+	httpClient := signer.NewHTTPClient(h.requestSigner, sign, h.log)
 
 	resp, err := httpClient.Do(outReq)
 	if err != nil {
-		h.writeError(rw, http.StatusInternalServerError, err)
+		switch {
+		case errors.Is(err, context.DeadlineExceeded):
+			h.writeError(rw, http.StatusGatewayTimeout, err)
+		case errors.Is(err, signer.ErrSigning):
+			h.writeError(rw, http.StatusBadRequest, err)
+		default:
+			h.writeError(rw, http.StatusInternalServerError, err)
+		}
+
 		return
 	}
 	defer resp.Body.Close()

service/signer/http.go

@@ -21,21 +21,24 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/upvestco/httpsignature-proxy/service/signer/logger"
 	"github.com/upvestco/httpsignature-proxy/service/signer/request"
 )
 
 var _ http.RoundTripper = (*RoundTripper)(nil)
 
+var ErrSigning = errors.New("signing proxy: unable to sign request")
+
 // NewHTTPClient will create a new http.Client and add the signing transport to it.
-func NewHTTPClient(signer request.Signer, signingKey request.RequestSigner) *http.Client {
+func NewHTTPClient(signer request.Signer, signingKey request.RequestSigner, log logger.Logger) *http.Client {
 	return &http.Client{
-		Transport: NewTransport(http.DefaultTransport, signer, signingKey),
+		Transport: NewTransport(http.DefaultTransport, signer, signingKey, log),
 	}
 }
 
 // NewTransport will create a new http.RoundTripper that can be used in http.Client to sign requests transparently.
 // Underlying http.RoundTripper cannot be nil, if unsure, you can use http.DefaultTransport.
-func NewTransport(inner http.RoundTripper, signer request.Signer, signingKey request.RequestSigner) *RoundTripper {
+func NewTransport(inner http.RoundTripper, signer request.Signer, signingKey request.RequestSigner, log logger.Logger) *RoundTripper {
 	return &RoundTripper{
 		inner:      inner,
 		signer:     signer,
@@ -48,13 +51,15 @@ type RoundTripper struct {
 	inner      http.RoundTripper
 	signer     request.Signer
 	signingKey request.RequestSigner
+	log        logger.Logger
 }
 
 // RoundTrip does the actual signing and sending.
 func (r RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	err := r.signer.Sign(req, r.signingKey)
 	if err != nil {
-		return nil, errors.Wrap(err, "signing proxy: unable to sign request")
+		r.log.LogF("signing error: %v", err)
+		return nil, ErrSigning
 	}
 
 	rsp, err := r.inner.RoundTrip(req)