Skip to content

MOSIP-30573: fixing the security hotspot #473

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

Merged
mahammedtaheer merged 3 commits into from
Nov 17, 2025
Merged

MOSIP-30573: fixing the security hotspot #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9508f9
MOSIP-30573: fixing the security hotspot
nagendra0721 Nov 17, 2025
00dd6ee
MOSIP-30573: fixing the security hotspot
nagendra0721 Nov 17, 2025
24e8f5c
MOSIP-30573: docker file change
nagendra0721 Nov 17, 2025
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
25 changes: 19 additions & 6 deletions ...er-service/src/main/java/io/mosip/kernel/signature/service/impl/SignatureServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.mosip.kernel.partnercertservice.service.spi.PartnerCertificateManagerService;
import io.mosip.kernel.signature.dto.*;
import io.mosip.kernel.signature.service.SignatureServicev2;
import jakarta.annotation.PreDestroy;
import org.apache.commons.codec.binary.Base64;
import org.jose4j.jca.ProviderContext;
import org.jose4j.jwa.AlgorithmFactory;
Expand Down Expand Up @@ -147,7 +148,7 @@ public class SignatureServiceImpl implements SignatureService, SignatureServicev

private static Map<String, SignatureProvider> SIGNATURE_PROVIDER = new HashMap<>();

AlgorithmFactory<JsonWebSignatureAlgorithm> jwsAlgorithmFactory;
// AlgorithmFactory<JsonWebSignatureAlgorithm> jwsAlgorithmFactory;

static {
SIGNATURE_PROVIDER.put(SignatureConstant.JWS_PS256_SIGN_ALGO_CONST, new PS256SIgnatureProviderImpl());
Expand All @@ -171,9 +172,6 @@ public class SignatureServiceImpl implements SignatureService, SignatureServicev
private final ConcurrentMap<String, X509Certificate> certCache = new ConcurrentHashMap<>();
private final ConcurrentMap<String, String> jwsHeaderCache = new ConcurrentHashMap<>();
private final ConcurrentMap<String, Provider> providerCache = new ConcurrentHashMap<>();
private static final long TRUST_TTL_MS = 5 * 60 * 1000; // 5 minutes
private static final class BoolWithTs { final boolean v; final long ts; BoolWithTs(boolean v,long ts){this.v=v;this.ts=ts;} }
private final ConcurrentMap<String, BoolWithTs> trustCache = new ConcurrentHashMap<>();

// Keep lightweight decoders & factories thread-local
private static final ThreadLocal<java.security.KeyFactory> KF_RSA =
Expand Down Expand Up @@ -202,6 +200,20 @@ public void init() {
}
}

@PreDestroy
public void destroy() {
KF_RSA.remove();
KF_EC.remove();
KF_ED.remove();
MD_SHA256.remove();
B64_DEC.remove();
B64_ENC.remove();
jwsHeaderCache.clear();
pubKeyCache.clear();
certCache.clear();
providerCache.clear();
}

@Override
public SignatureResponse sign(SignRequestDto signRequestDto) {
SignatureRequestDto signatureRequestDto = new SignatureRequestDto();
Expand Down Expand Up @@ -1047,8 +1059,9 @@ private String signV2(String dataToSign, SignatureCertificate certificateRespons
try {
jwSign.setHeader(entry.getKey(), entry.getValue());
} catch (Exception e) {
// Log the error but skip and continue processing
e.printStackTrace();
// Log the error but skip and continue processing
LOGGER.warn(SignatureConstant.SESSIONID, SignatureConstant.JWS_SIGN, SignatureConstant.BLANK,
"error occur while adding additional header: " + entry.getKey() + " value: " + entry.getValue());
}
}
}
Expand Down
1 change: 1 addition & 0 deletions ...s-generator/src/main/java/io/mosip/kernel/keygenerator/generator/RandomKeysGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public class RandomKeysGenerator {

private ThreadLocal<Cipher> CIPHER_AES_ECB_NO_PADDING;

@SuppressWarnings("java:S5542")
@PostConstruct
public void init() {
secureRandomThreadLocal = ThreadLocal.withInitial(SecureRandom::new);
Expand Down
4 changes: 3 additions & 1 deletion kernel/keys-migrator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ RUN apt-get -y update \
&& adduser ${container_user} sudo \
&& echo "%sudo ALL=(ALL) NOPASSWD:/home/${container_user}/${hsm_local_dir}/install.sh" >> /etc/sudoers \
&& mkdir -p ${loader_path} \
&& chmod +x configure_start.sh
&& chmod +x /home/${container_user}/configure_start.sh \
&& chmod a-w /home/${container_user}/configure_start.sh \
&& chown -R ${container_user}:${container_user} /home/${container_user}

ENTRYPOINT [ "./configure_start.sh" ]

Expand Down