Skip to content

MOSIP-42630: log #521

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
Feb 5, 2026
Merged

MOSIP-42630: log #521

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59c961a
MOSIP-42630: log
nagendra0721 Feb 5, 2026
a378f80
Merge branch 'release-1.4.x' into release-1.4.x-log
nagendra0721 Feb 5, 2026
d24d901
Improve exception handling in KeymanagerServiceImpl
nagendra0721 Feb 5, 2026
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: 9 additions & 5 deletions ...e/src/main/java/io/mosip/kernel/keymanagerservice/service/impl/KeymanagerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,13 +930,17 @@ private Object[] getKeyDetails(Optional<io.mosip.kernel.keymanagerservice.entity
PrivateKey signPrivateKey = signKeyEntry.getPrivateKey();
X509Certificate x509Cert = (X509Certificate) signKeyEntry.getCertificate();
return new Object[] {signPrivateKey, x509Cert};
}
PrivateKeyEntry masterKeyEntry = keyStore.getAsymmetricKey(keyFromDBStore.get().getMasterAlias());
PrivateKey masterPrivateKey = masterKeyEntry.getPrivateKey();
PublicKey masterPublicKey = masterKeyEntry.getCertificate().getPublicKey();
}
try {
PrivateKeyEntry masterKeyEntry = keyStore.getAsymmetricKey(keyFromDBStore.get().getMasterAlias());
LOGGER.info(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, keyFromDBStore.toString(),
"Key in DBStore does not exist for this alias. So fetching the certificate from HSM." + masterKeyEntry);
PrivateKey masterPrivateKey = masterKeyEntry.getPrivateKey();
PublicKey masterPublicKey = masterKeyEntry.getCertificate().getPublicKey();
byte[] decryptedPrivateKey = keymanagerUtil.decryptKey(CryptoUtil.decodeURLSafeBase64(keyFromDBStore.get().getPrivateKey()),
masterPrivateKey, masterPublicKey, keyStore.getKeystoreProviderName());
LOGGER.info(KeymanagerConstant.SESSIONID, KeymanagerConstant.KEYFROMDB, keyFromDBStore.toString(),
"Key in DBStore does not exist for this alias. So fetching the certificate from HSM. Byte Length: " + decryptedPrivateKey.length);
X509Certificate x509Cert = (X509Certificate) keymanagerUtil.convertToCertificate(keyFromDBStore.get().getCertificateData());
String keyAlgorithm = x509Cert.getPublicKey().getAlgorithm();
PrivateKey signPrivateKey = null;
Expand All @@ -953,7 +957,7 @@ private Object[] getKeyDetails(Optional<io.mosip.kernel.keymanagerservice.entity
| NullMethodException | InvalidKeySpecException | NoSuchAlgorithmException e) {
throw new CryptoException(KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorCode(),
KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorMessage() + e.getMessage(), e);
} catch (Throwable e) {
} catch (Throwable e) {
LOGGER.error(KeymanagerConstant.SESSIONID, KeymanagerConstant.APPLICATIONID, null,
"Invalid Certificate Data provided to upload the certificate.", e);
throw new CryptoException(KeymanagerErrorConstant.CRYPTO_EXCEPTION.getErrorCode(),
Expand Down