From 536d2f95164c7fc99656c41dc116d694c4ff1663 Mon Sep 17 00:00:00 2001 From: pvsaidurga <132046494+pvsaidurga@users.noreply.github.com> Date: Fri, 20 Dec 2024 14:59:18 +0530 Subject: [PATCH] [Es-1985] Added validation for lower case (#1047) Signed-off-by: pvsaidurga <132046494+pvsaidurga@users.noreply.github.com> --- .../AuthChallengeFactorFormatValidator.java | 2 +- .../mosip/esignet/api/validator/ValidatorTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/esignet-integration-api/src/main/java/io/mosip/esignet/api/validator/AuthChallengeFactorFormatValidator.java b/esignet-integration-api/src/main/java/io/mosip/esignet/api/validator/AuthChallengeFactorFormatValidator.java index b89fc299c..0dac78515 100644 --- a/esignet-integration-api/src/main/java/io/mosip/esignet/api/validator/AuthChallengeFactorFormatValidator.java +++ b/esignet-integration-api/src/main/java/io/mosip/esignet/api/validator/AuthChallengeFactorFormatValidator.java @@ -47,7 +47,7 @@ public boolean isValid(AuthChallenge authChallenge, ConstraintValidatorContext c String authFactor = authChallenge.getAuthFactorType(); String format = environment.getProperty(String.format(FORMAT_KEY_PREFIX, authFactor), String.class); - if( !StringUtils.hasText(authFactor) || !StringUtils.hasText(format)) { + if( !StringUtils.hasText(authFactor) || !StringUtils.hasText(format) || !authChallenge.getAuthFactorType().equals(authFactor.toUpperCase()) ) { context.disableDefaultConstraintViolation(); context.buildConstraintViolationWithTemplate(ErrorConstants.INVALID_AUTH_FACTOR_TYPE).addConstraintViolation(); return false; diff --git a/esignet-integration-api/src/test/java/io/mosip/esignet/api/validator/ValidatorTest.java b/esignet-integration-api/src/test/java/io/mosip/esignet/api/validator/ValidatorTest.java index 42289b657..df28cea33 100644 --- a/esignet-integration-api/src/test/java/io/mosip/esignet/api/validator/ValidatorTest.java +++ b/esignet-integration-api/src/test/java/io/mosip/esignet/api/validator/ValidatorTest.java @@ -97,6 +97,19 @@ public void authChallengeFactorFormatValidator_invalidAuthFactorType_thenFail() assertFalse(isValid); } + @Test + public void authChallengeFactorFormatValidator_lowerCaseAuthFactorType_thenFail() { + AuthChallenge authChallenge = new AuthChallenge(); + authChallenge.setAuthFactorType("otp"); + authChallenge.setFormat("alpha-numeric"); + authChallenge.setChallenge("111111"); + Mockito.when(constraintValidatorContext.buildConstraintViolationWithTemplate(anyString())) + .thenReturn(mock(ConstraintValidatorContext.ConstraintViolationBuilder.class)); + boolean isValid = authChallengeFactorFormatValidator.isValid(authChallenge, constraintValidatorContext); + Mockito.verify(constraintValidatorContext).buildConstraintViolationWithTemplate(ErrorConstants.INVALID_AUTH_FACTOR_TYPE); + assertFalse(isValid); + } + @Test public void authChallengeFactorFormatValidator_invalidChallengeLength_theFail() { AuthChallenge authChallenge = new AuthChallenge();