GH-5215 Support apostrophe in local name for SPARQL 1.1 and Turtle/Tr…

…ig/etc. (#5216)
eclipse-rdf4j · Dec 9, 2024 · 13fb129 · 13fb129
1 parent 79e4307
commit 13fb129
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 89 deletions.
diff --git a/core/model/src/main/java/org/eclipse/rdf4j/model/util/URIUtil.java b/core/model/src/main/java/org/eclipse/rdf4j/model/util/URIUtil.java
@@ -228,6 +228,19 @@ public static boolean isValidLocalName(String name) {
 
 		for (int i = 1; i < name.length(); i++) {
 			if (!isNameChar(name.charAt(i))) {
+
+				// PLX
+				if (name.charAt(i) == '%') {
+					continue;
+				} else if (name.charAt(i) == '\\') {
+					if (i + 1 < name.length() && isPN_LOCAL_ESC(name.substring(i, i + 2))) {
+						i++;
+						continue;
+					} else {
+						return false;
+					}
+				}
+
 				return false;
 			}
 
@@ -341,7 +354,7 @@ private static boolean isNameStartChar(int codePoint) {
 	 * @return <code>true</code> if the supplied code point represents a valid name char, <code>false</code> otherwise.
 	 */
 	private static boolean isNameChar(int codePoint) {
-		return isPN_CHARS(codePoint) || codePoint == '.' || codePoint == ':' | codePoint == '\\' || codePoint == '%';
+		return isPN_CHARS(codePoint) || codePoint == '.' || codePoint == ':';
 	}
 
 	/**

diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/URIUtilTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/URIUtilTest.java
@@ -108,5 +108,6 @@ public void isValidLocalName() {
 		assertFalse(URIUtil.isValidLocalName("foo\tbar"));
 		assertFalse(URIUtil.isValidLocalName("foo\nbar"));
 		assertFalse(URIUtil.isValidLocalName("*foobar"));
+		assertTrue(URIUtil.isValidLocalName("fo\\'obar"));
 	}
 }
diff --git a/...rc/main/java/org/eclipse/rdf4j/query/parser/sparql/ast/SyntaxTreeBuilderTokenManager.java b/...rc/main/java/org/eclipse/rdf4j/query/parser/sparql/ast/SyntaxTreeBuilderTokenManager.java
@@ -2296,7 +2296,7 @@ private int jjMoveNfa_0_curCharLessThan64(int startsAt, int i, int kind) {
 				}
 				break;
 			case 82:
-				if ((0xa800ff7e00000000L & l) != 0L) {
+				if ((0xa800fffa00000000L & l) != 0L) {
 					jjCheckNAddStates(44, 47);
 				}
 				break;
@@ -2326,12 +2326,12 @@ private int jjMoveNfa_0_curCharLessThan64(int startsAt, int i, int kind) {
 				}
 				break;
 			case 88:
-				if ((0xa800ff7e00000000L & l) != 0L && kind > 146) {
+				if ((0xa800fffa00000000L & l) != 0L && kind > 146) {
 					kind = 146;
 				}
 				break;
 			case 90:
-				if ((0xa800ff7e00000000L & l) == 0L) {
+				if ((0xa800fffa00000000L & l) == 0L) {
 					break;
 				}
 				if (kind > 146) {

diff --git a/core/queryparser/sparql/src/main/java/org/eclipse/rdf4j/query/parser/sparql/ast/sparql.jjt b/core/queryparser/sparql/src/main/java/org/eclipse/rdf4j/query/parser/sparql/ast/sparql.jjt
@@ -345,7 +345,7 @@ TOKEN:
 |	<#PN_LOCAL: (<PN_CHARS_U> | ":" | <NUM> | <PLX> ) ( (<PN_CHARS> | "." | ":" | <PLX>)* ( <PN_CHARS> | ":" | <PLX>) )?>
 |	<#PLX: <PERCENT> | <PN_LOCAL_ESC>>
 |	<#PERCENT: "%" <HEX> <HEX>>
-|	<#PN_LOCAL_ESC: "\\" [ "_", "~", ".", "-", "!", "$", "&", "\"", "(", ")", "*", "+", ",", ";", "=", "/", "?", "#", "@", "%" ]>
+|	<#PN_LOCAL_ESC: "\\" [ "_", "~", ".", "-", "!", "$", "&", "'", "(", ")", "*", "+", ",", ";", "=", "/", "?", "#", "@", "%" ]>
 |	<#VARNAME: (<PN_CHARS_U> | <NUM> ) (<VAR_CHAR>)*>
 |	<TRIPLE_OPEN: "<<">
 |	<TRIPLE_CLOSE: ">>">

diff --git a/...ryparser/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/SPARQLParserTest.java b/...ryparser/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/SPARQLParserTest.java
@@ -976,6 +976,32 @@ public void testGroupByProjectionHandling_function() {
 		verifySerializable(parsedQuery.getTupleExpr());
 	}
 
+	@Test
+	public void testApostrophe() {
+		String query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" +
+				"select * where { \n" +
+				"  rdf:Test\\'s ?p1 ?o1\n" +
+				"}";
+
+		HashSet<Namespace> customPrefixes = new HashSet<>();
+		SPARQLParser parser = new SPARQLParser(customPrefixes);
+
+		parser.parseQuery(query, null);
+	}
+
+	@Test
+	public void testApostropheInsertData() {
+		String query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n" +
+				"INSERT DATA { \n" +
+				"  rdf:Test\\'s a <http://example.com/Test> .\n" +
+				"}";
+
+		HashSet<Namespace> customPrefixes = new HashSet<>();
+		SPARQLParser parser = new SPARQLParser(customPrefixes);
+
+		parser.parseUpdate(query, null);
+	}
+
 	private AggregateFunctionFactory buildDummyFactory() {
 		return new AggregateFunctionFactory() {
 			@Override

diff --git a/core/rio/trig/src/test/resources/testcases/trig/trig-syntax-minimal-whitespace-01.trig b/core/rio/trig/src/test/resources/testcases/trig/trig-syntax-minimal-whitespace-01.trig
@@ -19,3 +19,5 @@ d:<http://example/d/>.
 _:s{:s :p :o .:s :p"Alice".:s :p _:o.}
 :{: : :}{: : :}:{: : :}
 :{():()}{():[]}:{[]:[]}
+{b:a\'s a :Foo}
+
diff --git a/core/rio/turtle/src/main/java/org/eclipse/rdf4j/rio/turtle/TurtleUtil.java b/core/rio/turtle/src/main/java/org/eclipse/rdf4j/rio/turtle/TurtleUtil.java
@@ -13,6 +13,7 @@
 import java.util.Arrays;
 
 import org.eclipse.rdf4j.common.text.ASCIIUtil;
+import org.eclipse.rdf4j.model.util.URIUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -366,41 +367,7 @@ public static boolean isPN_LOCAL_ESC(String name) {
 	}
 
 	public static boolean isPN_LOCAL(String name) {
-		// Empty names are legal
-		if (name.isEmpty()) {
-			return true;
-		}
-
-		if (!isPN_CHARS_U(name.charAt(0)) && name.charAt(0) != ':' && !ASCIIUtil.isNumber(name.charAt(0))
-				&& !isPLX_START(name)) {
-			logger.debug("PN_LOCAL was not valid (start characters invalid) i=" + 0 + " nextchar="
-					+ name.charAt(0) + " name=" + name);
-			return false;
-		}
-
-		if (!isNameStartChar(name.charAt(0))) {
-			logger.debug("name was not valid (start character invalid) i=" + 0 + " nextchar=" + name.charAt(0)
-					+ " name=" + name);
-			return false;
-		}
-
-		for (int i = 1; i < name.length(); i++) {
-			if (!isNameChar(name.charAt(i))) {
-				logger.debug("name was not valid (intermediate character invalid) i=" + i + " nextchar="
-						+ name.charAt(i) + " name=" + name);
-				return false;
-			}
-
-			// Check if the percent encoding was less than two characters from the
-			// end of the prefix, in which case it is invalid
-			if (name.charAt(i) == '%' && (name.length() - i) < 3) {
-				logger.debug("name was not valid (short percent escape) i=" + i + " nextchar=" + name.charAt(i)
-						+ " name=" + name);
-				return false;
-			}
-		}
-
-		return true;
+		return URIUtil.isValidLocalName(name);
 	}
 
 	// public static boolean isLegalName(String name) {

diff --git a/core/rio/turtle/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleUtilTest.java b/core/rio/turtle/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleUtilTest.java
@@ -229,6 +229,7 @@ public final void testIsPN_LOCAL() {
 		assertFalse(TurtleUtil.isPN_LOCAL("foo\tbar"));
 		assertFalse(TurtleUtil.isPN_LOCAL("foo\nbar"));
 		assertFalse(TurtleUtil.isPN_LOCAL("*foobar"));
+		assertTrue(TurtleUtil.isPN_LOCAL("foo\\'bar"));
 	}
 
 	/**

diff --git a/core/rio/turtle/src/test/resources/test-newlines.ttl b/core/rio/turtle/src/test/resources/test-newlines.ttl
@@ -5,7 +5,8 @@
 ex:a a ex:Foo .
 ex:b a ex:Foo .
 ex:b ex:value '''^M'''.
-ex:c 
+ex:c
     :foo ex:Foo .
+rdf:Test\'s a ex:Foo .
 ex:a ex:value 1.0 .
 ex:a ex:value 3.0 .
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
diff --git a/e2e/package.json b/e2e/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@playwright/test": "^1.39.0",
-    "@types/node": "^20.8.7"
+    "@playwright/test": "^1.49.0",
+    "@types/node": "^22.10.1"
   }
 }
diff --git a/e2e/run.sh b/e2e/run.sh
@@ -12,9 +12,11 @@
 
 set -e
 
+npm install
+
 for APP_SERVER in tomcat jetty; do
   export APP_SERVER
- 
+
   cd ..
   cd docker
   ./run.sh
@@ -38,16 +40,16 @@ for APP_SERVER in tomcat jetty; do
 
   cd ..
   cd docker
-  ./shutdown.sh 
+  ./shutdown.sh
 
   # test for error code
   if [ $status_npx -ne 0 ] ; then
     echo "Error in E2E test for $APP_SERVER"
     exit $status_npx
   fi
- 
+
   echo "E2E test for $APP_SERVER OK"
- 
+
   # don't redo the whole build process just for making another docker image
   export SKIP_BUILD="skip"
 done