Fix idn-hostname format and update json schema test suite (#1191)

Author: justin-tay

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

@@ -10,7 +10,7 @@
 public class IdnHostnameFormat implements Format {
     @Override
     public boolean matches(ExecutionContext executionContext, String value) {
-        if (null == value || value.isEmpty()) return true;
+        if (null == value) return true;
         return RFC5892.isValid(value);
     }
 

src/main/java/com/networknt/schema/utils/RFC5892.java

@@ -88,9 +88,22 @@ private static boolean testAllowedCharacter(String s, int i) {
             && !isContextJ(c)   && !isContextO(c);  // RFC 5891 4.2.3.3.  Contextual Rules
     }
 
+    /**
+     * Whenever dots are used as label separators, the following characters MUST be
+     * recognized as dots: U+002E (full stop), U+3002 (ideographic full stop),
+     * U+FF0E (fullwidth full stop), U+FF61 (halfwidth ideographic full stop)
+     */
+    private static String LABEL_SEPARATOR_REGEX = "[\\.\\u3002\\uff0e\\uff61]";
+
     public static boolean isValid(String value) {
-        // RFC 5892 calls each segment in a host name a label. They are separated by '.'.
-        String[] labels = value.split("\\.");
+        if ("".equals(value)) {
+            return false; // empty string should fail
+        }
+        if (value.length() == 1 && value.matches(LABEL_SEPARATOR_REGEX)) {
+            return false; // single label separator should fail
+        }
+        // RFC 5892 calls each segment in a host name a label. They are separated by all the recognized label separators.
+        String[] labels = value.split(LABEL_SEPARATOR_REGEX);
         for (String label : labels) {
             if (label.isEmpty()) continue; // A DNS entry may contain a trailing '.'.
 

src/test/java/com/networknt/schema/UriMappingTest.java

@@ -43,7 +43,7 @@ class UriMappingTest {
      */
     @Test
     void testBuilderUriMappingUri() throws IOException {
-        URL mappings = UriMappingTest.class.getResource("/draft4/extra/uri_mapping/uri-mapping.json");
+        URL mappings = UriMappingTest.class.getResource("/uri_mapping/uri-mapping.json");
         JsonMetaSchema draftV4 = JsonMetaSchema.getV4();
         Builder builder = JsonSchemaFactory.builder()
                 .defaultMetaSchemaIri(draftV4.getIri())
@@ -81,7 +81,7 @@ void testBuilderExampleMappings() throws IOException {
         } catch (Exception ex) {
             fail("Unexpected exception thrown", ex);
         }
-        URL mappings = UriMappingTest.class.getResource("/draft4/extra/uri_mapping/invalid-schema-uri.json");
+        URL mappings = UriMappingTest.class.getResource("/uri_mapping/invalid-schema-uri.json");
         JsonMetaSchema draftV4 = JsonMetaSchema.getV4();
         Builder builder = JsonSchemaFactory.builder()
                 .defaultMetaSchemaIri(draftV4.getIri())
@@ -100,7 +100,7 @@ void testBuilderExampleMappings() throws IOException {
      */
     @Test
     void testValidatorConfigUriMappingUri() throws IOException {
-        URL mappings = UriMappingTest.class.getResource("/draft4/extra/uri_mapping/uri-mapping.json");
+        URL mappings = UriMappingTest.class.getResource("/uri_mapping/uri-mapping.json");
         JsonSchemaFactory instance = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4))
                 .schemaMappers(schemaMappers -> schemaMappers.add(getUriMappingsFromUrl(mappings))).build();
         JsonSchema schema = instance.getSchema(SchemaLocation.of(
@@ -118,7 +118,7 @@ void testValidatorConfigUriMappingUri() throws IOException {
      */
     @Test
     void testValidatorConfigExampleMappings() throws IOException {
-        URL mappings = UriMappingTest.class.getResource("/draft4/extra/uri_mapping/invalid-schema-uri.json");
+        URL mappings = UriMappingTest.class.getResource("/uri_mapping/invalid-schema-uri.json");
         JsonSchemaFactory instance = JsonSchemaFactory
                 .builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4)).build();
         SchemaValidatorsConfig config = SchemaValidatorsConfig.builder().build();
@@ -145,11 +145,11 @@ void testValidatorConfigExampleMappings() throws IOException {
 
     @Test
     void testMappingsForRef() throws IOException {
-        URL mappings = UriMappingTest.class.getResource("/draft4/extra/uri_mapping/schema-with-ref-mapping.json");
+        URL mappings = UriMappingTest.class.getResource("/uri_mapping/schema-with-ref-mapping.json");
         JsonSchemaFactory instance = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4))
                 .schemaMappers(schemaMappers -> schemaMappers.add(getUriMappingsFromUrl(mappings))).build();
         SchemaValidatorsConfig config = SchemaValidatorsConfig.builder().build();
-        JsonSchema schema = instance.getSchema(SchemaLocation.of("resource:draft4/extra/uri_mapping/schema-with-ref.json"),
+        JsonSchema schema = instance.getSchema(SchemaLocation.of("resource:uri_mapping/schema-with-ref.json"),
                 config);
         assertEquals(0, schema.validate(mapper.readTree("[]")).size());
     }

src/test/java/com/networknt/schema/suite/TestCase.java

@@ -1,6 +1,7 @@
 package com.networknt.schema.suite;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -12,6 +13,7 @@
  * An individual test case, containing multiple testSpecs of a single schema's
  * behavior
  */
+@JsonIgnoreProperties(ignoreUnknown = true) // ignore specification in additionalProperties.json
 public class TestCase {
 
     /**

src/test/resources/draft4/extra/uri_mapping/example-schema.json renamed to src/test/resources/uri_mapping/example-schema.json

@@ -5,11 +5,11 @@
   },
   {
     "publicURL": "http://example.com/invalid/schema/url",
-    "localURL": "resource:/draft4/extra/uri_mapping/example-schema.json"
+    "localURL": "resource:/uri_mapping/example-schema.json"
   },
   {
     "publicURL": "https://example.com/invalid/schema/url",
-    "localURL": "resource:/draft4/extra/uri_mapping/example-schema.json"
+    "localURL": "resource:/uri_mapping/example-schema.json"
   }
 
 ]

src/test/resources/draft4/extra/uri_mapping/invalid-schema-uri.json renamed to src/test/resources/uri_mapping/invalid-schema-uri.json

@@ -5,6 +5,6 @@
   },
   {
     "publicURL": "http://example.com/invalid/schema/url",
-    "localURL": "resource:/draft4/extra/uri_mapping/example-schema.json"
+    "localURL": "resource:/uri_mapping/example-schema.json"
   }
 ]

src/test/resources/draft4/extra/uri_mapping/schema-with-ref-mapping.json renamed to src/test/resources/uri_mapping/schema-with-ref-mapping.json

@@ -5,6 +5,6 @@
   },
   {
     "publicURL": "https://raw.githubusercontent.com/networknt/json-schema-validator/master/src/test/resources/draft4/extra/uri_mapping/uri-mapping.schema.json",
-    "localURL": "resource:/draft4/extra/uri_mapping/uri-mapping.schema.json"
+    "localURL": "resource:/uri_mapping/uri-mapping.schema.json"
   }
 ]