fix: string escaping comparisson with filters (#3951)

kubeshop · Aug 5, 2024 · d3be6ca · d3be6ca
1 parent d4d4318
commit d3be6ca
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/server/expression/comparison.go b/server/expression/comparison.go
@@ -24,7 +24,7 @@ func compare(comparatorName string, leftValue, rightValue value.Value) error {
 		return compareArrayContains(leftValue, rightValue)
 	}
 
-	return comparatorFunction.Compare(rightValue.String(), leftValue.String())
+	return comparatorFunction.Compare(rightValue.UnescappedString(), leftValue.UnescappedString())
 }
 
 func compareArrayContains(array, expected value.Value) error {
@@ -34,7 +34,7 @@ func compareArrayContains(array, expected value.Value) error {
 	}
 
 	for _, item := range array.Items {
-		if err = equalComparator.Compare(item.Value, expected.String()); err == nil {
+		if err = equalComparator.Compare(item.Value, expected.UnescappedString()); err == nil {
 			return nil
 		}
 	}

diff --git a/server/expression/executor.go b/server/expression/executor.go
@@ -211,8 +211,7 @@ func (e Executor) resolveTerm(term *Term) (value.Value, error) {
 			strValue = fmt.Sprintf(term.Str.Text, stringArgs...)
 		}
 
-		str := value.NewFromString(strValue)
-		return value.NewFromString(str.UnescappedString()), nil
+		return value.NewFromString(strValue), nil
 	}
 
 	return value.Nil, fmt.Errorf("empty term")
@@ -243,8 +242,7 @@ func (e Executor) resolveAttribute(attribute *Attribute) (value.Value, error) {
 		return value.Nil, resolutionError(err)
 	}
 
-	str := value.NewFromString(attributeValue)
-	return value.NewFromString(str.UnescappedString()), nil
+	return value.NewFromString(attributeValue), nil
 }
 
 func (e Executor) resolveEnvironment(environment *Environment) (value.Value, error) {

diff --git a/server/expression/executor_test.go b/server/expression/executor_test.go
@@ -76,6 +76,11 @@ func TestBasicExpressionExecution(t *testing.T) {
 				},
 			},
 		},
+		{
+			Name:       "escaped_strings_in_json_must_work_with_json_path",
+			Query:      `'{ "message": "this should \"work\"", "anotherValue": 12 }' | json_path '$.message' = 'this should "work"'`,
+			ShouldPass: true,
+		},
 	}
 
 	executeTestCases(t, testCases)

diff --git a/server/expression/filters/json_path_test.go b/server/expression/filters/json_path_test.go
@@ -40,6 +40,12 @@ func TestJSONPath(t *testing.T) {
 			Query:          `$.array[*]..['id', 'name']`,
 			ExpectedOutput: `[38, "Tracetest", 39, "Kusk"]`,
 		},
+		{
+			Name:           "escaped_json_should_work",
+			JSON:           `{ "message": "\"rails g model Ping user:references location:point\", then migrate." }`,
+			Query:          `$.message`,
+			ExpectedOutput: `"rails g model Ping user:references location:point", then migrate.`,
+		},
 	}
 
 	for _, testCase := range testCases {