Merge pull request #7222 from IQSS/security18-hibernate-validator-vul…

…nerability Security18 hibernate validator vulnerability
IQSS · Aug 26, 2020 · 796e612 · 796e612
2 parents 1d13880 + 5e3b6ac
commit 796e612
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -294,9 +294,13 @@
             <version>1.7</version> <!-- Or 1.8-SNAPSHOT -->
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>5.0.3.Final</version>
+        </dependency>
+      <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.el</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>

diff --git a/src/test/java/edu/harvard/iq/dataverse/URLValidatorTest.java b/src/test/java/edu/harvard/iq/dataverse/URLValidatorTest.java
@@ -7,13 +7,17 @@
 
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorContextImpl;
 import org.hibernate.validator.internal.engine.path.PathImpl;
+import javax.validation.Validation;
+import javax.validation.ValidatorFactory;
 import org.junit.Test;
 
 /**
  *
  * @author skraffmi
  */
 public class URLValidatorTest {
+    ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory();
+
 
     @Test
     public void testIsURLValid() {
@@ -35,15 +39,15 @@ public void testIsValidWithUnspecifiedContext() {
     @Test
     public void testIsValidWithContextAndValidURL() {
         String value = "https://twitter.com/";
-        ConstraintValidatorContext context = new ConstraintValidatorContextImpl(null, PathImpl.createPathFromString(""), null);
+        ConstraintValidatorContext context = new ConstraintValidatorContextImpl(validatorFactory.getClockProvider(), PathImpl.createPathFromString(""),null, null);
 
         assertEquals(true, new URLValidator().isValid(value, context));
     }
 
     @Test
     public void testIsValidWithContextButInvalidURL() {
         String value = "cnn.com";
-        ConstraintValidatorContext context = new ConstraintValidatorContextImpl(null, PathImpl.createPathFromString(""), null);
+        ConstraintValidatorContext context = new ConstraintValidatorContextImpl(validatorFactory.getClockProvider(), PathImpl.createPathFromString(""),null, null);
 
         assertEquals(false, new URLValidator().isValid(value, context));
     }