fix whenTrue/False checking in payload

SAP · Apr 2, 2024 · 9e9ccb8 · 9e9ccb8
1 parent 43c0792
commit 9e9ccb8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/proxy/wasm/cloud-active-defense.wasm b/proxy/wasm/cloud-active-defense.wasm
diff --git a/proxy/wasm/config_parser/validator.go b/proxy/wasm/config_parser/validator.go
@@ -166,8 +166,8 @@ func (v *validator) validateWhenTrue(obj ConditionType) {
   if obj == EmptyCondition() {
     return
   }
-	if breaksRequired(obj.Key) {
-		v.addError(v.currentPlace+".key", "is required and can not be empty")
+	if breaksRequired(obj.Key) && (obj.In == "header" || obj.In == "cookie" || obj.In == "getParam" || obj.In == "postParam") {
+		v.addError(v.currentPlace+".key", "is required and can not be empty for header, cookie, getParam and postParams")
 	}
 	if breaksRequired(obj.Value) {
 		v.addError(v.currentPlace+".value", "is required and can not be empty")
@@ -185,8 +185,8 @@ func (v *validator) validateWhenFalse(obj ConditionType) {
   if obj == EmptyCondition() {
     return
   }
-	if breaksRequired(obj.Key) {
-		v.addError(v.currentPlace+".key", "is required and can not be empty")
+	if breaksRequired(obj.Key) && (obj.In == "header" || obj.In == "cookie" || obj.In == "getParam" || obj.In == "postParam") {
+		v.addError(v.currentPlace+".key", "is required and can not be empty for header, cookie, getParam and postParams")
 	}
 	if breaksRequired(obj.Value) {
 		v.addError(v.currentPlace+".value", "is required and can not be empty")

diff --git a/proxy/wasm/inject/body.go b/proxy/wasm/inject/body.go
@@ -138,7 +138,7 @@ func (i *injecterBody) checkConditionsResponse() (error, bool) {
   }
 
   for _, condition := range i.curFilter.Inject.WhenTrue {
-    err, applies := WhenTrue(i.request, &condition) 
+    err, applies := WhenTrue(&shared.HttpRequest{Body: &i.responseBody, Headers: i.request.Headers, Cookies: i.request.Cookies}, &condition) 
     if err != nil {
       return err, false
     }
@@ -148,7 +148,7 @@ func (i *injecterBody) checkConditionsResponse() (error, bool) {
     }
   }
   for _, condition := range i.curFilter.Inject.WhenFalse {
-    err, applies := WhenFalse(i.request, &condition) 
+    err, applies := WhenFalse(&shared.HttpRequest{Body: &i.responseBody, Headers: i.request.Headers, Cookies: i.request.Cookies}, &condition) 
     if err != nil {
       return err, false
     }

diff --git a/proxy/wasm/inject/conditions.go b/proxy/wasm/inject/conditions.go
@@ -146,7 +146,12 @@ func checkBody(request *shared.HttpRequest, condition *config_parser.ConditionTy
   if request.Body == nil {
     return fmt.Errorf("can not check body conditions in header injection"), false
   }
-  value := condition.Key+"="+condition.Value
+  value := ""
+  if condition.Key != "" {
+    value = condition.Key+"="+condition.Value
+  } else {
+    value = condition.Value
+  }
   if value == "" {
     return nil, false
   }