IQSS#9739 - URLValidator now allows two slashes in the path component…

… of the URL
Recherche-Data-Gouv · Aug 2, 2023 · 1004aa7 · 1004aa7
1 parent 54fd71e
commit 1004aa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/URLValidator.java b/src/main/java/edu/harvard/iq/dataverse/validation/URLValidator.java
@@ -42,7 +42,7 @@ public static boolean isURLValid(String value) {
      * @return true when valid (null is also valid) or false
      */
     public static boolean isURLValid(String value, String[] schemes) {
-        UrlValidator urlValidator = new UrlValidator(schemes);
+        UrlValidator urlValidator = new UrlValidator(schemes, UrlValidator.ALLOW_2_SLASHES);
         return value == null || urlValidator.isValid(value);
     }
 

diff --git a/src/test/java/edu/harvard/iq/dataverse/validation/URLValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/validation/URLValidatorTest.java
@@ -29,7 +29,9 @@ public static Stream<Arguments> stdUrlExamples() {
             Arguments.of(true, "http://foobar.com:9101"),
             Arguments.of(true, "ftp://user@foobar.com"),
             Arguments.of(false, "cnn.com"),
-            Arguments.of(false, "smb://user@foobar.com")
+            Arguments.of(false, "smb://user@foobar.com"),
+            // case of a real permalink that requires UrlValidator.ALLOW_2_SLASHES
+            Arguments.of(true, "https://archive.softwareheritage.org/swh:1:dir:561bfe6698ca9e58b552b4eb4e56132cac41c6f9;origin=https://github.com/gem-pasteur/macsyfinder;visit=swh:1:snp:1bde3cb370766b10132c4e004c7cb377979928d1;anchor=swh:1:rev:868637fce184865d8e0436338af66a2648e8f6e1")
         );
     }