mirrors/webhook
1
0
Fork 0
mirror of https://github.com/adnanh/webhook.git synced 2025-05-12 08:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failing ip-whitelist tests

Browse source
This commit is contained in:
Cameron Moore 2019-09-13 13:09:44 -05:00
parent 42b72b028b
commit e47f9afb11
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
hook/hook.go
View file

@ -162,7 +162,6 @@ func CheckScalrSignature(headers map[string]interface{}, body []byte, signingKey
} }
// Example format: Fri 08 Sep 2017 11:24:32 UTC // Example format: Fri 08 Sep 2017 11:24:32 UTC
date, err := time.Parse("Mon 02 Jan 2006 15:04:05 MST", dateHeader) date, err := time.Parse("Mon 02 Jan 2006 15:04:05 MST", dateHeader)
//date, err := time.Parse(time.RFC1123, dateHeader)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -185,6 +184,7 @@ func CheckIPWhitelist(remoteAddr string, ipRange string) (bool, error) {
if i := strings.LastIndex(ip, ":"); i != -1 { if i := strings.LastIndex(ip, ":"); i != -1 {
ip = ip[:i] ip = ip[:i]
ip = strings.Trim(ip, " []")
} }
parsedIP := net.ParseIP(ip) parsedIP := net.ParseIP(ip)
@ -334,7 +334,6 @@ func (ha *Argument) Get(headers, query, payload *map[string]interface{}) (string
return ha.Name, true return ha.Name, true
case SourceEntirePayload: case SourceEntirePayload:
r, err := json.Marshal(payload) r, err := json.Marshal(payload)
if err != nil { if err != nil {
return "", false return "", false
} }
@ -342,7 +341,6 @@ func (ha *Argument) Get(headers, query, payload *map[string]interface{}) (string
return string(r), true return string(r), true
case SourceEntireHeaders: case SourceEntireHeaders:
r, err := json.Marshal(headers) r, err := json.Marshal(headers)
if err != nil { if err != nil {
return "", false return "", false
} }
@ -350,7 +348,6 @@ func (ha *Argument) Get(headers, query, payload *map[string]interface{}) (string
return string(r), true return string(r), true
case SourceEntireQuery: case SourceEntireQuery:
r, err := json.Marshal(query) r, err := json.Marshal(query)
if err != nil { if err != nil {
return "", false return "", false
} }
@ -440,7 +437,7 @@ type Hook struct {
// ParseJSONParameters decodes specified arguments to JSON objects and replaces the // ParseJSONParameters decodes specified arguments to JSON objects and replaces the
// string with the newly created object // string with the newly created object
func (h *Hook) ParseJSONParameters(headers, query, payload *map[string]interface{}) []error { func (h *Hook) ParseJSONParameters(headers, query, payload *map[string]interface{}) []error {
var errors = make([]error, 0) errors := make([]error, 0)
for i := range h.JSONStringParameters { for i := range h.JSONStringParameters {
if arg, ok := h.JSONStringParameters[i].Get(headers, query, payload); ok { if arg, ok := h.JSONStringParameters[i].Get(headers, query, payload); ok {
@ -450,7 +447,6 @@ func (h *Hook) ParseJSONParameters(headers, query, payload *map[string]interface
decoder.UseNumber() decoder.UseNumber()
err := decoder.Decode(&newArg) err := decoder.Decode(&newArg)
if err != nil { if err != nil {
errors = append(errors, &ParseError{err}) errors = append(errors, &ParseError{err})
continue continue
@ -493,8 +489,8 @@ func (h *Hook) ParseJSONParameters(headers, query, payload *map[string]interface
// ExtractCommandArguments creates a list of arguments, based on the // ExtractCommandArguments creates a list of arguments, based on the
// PassArgumentsToCommand property that is ready to be used with exec.Command() // PassArgumentsToCommand property that is ready to be used with exec.Command()
func (h *Hook) ExtractCommandArguments(headers, query, payload *map[string]interface{}) ([]string, []error) { func (h *Hook) ExtractCommandArguments(headers, query, payload *map[string]interface{}) ([]string, []error) {
var args = make([]string, 0) args := make([]string, 0)
var errors = make([]error, 0) errors := make([]error, 0)
args = append(args, h.ExecuteCommand) args = append(args, h.ExecuteCommand)
@ -518,8 +514,8 @@ func (h *Hook) ExtractCommandArguments(headers, query, payload *map[string]inter
// format, based on the PassEnvironmentToCommand property that is ready to be used // format, based on the PassEnvironmentToCommand property that is ready to be used
// with exec.Command(). // with exec.Command().
func (h *Hook) ExtractCommandArgumentsForEnv(headers, query, payload *map[string]interface{}) ([]string, []error) { func (h *Hook) ExtractCommandArgumentsForEnv(headers, query, payload *map[string]interface{}) ([]string, []error) {
var args = make([]string, 0) args := make([]string, 0)
var errors = make([]error, 0) errors := make([]error, 0)
for i := range h.PassEnvironmentToCommand { for i := range h.PassEnvironmentToCommand {
if arg, ok := h.PassEnvironmentToCommand[i].Get(headers, query, payload); ok { if arg, ok := h.PassEnvironmentToCommand[i].Get(headers, query, payload); ok {
if h.PassEnvironmentToCommand[i].EnvName != "" { if h.PassEnvironmentToCommand[i].EnvName != "" {
@ -552,8 +548,8 @@ type FileParameter struct {
// format, based on the PassFileToCommand property that is ready to be used // format, based on the PassFileToCommand property that is ready to be used
// with exec.Command(). // with exec.Command().
func (h *Hook) ExtractCommandArgumentsForFile(headers, query, payload *map[string]interface{}) ([]FileParameter, []error) { func (h *Hook) ExtractCommandArgumentsForFile(headers, query, payload *map[string]interface{}) ([]FileParameter, []error) {
var args = make([]FileParameter, 0) args := make([]FileParameter, 0)
var errors = make([]error, 0) errors := make([]error, 0)
for i := range h.PassFileToCommand { for i := range h.PassFileToCommand {
if arg, ok := h.PassFileToCommand[i].Get(headers, query, payload); ok { if arg, ok := h.PassFileToCommand[i].Get(headers, query, payload); ok {