mirror of
				https://github.com/adnanh/webhook.git
				synced 2025-10-25 02:30:58 +00:00 
			
		
		
		
	Fix #718
This commit is contained in:
		
							parent
							
								
									7bb680821d
								
							
						
					
					
						commit
						c2da943240
					
				
					 3 changed files with 21 additions and 20 deletions
				
			
		|  | @ -824,7 +824,7 @@ func (r Rules) Evaluate(req *Request) (bool, error) { | |||
| 		return r.Match.Evaluate(req) | ||||
| 	} | ||||
| 
 | ||||
| 	return false, nil | ||||
| 	return true, nil | ||||
| } | ||||
| 
 | ||||
| // AndRule will evaluate to true if and only if all of the ChildRules evaluate to true | ||||
|  |  | |||
|  | @ -351,6 +351,7 @@ func TestHookExtractCommandArguments(t *testing.T) { | |||
| // we test both cases where the name of the data is used as the name of the | ||||
| // env key & the case where the hook definition sets the env var name to a | ||||
| // fixed value using the envname construct like so:: | ||||
| // | ||||
| //	[ | ||||
| //	  { | ||||
| //	    "id": "push", | ||||
|  | @ -596,7 +597,7 @@ var andRuleTests = []struct { | |||
| 		[]byte{}, | ||||
| 		true, false, | ||||
| 	}, | ||||
| 	{"empty rule", AndRule{{}}, nil, nil, nil, nil, false, false}, | ||||
| 	{"empty rule", AndRule{{}}, nil, nil, nil, nil, true, false}, | ||||
| 	// failures | ||||
| 	{ | ||||
| 		"invalid rule", | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ import ( | |||
| 	"encoding/json" | ||||
| 	"flag" | ||||
| 	"fmt" | ||||
| 	"io/ioutil" | ||||
| 	"io" | ||||
| 	"log" | ||||
| 	"net" | ||||
| 	"net/http" | ||||
|  | @ -172,7 +172,7 @@ func main() { | |||
| 	} | ||||
| 
 | ||||
| 	if !*verbose { | ||||
| 		log.SetOutput(ioutil.Discard) | ||||
| 		log.SetOutput(io.Discard) | ||||
| 	} | ||||
| 
 | ||||
| 	// Create pidfile | ||||
|  | @ -379,7 +379,7 @@ func hookHandler(w http.ResponseWriter, r *http.Request) { | |||
| 	isMultipart := strings.HasPrefix(req.ContentType, "multipart/form-data;") | ||||
| 
 | ||||
| 	if !isMultipart { | ||||
| 		req.Body, err = ioutil.ReadAll(r.Body) | ||||
| 		req.Body, err = io.ReadAll(r.Body) | ||||
| 		if err != nil { | ||||
| 			log.Printf("[%s] error reading the request body: %+v\n", req.ID, err) | ||||
| 		} | ||||
|  | @ -608,7 +608,7 @@ func handleHook(h *hook.Hook, r *hook.Request) (string, error) { | |||
| 	} | ||||
| 
 | ||||
| 	for i := range files { | ||||
| 		tmpfile, err := ioutil.TempFile(h.CommandWorkingDirectory, files[i].EnvName) | ||||
| 		tmpfile, err := os.CreateTemp(h.CommandWorkingDirectory, files[i].EnvName) | ||||
| 		if err != nil { | ||||
| 			log.Printf("[%s] error creating temp file [%s]", r.ID, err) | ||||
| 			continue | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue