Add payload tests and logic (needs fixing)

mw_url_rewrite.go

@@ -106,9 +106,12 @@ func urlRewrite(meta *apidef.URLRewriteMeta, r *http.Request) (string, error) {
 			// Check payload
 			if triggerOpts.Options.PayloadMatches.MatchPattern != "" {
 				if checkPayload(r, triggerOpts.Options.PayloadMatches, tn) {
+					println("HEY!!!")
 					setCount += 1
 					if checkAny {
+						println("CHECKANY!!!")
 						rewriteToPath = triggerOpts.RewriteTo
+						println(triggerOpts.RewriteTo)
 						break
 					}
 				}
@@ -471,12 +474,15 @@ func checkPayload(r *http.Request, options apidef.StringRegexMap, triggernum int
 	cp := copyRequest(r)
 	bodyBytes, _ := ioutil.ReadAll(cp.Body)
 
-	_, b := options.Check(string(bodyBytes))
-	if len(b) > 0 {
-		kn := fmt.Sprintf("trigger-%d-payload", triggernum)
-		contextData[kn] = string(b)
-		return true
+	triggered, b := options.Check(string(bodyBytes))
+	if triggered {
+		if len(b) > 0 {
+			kn := fmt.Sprintf("trigger-%d-payload", triggernum)
+			contextData[kn] = string(b)
+			println("TRUE!!!")
+			return true
+		}
 	}
-
+	
 	return false
 }

mw_url_rewrite_test.go

@@ -560,6 +560,52 @@ func TestRewriterTriggers(t *testing.T) {
 				r,
 			}
 		},
+		// func() TestDef {
+		// 	var jsonStr = []byte(`{"foo":"not-matched"}`)
+		// 	r, _ := http.NewRequest("POST", "/test/pl/rewrite", bytes.NewBuffer(jsonStr))
+
+		// 	hOpt := apidef.StringRegexMap{NotMatchPattern: "bar"}
+		// 	hOpt.Init()
+
+		// 	return TestDef{
+		// 		"Payload Single Negative",
+		// 		"/test/pl/rewrite", "/change/to/me/ignore",
+		// 		"/test/pl/rewrite", "/change/to/me/rewritten",
+		// 		[]apidef.RoutingTrigger{
+		// 			{
+		// 				On: apidef.Any,
+		// 				Options: apidef.RoutingTriggerOptions{
+		// 					PayloadMatches: hOpt,
+		// 				},
+		// 				RewriteTo: "/change/to/me/rewritten",
+		// 			},
+		// 		},
+		// 		r,
+		// 	}
+		// },
+		func() TestDef {
+			var jsonStr = []byte(`{"foo":"bar"}`)
+			r, _ := http.NewRequest("POST", "/test/pl/rewrite", bytes.NewBuffer(jsonStr))
+
+			hOpt := apidef.StringRegexMap{NotMatchPattern: "bar"}
+			hOpt.Init()
+
+			return TestDef{
+				"Payload Single Negative Fail",
+				"/test/pl/rewrite", "/change/to/me/ignore",
+				"/test/pl/rewrite", "/change/to/me/ignore",
+				[]apidef.RoutingTrigger{
+					{
+						On: apidef.Any,
+						Options: apidef.RoutingTriggerOptions{
+							PayloadMatches: hOpt,
+						},
+						RewriteTo: "/change/to/me/rewritten",
+					},
+				},
+				r,
+			}
+		},
 		func() TestDef {
 			r, _ := http.NewRequest("GET", "/test/foo/rewrite", nil)
 			hOpt := apidef.StringRegexMap{MatchPattern: "foo"}