New auth

escher_api/auth/auth.go

@@ -1,74 +1,108 @@
 package auth
 
 import (
-	"errors"
+	"fmt"
 	"net/http"
 
 	"github.com/EscherAuth/escher/config"
 	escher_request "github.com/EscherAuth/escher/request"
 	"github.com/EscherAuth/escher/signer"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/strfmt"
 )
 
-type Credentials struct {
-	AccessKeyID     string
-	SecretAccessKey string
-}
-
 type HmacSha2Auth struct {
-	Credentials     Credentials
+	Host            string
+	BasePath        string
+	Credentials     *credentials.Credentials
 	CredentialScope string
 }
 
-func NewAuth(accessKey string, sharedKey string, credentialScope string) HmacSha2Auth {
-	staticCreds := Credentials{accessKey, sharedKey}
+func NewAuth(agentId, host, basePath, sharedKey, credentialScope string) HmacSha2Auth {
+	staticCreds := credentials.NewStaticCredentials(agentId, sharedKey, "")
 	return HmacSha2Auth{
 		Credentials:     staticCreds,
 		CredentialScope: credentialScope,
+		Host:            host,
+		BasePath:        basePath,
 	}
 }
 
-func (auth HmacSha2Auth) AuthenticateRequest(r runtime.ClientRequest, _ strfmt.Registry) error {
-	req := r.(*request)
+// copied from https://github.com/EscherAuth/escher/blob/master/request/httprequest.go#L74
+func (auth HmacSha2Auth) createEscherHeadersFromHTTPHeaders(h http.Header) escher_request.Headers {
+	headers := escher_request.Headers{}
 
+	for key, values := range h {
+		for _, value := range values {
+			headers = append(headers, [2]string{key, value})
+		}
+	}
+
+	if h.Get("host") == "" {
+		// https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.23
+		headers = append(headers, [2]string{"host", auth.Host})
+	}
+
+	return headers
+}
+
+func (auth HmacSha2Auth) AuthenticateRequest(r runtime.ClientRequest, _ strfmt.Registry) error {
 	c := config.Config{}
 	config.SetDefaults(&c)
-
-	c.AccessKeyId = auth.Credentials.AccessKeyID
-	c.ApiSecret = auth.Credentials.SecretAccessKey
 	c.CredentialScope = auth.CredentialScope
 
-	signerObj := signer.New(c)
-	escherReq, err := escher_request.NewFromHTTPRequest(req.request)
+	value, err := auth.Credentials.Get()
 	if err != nil {
 		return err
 	}
 
+	c.AccessKeyId = value.AccessKeyID
+	c.ApiSecret = value.SecretAccessKey
+
+	signerObj := signer.New(c)
+	escherReq := escher_request.New(r.GetMethod(), auth.buildUrlString(r), auth.createEscherHeadersFromHTTPHeaders(r.GetHeaderParams()), string(r.GetBody()), 36000)
+
 	signReq, err := signerObj.SignRequest(escherReq, []string{})
 	if err != nil {
 		return err
 	}
 
-	err = setHeader(req.request, signReq, c.GetAuthHeaderName())
+	err = setHeader(r, signReq, c.GetAuthHeaderName())
 	if err != nil {
 		return err
 	}
 
-	err = setHeader(req.request, signReq, c.GetDateHeaderName())
+	err = setHeader(r, signReq, c.GetDateHeaderName())
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func setHeader(req *http.Request, signReq *escher_request.Request, header string) error {
+func (auth HmacSha2Auth) buildUrlString(r runtime.ClientRequest) string {
+	urlString := ""
+	if auth.BasePath != "" {
+		urlString += auth.BasePath
+	}
+	urlString += r.GetPath()
+	if queryParams := r.GetQueryParams().Encode(); queryParams != "" {
+		urlString += "?" + queryParams
+	}
+	return urlString
+}
+
+func setHeader(r runtime.ClientRequest, signReq *escher_request.Request, header string) error {
 	authValue, success := signReq.Headers().Get(header)
 	if success != true {
-		return errors.New("could not get auth header")
+		return fmt.Errorf("could not get auth header")
+	}
+
+	err := r.SetHeaderParam(header, authValue)
+	if err != nil {
+		return fmt.Errorf("failed to set header: %v", err)
 	}
 
-	req.Header.Set(header, authValue)
 	return nil
 }