Validate that document ids only contain text characters.

2 files changed, 21 insertions, 12 deletions

diff --git a/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java
index 38a643992f1..afb7efd788f 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/StringFieldValue.java
@@ -17,6 +17,7 @@ import com.yahoo.vespa.objects.Ids;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.OptionalInt;
 
 /**
  * A StringFieldValue is a wrapper class that holds a String in {@link com.yahoo.document.Document}s and
@@ -55,19 +56,16 @@ public class StringFieldValue extends FieldValue {
         setValue(value);
     }
 
-    private void setValue(String value) {
-        for (int i = 0; i < value.length(); i++) {
-            char theChar = value.charAt(i);
-            int codePoint = value.codePointAt(i);
-            if (Character.isHighSurrogate(theChar)) {
-                //skip one char ahead, since codePointAt() consumes one more char in this case
-                ++i;
-            }
-
-            if ( ! Text.isTextCharacter(codePoint))
-                throw new IllegalArgumentException("A string field value cannot contain code point 0x" + 
-                                                   Integer.toHexString(codePoint).toUpperCase());
+    private static void validateTextString(String value) {
+        OptionalInt illegalCodePoint = Text.validateTextString(value);
+        if (illegalCodePoint.isPresent()) {
+            throw new IllegalArgumentException("The string field value contains illegal code point 0x" +
+                    Integer.toHexString(illegalCodePoint.getAsInt()).toUpperCase());
         }
+    }
+
+    private void setValue(String value) {
+        validateTextString(value);
         this.value = value;
     }
 
diff --git a/document/src/main/java/com/yahoo/document/idstring/IdString.java b/document/src/main/java/com/yahoo/document/idstring/IdString.java
index 468dc9a38b1..27cdf8d603e 100644
--- a/document/src/main/java/com/yahoo/document/idstring/IdString.java
+++ b/document/src/main/java/com/yahoo/document/idstring/IdString.java
@@ -1,11 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.idstring;
 
+import com.yahoo.text.Text;
 import com.yahoo.text.Utf8String;
 
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.OptionalInt;
 
 /**
  * To be used with DocumentId constructor.
@@ -75,7 +77,16 @@ public abstract class IdString {
         }
     }
 
+    private static void validateTextString(String id) {
+        OptionalInt illegalCodePoint = Text.validateTextString(id);
+        if (illegalCodePoint.isPresent()) {
+            throw new IllegalArgumentException("Unparseable id '" + id + "': Contains illegal code point 0x" +
+                    Integer.toHexString(illegalCodePoint.getAsInt()).toUpperCase());
+        }
+    }
+
     public static IdString createIdString(String id) {
+        validateTextString(id);
         String namespace;
         long userId;
         String group;