Skip to content

trim input in IBANValidator.validate #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sahvx655-wq wants to merge 1 commit into from
+17 −5
Closed

trim input in IBANValidator.validate #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/main/java/org/apache/commons/validator/routines/IBANValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,16 +417,17 @@ public Validator setValidator(final Validator validator) {
* @since 1.10.0
*/
public IBANValidatorStatus validate(final String code) {
final Validator formatValidator = getValidator(code);
final String iban = code == null ? null : code.trim();
final Validator formatValidator = getValidator(iban);
if (formatValidator == null) {
return IBANValidatorStatus.UNKNOWN_COUNTRY;
}
if (code.length() != formatValidator.ibanLength) {
if (iban.length() != formatValidator.ibanLength) {
return IBANValidatorStatus.INVALID_LENGTH;
}
if (!formatValidator.regexValidator.isValid(code)) {
if (!formatValidator.regexValidator.isValid(iban)) {
return IBANValidatorStatus.INVALID_PATTERN;
}
return IBANCheckDigit.IBAN_CHECK_DIGIT.isValid(code) ? IBANValidatorStatus.VALID : IBANValidatorStatus.INVALID_CHECKSUM;
return IBANCheckDigit.IBAN_CHECK_DIGIT.isValid(iban) ? IBANValidatorStatus.VALID : IBANValidatorStatus.INVALID_CHECKSUM;
}
}
13 changes: 12 additions & 1 deletion src/test/java/org/apache/commons/validator/routines/IBANValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,10 @@ public static Stream<Arguments> validateIbanStatuses() {
Arguments.of("AD0101", IBANValidatorStatus.INVALID_LENGTH),
Arguments.of("AD12XX012030200359100100", IBANValidatorStatus.INVALID_PATTERN),
Arguments.of("AD9900012030200359100100", IBANValidatorStatus.INVALID_CHECKSUM),
Arguments.of("AD1200012030200359100100", IBANValidatorStatus.VALID)
Arguments.of("AD1200012030200359100100", IBANValidatorStatus.VALID),
Arguments.of(" AD1200012030200359100100", IBANValidatorStatus.VALID),
Arguments.of("AD1200012030200359100100 ", IBANValidatorStatus.VALID),
Arguments.of(" AD1200012030200359100100\n", IBANValidatorStatus.VALID)
);
}

Expand Down Expand Up @@ -539,6 +542,14 @@ void testValidateIbanStatuses(final String iban, final IBANValidatorStatus expec
assertEquals(expectedStatus, IBANValidator.getInstance().validate(iban));
}

@Test
void testValidateSurroundingWhitespace() {
final String iban = "DE89370400440532013000";
assertEquals(IBANValidatorStatus.VALID, VALIDATOR.validate(" " + iban), "leading space");
assertEquals(IBANValidatorStatus.VALID, VALIDATOR.validate(iban + " "), "trailing space");
assertTrue(VALIDATOR.isValid("\t" + iban + "\n"), "isValid trims surrounding whitespace");
}

@ParameterizedTest
@MethodSource("ibanRegistrySource")
void testValidatorShouldExistWithProperConfiguration(final String countryName, final String countryCode, final List<String> acountyCode,
Expand Down