tweaking URIFormatValidator to forbid protocol-relative URIs in DRAFT_7 mode

Author: erosb

core/src/main/java/org/everit/json/schema/internal/URIFormatValidator.java

@@ -11,11 +11,21 @@
  */
 public class URIFormatValidator implements FormatValidator {
 
+    private final boolean protocolRelativeURIPermitted;
+
+    public URIFormatValidator() {
+        this(true);
+    }
+
+    public URIFormatValidator(boolean protocolRelativeURIPermitted) {
+        this.protocolRelativeURIPermitted = protocolRelativeURIPermitted;
+    }
+
     @Override
     public Optional<String> validate(final String subject) {
         try {
             URI uri = new URI(subject);
-            if (hasProtocol(uri) || isProtocolRelativeURI(subject)) {
+            if (hasProtocol(uri) || (protocolRelativeURIPermitted && isProtocolRelativeURI(subject))) {
                 return Optional.empty();
             } else {
                 throw new URISyntaxException(subject, "no protocol and not protocol-relative");

core/src/main/java/org/everit/json/schema/loader/SpecificationVersion.java

@@ -158,6 +158,7 @@ private static final List<String> keywords(String... keywords) {
     static {
         Map<String, FormatValidator> formatValidators = new HashMap<>(V6_VALIDATORS);
         formatValidators.put("date", new DateFormatValidator());
+        formatValidators.put("uri", new URIFormatValidator(false));
         formatValidators.put("time", new TimeFormatValidator());
         formatValidators.put("regex", new RegexFormatValidator());
         formatValidators.put("relative-json-pointer", new RelativeJsonPointerFormatValidator());

core/src/test/java/org/everit/json/schema/internal/DefaultFormatValidatorTest.java

@@ -274,6 +274,12 @@ public void relativeURIRefFailsInDraft6() {
     public void relativeURIRefSucceedsInDraft4() {
         assertSuccess("abc", new URIV4FormatValidator());
     }
+
+    @Test
+    public void protocolRelativeURIsCanBeDisabled() {
+        assertFailure("//example.com", new URIFormatValidator(false), "[//example.com] is not a valid URI");
+    }
+    
     //
     //    @Test
     //    public void protocolRelativeUriSuccess() {
@@ -299,4 +305,5 @@ public void regexSuccess() {
     public void regexFailure() {
         assertFailure("^(abc]", new RegexFormatValidator(), "[^(abc]] is not a valid regular expression");
     }
+
 }