diff --git a/src/main/java/com/gepardec/wdg/application/validation/Base64LengthValidator.java b/src/main/java/com/gepardec/wdg/application/validation/Base64LengthValidator.java index 74985bf..a5bb2fa 100644 --- a/src/main/java/com/gepardec/wdg/application/validation/Base64LengthValidator.java +++ b/src/main/java/com/gepardec/wdg/application/validation/Base64LengthValidator.java @@ -27,7 +27,9 @@ public boolean isValid(String value, ConstraintValidatorContext context) { final long length = value.length(); final long padding = calculatePadding(value); final long size = (long) ((double) length * 0.75) - padding; + //Ändern des <= auf ein >= um so einen Test auszulösen der fehlschlägt. return (size >= minLength && size <= maxLength); + //return (size >= minLength && size >= maxLength); } private long calculatePadding(String value) { diff --git a/src/main/java/com/gepardec/wdg/application/validation/Base64Validator.java b/src/main/java/com/gepardec/wdg/application/validation/Base64Validator.java index 714dce9..0d6da64 100644 --- a/src/main/java/com/gepardec/wdg/application/validation/Base64Validator.java +++ b/src/main/java/com/gepardec/wdg/application/validation/Base64Validator.java @@ -12,7 +12,7 @@ public class Base64Validator implements ConstraintValidator { /** * Base64 validation regular expression. */ - private static final Pattern BASE64_PATTERN = Pattern.compile("^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$"); + private static final Pattern BASE64_PATTERN = Pattern.compile("^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Ga-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$"); @Override public boolean isValid(String value, ConstraintValidatorContext context) { diff --git a/src/test/java/com/gepardec/wdg/application/validation/Base64ValidatorTest.java b/src/test/java/com/gepardec/wdg/application/validation/Base64ValidatorTest.java index 53d466f..76ac2f1 100644 --- a/src/test/java/com/gepardec/wdg/application/validation/Base64ValidatorTest.java +++ b/src/test/java/com/gepardec/wdg/application/validation/Base64ValidatorTest.java @@ -37,7 +37,7 @@ void isValid_withPadding0_thenTrue() { final String base64 = createBase64StringForPadding(0); Assertions.assertTrue(validator.isValid(base64, null)); } - + //@WINStage2: Test isValid_withPadding1_thenTruealse() will fail because of a broken CodePart @Test void isValid_withPadding1_thenTruealse() { final String base64 = createBase64StringForPadding(1);