CVE-2026-22744

@@ -22,6 +22,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import redis.clients.jedis.search.RediSearchUtil;
+
 import org.springframework.ai.vectorstore.filter.Filter.Expression;
 import org.springframework.ai.vectorstore.filter.Filter.ExpressionType;
 import org.springframework.ai.vectorstore.filter.Filter.Group;
@@ -117,12 +119,12 @@ private void doField(Expression expression, StringBuilder context) {
 				break;
 			case TAG:
 				context.append("{");
-				context.append(stringValue(expression, value));
+				context.append(tagStringValue(expression, value));
 				context.append("}");
 				break;
 			case TEXT:
 				context.append("(");
-				context.append(stringValue(expression, value));
+				context.append(textStringValue(expression, value));
 				context.append(")");
 				break;
 			default:
@@ -131,12 +133,41 @@ private void doField(Expression expression, StringBuilder context) {
 		}
 	}
 
-	private Object stringValue(Expression expression, Value value) {
+	private String tagStringValue(Expression expression, Value value) {
+		String delimiter = tagValueDelimiter(expression);
+		if (value.value() instanceof List<?> list) {
+			return list.stream().map(String::valueOf).map(this::escapeTagValue).collect(Collectors.joining(delimiter));
+		}
+		return escapeTagValue(String.valueOf(value.value()));
+	}
+
+	private String textStringValue(Expression expression, Value value) {
 		String delimiter = tagValueDelimiter(expression);
 		if (value.value() instanceof List<?> list) {
-			return String.join(delimiter, list.stream().map(String::valueOf).toList());
+			return list.stream()
+				.map(String::valueOf)
+				.map(RediSearchUtil::escapeQuery)
+				.collect(Collectors.joining(delimiter));
+		}
+		return RediSearchUtil.escapeQuery(String.valueOf(value.value()));
+	}
+
+	/**
+	 * Escapes characters that have special meaning inside a RediSearch TAG query clause
+	 * ({@code @field:\{value\}}). The following characters are escaped with a backslash:
+	 * {@code $}, {@code \}, {@code |}, {@code {}, {@code }}, {@code (}, {@code )},
+	 * {@code [}, {@code ]}, {@code -}, and {@code '}.
+	 */
+	private String escapeTagValue(String value) {
+		StringBuilder sb = new StringBuilder(value.length());
+		for (int i = 0; i < value.length(); i++) {
+			char c = value.charAt(i);
+			switch (c) {
+				case '\\', '$', '|', '{', '}', '(', ')', '[', ']', '-', '\'' -> sb.append('\\').append(c);
+				default -> sb.append(c);
+			}
 		}
-		return value.value();
+		return sb.toString();
 	}
 
 	private String tagValueDelimiter(Expression expression) {

@@ -131,12 +131,52 @@ void testComplexIdentifiers() {
 
 	@Test
 	void testSpecialCharactersInValues() {
-		// Test values with Redis special characters that need escaping
 		String vectorExpr = converter(RedisVectorStore.MetadataField.tag("description"))
 			.convertExpression(new Expression(EQ, new Key("description"), new Value("test@value{with}special|chars")));
 
-		// Should properly escape special Redis characters
-		assertThat(vectorExpr).isEqualTo("@description:{test@value{with}special|chars}");
+		assertThat(vectorExpr).isEqualTo("@description:{test@value\\{with\\}special\\|chars}");
+	}
+
+	@Test
+	void testTagValueWithInjectionPayload() {
+		String vectorExpr = converter(RedisVectorStore.MetadataField.tag("category")).convertExpression(
+				new Expression(EQ, new Key("category"), new Value("science} | @access_level:{restricted")));
+
+		assertThat(vectorExpr).isEqualTo("@category:{science\\} \\| @access_level:\\{restricted}");
+		assertThat(vectorExpr).doesNotContain("} | @");
+	}
+
+	@Test
+	void testTagValueInListWithSpecialChars() {
+		String vectorExpr = converter(RedisVectorStore.MetadataField.tag("category")).convertExpression(new Expression(
+				IN, new Key("category"), new Value(List.of("science} | @access_level:{restricted", "normal"))));
+
+		assertThat(vectorExpr).isEqualTo("@category:{science\\} \\| @access_level:\\{restricted | normal}");
+		assertThat(vectorExpr).doesNotContain("} | @");
+	}
+
+	@Test
+	void testTagValueWithPipe() {
+		String vectorExpr = converter(RedisVectorStore.MetadataField.tag("status"))
+			.convertExpression(new Expression(EQ, new Key("status"), new Value("active|inactive")));
+
+		assertThat(vectorExpr).isEqualTo("@status:{active\\|inactive}");
+	}
+
+	@Test
+	void testTagValueWithHyphen() {
+		String vectorExpr = converter(RedisVectorStore.MetadataField.tag("type"))
+			.convertExpression(new Expression(EQ, new Key("type"), new Value("non-fiction")));
+
+		assertThat(vectorExpr).isEqualTo("@type:{non\\-fiction}");
+	}
+
+	@Test
+	void testTextValueWithSpecialChars() {
+		String vectorExpr = converter(RedisVectorStore.MetadataField.text("description"))
+			.convertExpression(new Expression(EQ, new Key("description"), new Value("hello@world.com")));
+
+		assertThat(vectorExpr).isEqualTo("@description:(hello\\@world\\.com)");
 	}
 
 	@Test