Skip to content

issue_1883 #2378

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
Md-Humair-KK wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

issue_1883 #2378

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
58 changes: 22 additions & 36 deletions esignet-core/src/main/java/io/mosip/esignet/core/util/IdentityProviderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@
import org.jose4j.jwk.RsaJsonWebKey;
import org.jose4j.keys.X509Util;
import org.jose4j.lang.JoseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.AntPathMatcher;
Expand All @@ -69,43 +66,32 @@
import io.mosip.esignet.core.constants.ErrorConstants;
import io.mosip.esignet.core.exception.EsignetException;
import io.mosip.esignet.core.validator.RedirectURLValidator;
import jakarta.annotation.PostConstruct;
import jakarta.xml.bind.DatatypeConverter;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@Component
public class IdentityProviderUtil {

@Value("#{${mosip.esignet.public-key-hash.fields}}")
private Map<String, List<String>> publicKeyHashFields;

@Autowired
private RedirectURLValidator springManagedUrlValidator;

private static final Logger logger = LoggerFactory.getLogger(IdentityProviderUtil.class);
public static final String ALGO_SHA3_256 = "SHA3-256";
public static final String ALGO_SHA_256 = "SHA-256";
public static final String ALGO_SHA_1 = "SHA-1";
public static final String ALGO_MD5 = "MD5";
public static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";

private static Base64.Encoder urlSafeEncoder;
private static Base64.Decoder urlSafeDecoder;
private static PathMatcher pathMatcher;
private static RedirectURLValidator urlValidator;
private static final Base64.Encoder urlSafeEncoder = Base64.getUrlEncoder().withoutPadding();
private static final Base64.Decoder urlSafeDecoder = Base64.getUrlDecoder();
private static final PathMatcher pathMatcher = new AntPathMatcher();
private static final ObjectMapper objectMapper = JsonMapper.builder().addModule(new JavaTimeModule()).build();

static {
urlSafeEncoder = Base64.getUrlEncoder().withoutPadding();
urlSafeDecoder = Base64.getUrlDecoder();
pathMatcher = new AntPathMatcher();
Comment on lines -99 to -102

@anushasunkada anushasunkada Aug 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this removed from static block?

urlValidator = new RedirectURLValidator(new String[0]); // safe default; @PostConstruct replaces with configured bean
}
private final RedirectURLValidator urlValidator;
private final Map<String, List<String>> publicKeyHashFields;

@PostConstruct
private void initStaticUrlValidator() {
urlValidator = this.springManagedUrlValidator;
public IdentityProviderUtil(
RedirectURLValidator urlValidator,
@Value("#{${mosip.esignet.public-key-hash.fields}}") Map<String, List<String>> publicKeyHashFields) {
this.urlValidator = urlValidator;
this.publicKeyHashFields = publicKeyHashFields;
}

/**
Expand Down Expand Up @@ -143,7 +129,7 @@ public static String generateHexEncodedHash(String algorithm, String value) thro
byte[] hash = digest.digest(value.getBytes(StandardCharsets.UTF_8));
return Hex.encodeHexString(hash);
} catch (NoSuchAlgorithmException ex) {
logger.error("Invalid algorithm : {}", algorithm, ex);
log.error("Invalid algorithm : {}", algorithm, ex);
throw new EsignetException(ErrorConstants.INVALID_ALGORITHM);
}
}
Expand All @@ -154,7 +140,7 @@ public static String generateB64EncodedHash(String algorithm, String value) thro
byte[] hash = digest.digest(value.getBytes(StandardCharsets.UTF_8));
return urlSafeEncoder.encodeToString(hash);
} catch (NoSuchAlgorithmException ex) {
logger.error("Invalid algorithm : {}", algorithm, ex);
log.error("Invalid algorithm : {}", algorithm, ex);
throw new EsignetException(ErrorConstants.INVALID_ALGORITHM);
}
}
Expand All @@ -165,7 +151,7 @@ public static String generateB64EncodedHash(String algorithm, byte[] bytes) thro
byte[] hash = digest.digest(bytes);
return urlSafeEncoder.encodeToString(hash);
} catch (NoSuchAlgorithmException ex) {
logger.error("Invalid algorithm : {}", algorithm, ex);
log.error("Invalid algorithm : {}", algorithm, ex);
throw new EsignetException(ErrorConstants.INVALID_ALGORITHM);
}
}
Expand Down Expand Up @@ -206,7 +192,7 @@ public static long getEpochSeconds() {
return ZonedDateTime.now(ZoneOffset.UTC).toEpochSecond();
}

public static void validateRedirectURI(List<String> registeredRedirectUris, String requestedRedirectUri) throws EsignetException {
public void validateRedirectURI(List<String> registeredRedirectUris, String requestedRedirectUri) throws EsignetException {
if(registeredRedirectUris.stream().anyMatch(uri -> matchUri(uri, requestedRedirectUri)))
return;

Expand Down Expand Up @@ -237,17 +223,17 @@ public static String generateRandomAlphaNumeric(int length) {
return builder.toString();
}

private static boolean matchUri(String registeredUri, String requestedUri) {
private boolean matchUri(String registeredUri, String requestedUri) {
return (urlValidator.isValid(registeredUri, null) && urlValidator.isValid(requestedUri, null))
&& pathMatcher.match(registeredUri, requestedUri);
}
public static byte[] generateSalt(int bytes) {
SecureRandom random = new SecureRandom();
byte[] randomBytes = new byte[bytes];
random.nextBytes(randomBytes);
return randomBytes;
}

public static byte[] generateSalt(int bytes) {
SecureRandom random = new SecureRandom();
byte[] randomBytes = new byte[bytes];
random.nextBytes(randomBytes);
return randomBytes;
}

/**
* get JWK string from JWK map
Expand Down
Loading
Loading