Func: add new ValidRequest method

Author: Juanadelacuesta

signature/signature.go

@@ -7,7 +7,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"math"
 	"net/http"
 	"net/url"
@@ -42,19 +41,15 @@ func hMACSHA256(message, key []byte) ([]byte, error) {
 
 // Validator type represents a MessageBird signature validator
 type Validator struct {
-	SigningKey  string         // Signing Key provided by MessageBird
-	Period      ValidityPeriod // Period in hours for a message to be accepted as real, set to nil to bypass the timestamp validator
-	Log         *log.Logger
-	LogMesssage *string
+	SigningKey string         // Signing Key provided by MessageBird
+	Period     ValidityPeriod // Period in hours for a message to be accepted as real, set to nil to bypass the timestamp validator
 }
 
 // NewValidator returns a signature validator object
-func NewValidator(signingKey string, period ValidityPeriod, log *log.Logger, message *string) *Validator {
+func NewValidator(signingKey string, period ValidityPeriod) *Validator {
 	return &Validator{
-		SigningKey:  signingKey,
-		Period:      period,
-		Log:         log,
-		LogMesssage: message,
+		SigningKey: signingKey,
+		Period:     period,
 	}
 }
 
@@ -110,29 +105,36 @@ func (v *Validator) ValidSignature(ts, rqp string, b []byte, rs string) bool {
 }
 
 func (v *Validator) Error(w http.ResponseWriter, r *http.Request) {
-	if v.Log != nil {
-		v.Log.Printf("%s, sending host: %s", *v.LogMesssage, r.Host)
+
+}
+
+// ValidRequest is a method that takes care of the signature validation of
+// incoming requests
+// To use just wrap your handler with it:
+// signature.Validate(request)
+func (v *Validator) ValidRequest(r *http.Request) (bool, error) {
+	ts := r.Header.Get(tsHeader)
+	rs := r.Header.Get(sHeader)
+	if ts == "" || rs == "" {
+		return false, fmt.Errorf("Unknown host: %s", r.Host)
 	}
-	http.Error(w, "Request not allowed", http.StatusUnauthorized)
-	return
+	b, _ := ioutil.ReadAll(r.Body)
+	if v.ValidTimestamp(ts) == false || v.ValidSignature(ts, r.URL.RawQuery, b, rs) == false {
+		return false, fmt.Errorf("Unknown host: %s", r.Host)
+	}
+	r.Body = ioutil.NopCloser(bytes.NewBuffer(b))
+	return true, nil
 }
 
 // Validate is a handler wrapper that takes care of the signature validation of
 // incoming requests and rejects them if invalid or pass them on to your handler
 // otherwise.
-// To use just wrappe your handler with it:
+// To use just wrap your handler with it:
 // http.Handle("/path", signature.Validate(handleThing))
 func (v *Validator) Validate(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ts := r.Header.Get(tsHeader)
-		rs := r.Header.Get(sHeader)
-		if ts == "" || rs == "" {
-			v.Error(w, r)
-			return
-		}
-		b, _ := ioutil.ReadAll(r.Body)
-		if v.ValidTimestamp(ts) == false || v.ValidSignature(ts, r.URL.RawQuery, b, rs) == false {
-			v.Error(w, r)
+		if res, _ := v.ValidRequest(r); res == false {
+			http.Error(w, "", http.StatusUnauthorized)
 			return
 		}
 		h.ServeHTTP(w, r)

signature/signature_test.go

@@ -68,7 +68,7 @@ func TestCalculateSignature(t *testing.T) {
 		},
 	}
 	for i, tt := range cases {
-		v := NewValidator(tt.sKey, nil, nil, nil)
+		v := NewValidator(tt.sKey, nil)
 		s, err := v.CalculateSignature(tt.ts, tt.qp, []byte(tt.b))
 		if err != nil {
 			t.Errorf("Error calculating signature: %s, expected: %s", s, tt.es)
@@ -122,7 +122,7 @@ func TestValidTimestamp(t *testing.T) {
 	}
 
 	for i, tt := range cases {
-		v := NewValidator(testKey, tt.p, nil, nil)
+		v := NewValidator(testKey, tt.p)
 		r := v.ValidTimestamp(tt.ts)
 		if r != tt.e {
 			t.Errorf("Unexpected error validating ts: %s, test case: %d", tt.ts, i)
@@ -162,7 +162,7 @@ func TestValidSignature(t *testing.T) {
 	}
 
 	for i, tt := range cases {
-		v := NewValidator(testKey, nil, nil, nil)
+		v := NewValidator(testKey, nil)
 		r := v.ValidSignature(tt.ts, tt.qp, []byte(tt.b), tt.s)
 		if r != tt.e {
 			t.Errorf("Unexpected error validating signature: %s, test case: %d", tt.s, i)
@@ -229,7 +229,7 @@ func TestValidate(t *testing.T) {
 	}
 
 	for i, tt := range cases {
-		v := NewValidator(tt.k, nil, nil, nil)
+		v := NewValidator(tt.k, nil)
 		ts := httptest.NewServer(v.Validate(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusOK)
 		})))