@@ -108,18 +108,18 @@ func (v *Validator) ValidSignature(ts, rqp string, b []byte, rs string) bool {
108
108
// incoming requests
109
109
// To use just pass the request:
110
110
// signature.Validate(request)
111
- func (v * Validator ) ValidRequest (r * http.Request ) ( bool , error ) {
111
+ func (v * Validator ) ValidRequest (r * http.Request ) error {
112
112
ts := r .Header .Get (tsHeader )
113
113
rs := r .Header .Get (sHeader )
114
114
if ts == "" || rs == "" {
115
- return false , fmt .Errorf ("Unknown host: %s" , r .Host )
115
+ return fmt .Errorf ("Unknown host: %s" , r .Host )
116
116
}
117
117
b , _ := ioutil .ReadAll (r .Body )
118
118
if v .ValidTimestamp (ts ) == false || v .ValidSignature (ts , r .URL .RawQuery , b , rs ) == false {
119
- return false , fmt .Errorf ("Unknown host: %s" , r .Host )
119
+ return fmt .Errorf ("Unknown host: %s" , r .Host )
120
120
}
121
121
r .Body = ioutil .NopCloser (bytes .NewBuffer (b ))
122
- return true , nil
122
+ return nil
123
123
}
124
124
125
125
// Validate is a handler wrapper that takes care of the signature validation of
@@ -129,7 +129,7 @@ func (v *Validator) ValidRequest(r *http.Request) (bool, error) {
129
129
// http.Handle("/path", signature.Validate(handleThing))
130
130
func (v * Validator ) Validate (h http.Handler ) http.Handler {
131
131
return http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
132
- if res , _ := v .ValidRequest (r ); res == false {
132
+ if err := v .ValidRequest (r ); err != nil {
133
133
http .Error (w , "" , http .StatusUnauthorized )
134
134
return
135
135
}
0 commit comments