Skip to content

Fixed inconsistent use of root key app Id property. #383

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
lalithkota wants to merge 1 commit into
base: release-1.2.2.x
Choose a base branch
from
Open

Fixed inconsistent use of root key app Id property. #383

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
2 changes: 0 additions & 2 deletions ...-service/src/main/java/io/mosip/kernel/keymanagerservice/constant/KeymanagerConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ private KeymanagerConstant() {
*/
public static final String KS_PK_NA = "NA";

public static final String ROOT = "ROOT";

public static final String REQ_SYM_KEY_GEN = "Request for Symmetric Key Generation.";

public static final int SYMMETRIC_KEY_VALIDITY = 365 * 10;
Expand Down
4 changes: 2 additions & 2 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 @@ -293,7 +293,7 @@ private CertificateInfo<X509Certificate> getCertificateFromDBStore(String applic
}
});
}
if (applicationId.equalsIgnoreCase(KeymanagerConstant.ROOT)){
if (applicationId.equalsIgnoreCase(rootKeyApplicationId)){
LOGGER.error(KeymanagerConstant.SESSIONID, KeymanagerConstant.APPLICATIONID, null,
"Not Allowed to generate Base Key for Root Key.");
throw new KeymanagerServiceException(KeymanagerErrorConstant.GENERATION_NOT_ALLOWED.getErrorCode(),
Expand All @@ -306,7 +306,7 @@ private CertificateInfo<X509Certificate> getCertificateFromDBStore(String applic
KeymanagerErrorConstant.GENERATION_NOT_ALLOWED.getErrorMessage());
}
if (applicationId.equalsIgnoreCase(KeymanagerConstant.PARTNER_APP_ID)){
LOGGER.error(KeymanagerConstant.SESSIONID, KeymanagerConstant.KERNEL_APP_ID, null,
LOGGER.error(KeymanagerConstant.SESSIONID, KeymanagerConstant.PARTNER_APP_ID, null,
"Not Allowed to generate Keys for PARTNER App Id.");
throw new KeymanagerServiceException(KeymanagerErrorConstant.GENERATION_NOT_ALLOWED.getErrorCode(),
KeymanagerErrorConstant.GENERATION_NOT_ALLOWED.getErrorMessage());
Expand Down
2 changes: 0 additions & 2 deletions ...rc/main/java/io/mosip/kernel/partnercertservice/constant/PartnerCertManagerConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,5 @@ public interface PartnerCertManagerConstants {

String FTM_PARTNER_DOMAIN = "FTM";

String ROOT_APP_ID = "ROOT";

String AUTH_DOMAIN = "AUTH";
}
5 changes: 4 additions & 1 deletion ...io/mosip/kernel/partnercertservice/service/impl/PartnerCertificateManagerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ public class PartnerCertificateManagerServiceImpl implements PartnerCertificateM

private static final Logger LOGGER = KeymanagerLogger.getLogger(PartnerCertificateManagerServiceImpl.class);

@Value("${mosip.root.key.applicationid:ROOT}")
private String rootKeyApplicationId;

@Value("${mosip.kernel.partner.sign.masterkey.application.id}")
private String masterSignKeyAppId;

Expand Down Expand Up @@ -397,7 +400,7 @@ public PartnerCertificateResponseDto uploadPartnerCertificate(PartnerCertificate
String certId = UUID.randomUUID().toString();

X509Certificate rootCert = (X509Certificate) keymanagerUtil.convertToCertificate(
keymanagerService.getCertificate(PartnerCertManagerConstants.ROOT_APP_ID,
keymanagerService.getCertificate(rootKeyApplicationId,
Optional.of(PartnerCertManagerConstants.EMPTY)).getCertificate());
String timestamp = DateUtils.getUTCCurrentDateTimeString();
SignatureCertificate certificateResponse = keymanagerService.getSignatureCertificate(masterSignKeyAppId,
Expand Down
13 changes: 7 additions & 6 deletions ...el/keys-generator/src/main/java/io/mosip/kernel/keygenerator/generator/KeysGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ public class KeysGenerator {

private static final Logger LOGGER = Logger.getLogger(KeysGenerator.class.getName());

private static final String ROOT_APP_ID = "ROOT";

private static final String BLANK_REF_ID = "";

//private static final String MOSIP_CN = "MOSIP-";
Expand All @@ -39,6 +37,9 @@ public class KeysGenerator {

private static final String IDENTITY_CACHE_REF_ID = "IDENTITY_CACHE";

@Value("${mosip.root.key.applicationid:ROOT}")
private String rootKeyApplicationId;

@Value("${mosip.kernel.keymanager.autogen.appids.list}")
private String appIdsList;

Expand Down Expand Up @@ -90,9 +91,9 @@ public class KeysGenerator {
public void generateKeys() throws Exception {

// Not required to check for key exists or not, because keymanager is checking key exists before generating new key.
//String rootKeyAlias = getKeyAlias(ROOT_APP_ID, BLANK_REF_ID);
//String rootKeyAlias = getKeyAlias(rootKeyApplicationId, BLANK_REF_ID);
//if (Objects.isNull(rootKeyAlias)) {
generateMasterKey(ROOT_APP_ID, BLANK_REF_ID, rootCommonName);
generateMasterKey(rootKeyApplicationId, BLANK_REF_ID, rootCommonName);
LOGGER.info("Generated ROOT Key.");
//}

Expand Down Expand Up @@ -144,7 +145,7 @@ public void generateKeys() throws Exception {

private List<String> getListKeys() {
return Stream.of(appIdsList.split(",")).map(String::trim)
.filter(appId -> !appId.equalsIgnoreCase(ROOT_APP_ID))
.filter(appId -> !appId.equalsIgnoreCase(rootKeyApplicationId))
.collect(Collectors.toList());
}

Expand Down Expand Up @@ -186,7 +187,7 @@ private void generateMasterKey(String appId, String refId, String commonName){
requestDto.setReferenceId(refId);
requestDto.setForce(false);
requestDto.setCommonName(commonName);
String componentName = appId.equalsIgnoreCase(ROOT_APP_ID) ? "" : " (" + appId.toUpperCase() + ")";
String componentName = appId.equalsIgnoreCase(rootKeyApplicationId) ? "" : " (" + appId.toUpperCase() + ")";
requestDto.setOrganizationUnit(organizationUnit + componentName);
requestDto.setOrganization(organization);
requestDto.setLocation(location);
Expand Down
7 changes: 4 additions & 3 deletions kernel/keys-migrator/src/main/java/io/mosip/kernel/migrate/impl/BaseKeysMigrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ public class BaseKeysMigrator {

private static final Logger LOGGER = KeymanagerLogger.getLogger(BaseKeysMigrator.class);

private static final String ROOT_APP_ID = "ROOT";

private static final String BLANK_REF_ID = "";

private static final String KERNEL_APP_ID = "KERNEL";
Expand All @@ -88,6 +86,9 @@ public class BaseKeysMigrator {

private static final String PARTNER_APP_ID = "PARTNER";

@Value("${mosip.root.key.applicationid:ROOT}")
private String rootKeyApplicationId;

@Value("${mosip.kernel.keymanager.autogen.appids.list}")
private String appIdsList;

Expand Down Expand Up @@ -297,7 +298,7 @@ private void uploadKeyToNewKeyMgr(Optional<KeyAlias> keyAliasObj, String encrypt

private List<String> getMasterKeysList() {
return Stream.of(appIdsList.split(",")).map(String::trim)
.filter(appId -> !appId.equalsIgnoreCase(ROOT_APP_ID))
.filter(appId -> !appId.equalsIgnoreCase(rootKeyApplicationId))
.collect(Collectors.toList());
}

Expand Down