Apache Solr open-source search software
SOLR-16215 Escape query characters in Solr SQL Array UDF functions (#879)
Kiran Chitturicd2cf06b7aea
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex b470b0bc87d..50a3f29d049 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -821,6 +821,8 @@ Bug Fixes* SOLR-16199: Improve query syntax construction for SQL LIKE clause with phrases and wildcards(Kiran Chitturi, Aroop Ganguly, Amrit Sarkar via Timothy Potter)+* SOLR-16215: Escape query characters in Solr SQL Array UDF functions (Kiran Chitturi via Timothy Potter)+================== 8.11.1 ==================Bug Fixesdiff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.javaindex 8c913755c38..b5ba948c07c 100644--- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java+++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java@@ -169,7 +169,7 @@ class SolrFilter extends Filter implements SolrRel {if (valuesNode instanceof RexLiteral) {String literal = toSolrLiteral(fieldName, (RexLiteral) valuesNode);if (!StringUtils.isEmpty(literal)) {- return fieldName + ":\"" + literal + "\"";+ return fieldName + ":\"" + ClientUtils.escapeQueryChars(literal.trim()) + "\"";} else {return null;}@@ -179,7 +179,7 @@ class SolrFilter extends Filter implements SolrRel {valuesRexCall.getOperands().stream().map(op -> toSolrLiteral(fieldName, (RexLiteral) op)).filter(value -> !StringUtils.isEmpty(value))- .map(value -> "\"" + value.trim() + "\"")+ .map(value -> "\"" + ClientUtils.escapeQueryChars(value.trim()) + "\"").collect(Collectors.joining(" " + booleanOperator + " "));return fieldName + ":(" + valuesString + ")";}diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.javaindex eefc20f0309..b08cef64391 100644--- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java+++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java@@ -3342,7 +3342,9 @@ public class TestSQLHandler extends SolrCloudTestCase {"stringxmv","e","stringxmv",- "f",+ "\"f\"",+ "stringxmv",+ "g\"h","stringxmv","a","pdoublexmv",@@ -3373,6 +3375,19 @@ public class TestSQLHandler extends SolrCloudTestCase {expectResults("select id, stringxmv from $ALIAS WHERE array_contains_any(pdoublexmv, (1.5, 2.5))", 3);expectResults("select id, stringxmv from $ALIAS WHERE array_contains_any(longs, (1, 3))", 3);+ expectResults(+ "select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('\"a\"', '\"e\"'))",+ 0);+ expectResults(+ "select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('\"a\"'))", 0);+ expectResults(+ "select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('\"f\"'))", 1);+ expectResults(+ "select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('g\"h'))", 1);+ expectResults(+ "select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('a', 'e', '\"f\"'))",+ 3);+expectResults("select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('a'))", 2);expectResults("select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('a', 'b', 'c'))", 3);@@ -3380,7 +3395,5 @@ public class TestSQLHandler extends SolrCloudTestCase {"select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('a', 'c'))", 3);expectResults("select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('a', 'e'))", 3);- expectResults(- "select id, stringxmv from $ALIAS WHERE array_contains_any(stringxmv, ('a', 'e', 'f'))", 3);}}