Skip to content

Release 1.4.x injicer1316 #527

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 5 commits into from
Feb 27, 2026
Merged

Release 1.4.x injicer1316 #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
819c3b5
MOSIP-42630: null pointer exception fix for cwt payload
nagendra0721 Feb 24, 2026
063e600
MOSIP-42630: kid add
nagendra0721 Feb 24, 2026
14ca5cb
INJICERT-1316: kid decode issue fix
nagendra0721 Feb 27, 2026
e5e11d7
Merge branch 'release-1.4.x' into release-1.4.x-Injicer1316
nagendra0721 Feb 27, 2026
8e7eccf
INJICERT-1316: test case fix
nagendra0721 Feb 27, 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
5 changes: 3 additions & 2 deletions ...ervice/src/main/java/io/mosip/kernel/signature/service/impl/CoseSignatureServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,9 @@ public String getKeyId(String kidPrepend, SignatureCertificate certificateRespon
(requestDto.getUnprotectedHeader() != null && requestDto.getUnprotectedHeader().containsKey(SignatureConstant.COSE_HEADER_KID))) {
String kidPrefix = kidPrepend;
if (kidPrepend.equalsIgnoreCase(SignatureConstant.KEY_ID_PREFIX)) {
String payload = Objects.isNull(requestDto.getPayload()) ? "" : requestDto.getPayload();
kidPrefix = SignatureUtil.getIssuerFromPayload(payload);
String payload = Objects.isNull(requestDto.getPayload()) ? SignatureConstant.BLANK : requestDto.getPayload();
String jsonData = SignatureUtil.isDataValid(payload) ? (new String(CryptoUtil.decodeURLSafeBase64(payload))) : SignatureConstant.BLANK;
kidPrefix = SignatureUtil.getIssuerFromPayload(jsonData);
if (kidPrefix.isEmpty())
kidPrefix = SignatureConstant.BLANK;
else
Expand Down
2 changes: 1 addition & 1 deletion ...kernel-keymanager-service/src/main/java/io/mosip/kernel/signature/util/SignatureUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public static String getIssuerFromPayload(String jsonPayload) {
return SignatureConstant.BLANK;
}

JsonNode jsonNode = mapper.readTree(new String(CryptoUtil.decodeURLSafeBase64(jsonPayload)));
JsonNode jsonNode = mapper.readTree(jsonPayload);

if (jsonNode.has(SignatureConstant.ISSUER)) {
return jsonNode.get(SignatureConstant.ISSUER).asText();
Expand Down
8 changes: 3 additions & 5 deletions ...ymanager-service/src/test/java/io/mosip/kernel/signature/test/Util/SignatureUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,14 @@ public void testGetSignAlgorithm() {

@Test
public void testGetIssuerFromPayload() {
// getIssuerFromPayload expects URL-safe Base64 encoded JSON payload
String payload = CryptoUtil.encodeToURLSafeBase64("{\"iss\":\"test-issuer\",\"data\":\"value\"}".getBytes());
String payload = "{\"iss\":\"test-issuer\",\"data\":\"value\"}";
String issuer = SignatureUtil.getIssuerFromPayload(payload);
Assert.assertEquals("test-issuer", issuer);

String noIssuer = SignatureUtil.getIssuerFromPayload(CryptoUtil.encodeToURLSafeBase64("{\"data\":\"value\"}".getBytes()));
String noIssuer = SignatureUtil.getIssuerFromPayload("{\"data\":\"value\"}");
Assert.assertEquals("", noIssuer);

// Test with invalid base64-encoded JSON (malformed JSON after decoding)
String invalidJson = SignatureUtil.getIssuerFromPayload(CryptoUtil.encodeToURLSafeBase64("invalid json".getBytes()));
String invalidJson = SignatureUtil.getIssuerFromPayload("invalid json");
Assert.assertEquals("", invalidJson);
}

Expand Down