mirrors/webhook
1
0
Fork 0
mirror of https://github.com/adnanh/webhook.git synced 2025-05-15 10:04:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: simplify implementation

Browse source
This commit is contained in:
Wyatt Johnson 2019-11-15 15:52:03 -07:00 • committed by Wyatt Johnson
parent a818e29113
commit 2088f61cba
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hook/hook.go
View file

@ -17,7 +17,6 @@ import (
"math" "math"
"net" "net"
"net/textproto" "net/textproto"
"net/url"
"os" "os"
"reflect" "reflect"
"regexp" "regexp"
@ -102,36 +101,29 @@ func (e *ParseError) Error() string {
} }
// ExtractCommaSeperatedValues will extract the values matching the key. // ExtractCommaSeperatedValues will extract the values matching the key.
func ExtractCommaSeperatedValues(source, key string) []string { func ExtractCommaSeperatedValues(source, prefix string) []string {
parts := strings.Split(source, ",") parts := strings.Split(source, ",")
values := make([]string, 0) values := make([]string, 0)
for _, part := range parts { for _, part := range parts {
m, err := url.ParseQuery(part) if strings.HasPrefix(part, prefix) {
if err != nil { values = append(values, strings.TrimPrefix(part, prefix))
continue
}
// Try to get the value.
value := m.Get(key)
if value != "" {
values = append(values, value)
} }
} }
return values return values
} }
func ExtractSignatures(signature, key string) []string { func ExtractSignatures(signature, prefix string) []string {
// If there are multiple possible matches, let the comma seperated extractor // If there are multiple possible matches, let the comma seperated extractor
// do it's work. // do it's work.
if strings.Contains(signature, ",") { if strings.Contains(signature, ",") {
return ExtractCommaSeperatedValues(signature, key) return ExtractCommaSeperatedValues(signature, prefix)
} }
// There were no commas, so just trim the prefix (if it even exists) and // There were no commas, so just trim the prefix (if it even exists) and
// pass it back. // pass it back.
return []string{ return []string{
strings.TrimPrefix(signature, key+"="), strings.TrimPrefix(signature, prefix),
} }
} }
@ -141,7 +133,7 @@ func CheckPayloadSignature(payload []byte, secret string, signature string) (str
return "", errors.New("signature validation secret can not be empty") return "", errors.New("signature validation secret can not be empty")
} }
signatures := ExtractSignatures(signature, "sha1") signatures := ExtractSignatures(signature, "sha1=")
mac := hmac.New(sha1.New, []byte(secret)) mac := hmac.New(sha1.New, []byte(secret))
_, err := mac.Write(payload) _, err := mac.Write(payload)
@ -167,7 +159,7 @@ func CheckPayloadSignature256(payload []byte, secret string, signature string) (
return "", errors.New("signature validation secret can not be empty") return "", errors.New("signature validation secret can not be empty")
} }
signatures := ExtractSignatures(signature, "sha256") signatures := ExtractSignatures(signature, "sha256=")
mac := hmac.New(sha256.New, []byte(secret)) mac := hmac.New(sha256.New, []byte(secret))
_, err := mac.Write(payload) _, err := mac.Write(payload)