Fix uri and uri-reference incorrect validation failure (#1052)

Author: justin-tay

src/main/java/com/networknt/schema/format/UriFormat.java

@@ -13,7 +13,7 @@ protected boolean validate(URI uri) {
             // Java URI accepts non ASCII characters and this is not a valid in RFC3986
             result = uri.toString().codePoints().allMatch(ch -> ch < 0x7F);
             if (result) {
-                String query = uri.getQuery();
+                String query = uri.getRawQuery();
                 if (query != null) {
                     // [ and ] must be percent encoded
                     if (query.indexOf('[') != -1 || query.indexOf(']') != -1) {

src/main/java/com/networknt/schema/format/UriReferenceFormat.java

@@ -11,7 +11,7 @@ protected boolean validate(URI uri) {
         // Java URI accepts non ASCII characters and this is not a valid in RFC3986
         boolean result = uri.toString().codePoints().allMatch(ch -> ch < 0x7F);
         if (result) {
-            String query = uri.getQuery();
+            String query = uri.getRawQuery();
             if (query != null) {
                 // [ and ] must be percent encoded
                 if (query.indexOf('[') != -1 || query.indexOf(']') != -1) {

src/test/java/com/networknt/schema/format/UriFormatTest.java

@@ -56,7 +56,21 @@ void queryWithBracketsShouldFail() {
                 InputFormat.JSON);
         assertFalse(messages.isEmpty());
     }
-    
+
+    @Test
+    void queryWithEncodedBracketsShouldPass() {
+        String schemaData = "{\r\n"
+                + "  \"format\": \"uri\"\r\n"
+                + "}";
+
+        SchemaValidatorsConfig config = new SchemaValidatorsConfig();
+        config.setFormatAssertionsEnabled(true);
+        JsonSchema schema = JsonSchemaFactory.getInstance(VersionFlag.V202012).getSchema(schemaData, config);
+        Set<ValidationMessage> messages = schema.validate("\"https://test.com/assets/product.pdf?filter%5Btest%5D=1\"",
+                InputFormat.JSON);
+        assertTrue(messages.isEmpty());
+    }
+
     @Test
     void iriShouldFail() {
         String schemaData = "{\r\n"
@@ -70,5 +84,4 @@ void iriShouldFail() {
                 InputFormat.JSON);
         assertFalse(messages.isEmpty());
     }
-
 }

src/test/java/com/networknt/schema/format/UriReferenceFormatTest.java

@@ -57,6 +57,20 @@ void queryWithBracketsShouldFail() {
         assertFalse(messages.isEmpty());
     }
 
+    @Test
+    void queryWithEncodedBracketsShouldPass() {
+        String schemaData = "{\r\n"
+                + "  \"format\": \"uri-reference\"\r\n"
+                + "}";
+
+        SchemaValidatorsConfig config = new SchemaValidatorsConfig();
+        config.setFormatAssertionsEnabled(true);
+        JsonSchema schema = JsonSchemaFactory.getInstance(VersionFlag.V202012).getSchema(schemaData, config);
+        Set<ValidationMessage> messages = schema.validate("\"https://test.com/assets/product.pdf?filter%5Btest%5D=1\"",
+                InputFormat.JSON);
+        assertTrue(messages.isEmpty());
+    }
+
     @Test
     void iriShouldFail() {
         String schemaData = "{\r\n"