Skip to content

MOSIP-28563 Added the flag condition to check env #1069

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

Open
Neha2365 wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

MOSIP-28563 Added the flag condition to check env #1069

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b19e692
Added the flag condition to check env
Aug 22, 2023
b72cb13
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Aug 22, 2023
8a5b189
Variable name changed
Aug 22, 2023
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
14 changes: 11 additions & 3 deletions .../src/main/java/io/mosip/authentication/common/service/validator/AuthRequestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import javax.annotation.PostConstruct;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
Expand Down Expand Up @@ -76,6 +77,9 @@ public class AuthRequestValidator extends BaseAuthRequestValidator {
*/
private List<String> allowedDomainUris;

@Value("${mosip.ida.validate-allowed-env-enabled:true}")
private boolean isAllowedEnvValidationEnabled;

@PostConstruct
public void initialize() {
allowedEnvironments = Arrays.stream(EnvUtil.getAllowedEnv().split((",")))
Expand Down Expand Up @@ -475,6 +479,7 @@ private void validateEnv(AuthRequestDTO authRequestDto, Errors errors) {
}

// request env is not null and not matching with configurations

if (authRequestDto.getEnv() != null
&& !isValuesContainsIgnoreCase(allowedEnvironments, authRequestDto.getEnv())) {
mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(),
Expand Down Expand Up @@ -645,9 +650,12 @@ private Date biometricTimestampParser(String timestamp) throws ParseException {
* @return
*/
private boolean isValuesContainsIgnoreCase(List<String> values, String value) {
if (value != null) {
return values.stream().anyMatch(value::equalsIgnoreCase);
if (isAllowedEnvValidationEnabled) {
if (value != null) {
return values.stream().anyMatch(value::equalsIgnoreCase);
}
return false;
}
return false;
return true;
}
}