Allow nulls in bean validation constraints

Author: aabashkin

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidCreditCardValidator.java

@@ -20,6 +20,9 @@ public void initialize(ValidCreditCard validCreditCard) {
 
     @Override
     public boolean isValid(String input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         boolean valid = ESAPI.validator().isValidCreditCard(context, input, allowNull, errorList);
 

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidDateValidator.java

@@ -27,6 +27,9 @@ public void initialize(ValidDate validDate) {
 
     @Override
     public boolean isValid(String input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
         Locale locale = new Locale(localeString);
         DateFormat dateFormat = DateFormat.getDateInstance(dateStyle, locale);
 

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidDirectoryPathValidator.java

@@ -24,6 +24,9 @@ public void initialize(ValidDirectoryPath validDirectoryPath) {
 
     @Override
     public boolean isValid(String input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         File parent = new File(parentString);
         boolean valid = ESAPI.validator().isValidDirectoryPath(context, input, parent, allowNull, errorList);

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidDoubleValidator.java

@@ -24,6 +24,9 @@ public void initialize(ValidDouble validDouble) {
 
     @Override
     public boolean isValid(String input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         boolean valid = ESAPI.validator().isValidDouble(context, input, minValue, maxValue, allowNull, errorList);
 

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidFileContentValidator.java

@@ -22,6 +22,9 @@ public void initialize(ValidFileContent validFileContent) {
 
     @Override
     public boolean isValid(byte[] input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         boolean valid = ESAPI.validator().isValidFileContent(context, input, maxBytes, allowNull, errorList);
 

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidFileNameValidator.java

@@ -26,6 +26,9 @@ public void initialize(ValidFileName validFileName) {
 
     @Override
     public boolean isValid(String input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         boolean valid;
         if(allowedExtensions.length == 0){

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidFileUploadValidator.java

@@ -30,6 +30,9 @@ public void initialize(ValidFileUpload validFileUpload) {
 
     @Override
     public boolean isValid(byte[] input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         File parent = new File(parentString);
         boolean valid = ESAPI.validator().isValidFileUpload(context, directoryPath, fileName, parent, input, maxBytes, allowNull, errorList);

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidHTTPRequestParameterSetValidator.java

@@ -17,16 +17,24 @@ public class ValidHTTPRequestParameterSetValidator implements ConstraintValidato
     private String context;
     private String[] requiredNames;
     private String[] optionalNames;
+    private boolean allowNull;
 
     @Override
     public void initialize(ValidHTTPRequestParameterSet validHTTPRequestParameters) {
         context = validHTTPRequestParameters.context();
         requiredNames = validHTTPRequestParameters.requiredNames();
         optionalNames = validHTTPRequestParameters.optionalNames();
+        allowNull = validHTTPRequestParameters.allowNull();
     }
 
     @Override
     public boolean isValid(HttpServletRequest input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
+        if (allowNull && input.getParameterMap().isEmpty()) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         Set<String> requiredNamesSet = new HashSet<>(Arrays.asList(requiredNames));
         Set<String> optionalNamesSet = new HashSet<>(Arrays.asList(optionalNames));

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidIntegerValidator.java

@@ -24,6 +24,9 @@ public void initialize(ValidInteger validInteger) {
 
     @Override
     public boolean isValid(String input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         boolean valid = ESAPI.validator().isValidInteger(context, input, minValue, maxValue, allowNull, errorList);
 

src/main/java/org/owasp/esapi/reference/validation/annotations/ValidListItemValidator.java

@@ -14,15 +14,23 @@ public class ValidListItemValidator implements ConstraintValidator<ValidListItem
 
     private String context;
     private String[] listArray;
+    private boolean allowNull;
 
     @Override
     public void initialize(ValidListItem validListItem) {
         context = validListItem.context();
         listArray = validListItem.list();
+        allowNull = validListItem.allowNull();
     }
 
     @Override
     public boolean isValid(String input, ConstraintValidatorContext constraintValidatorContext) {
+        if (input == null) {
+            return true;
+        }
+        if (allowNull && input.isEmpty()) {
+            return true;
+        }
         ValidationErrorList errorList = new ValidationErrorList();
         List<String> list = Arrays.asList(listArray);
         boolean valid = ESAPI.validator().isValidListItem(context, input, list, errorList);