Skip to content
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

Jump to bottom

Remove keystore module. #4895

Merged
merged 3 commits into from
Jan 29, 2024
Merged

Remove keystore module. #4895

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
70b5228
Remove keystore module.
mpmadhavig Sep 12, 2023
bdf43f6
Add registry removal changes from KeyStoreAdmin.
mpmadhavig Sep 12, 2023
0e8e9bc
Apply admin service import changes to ui.
mpmadhavig Sep 13, 2023
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
4 changes: 4 additions & 0 deletions components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@
org.wso2.carbon.registry.core.*; version="${carbon.kernel.registry.imp.pkg.version}",
org.wso2.carbon.security.mgt.stub.*;
version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.core.keystore.service.xsd.*;
version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.core.keystore.xsd.*;
version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.identity.sts.common.stub.config.*;
version="${carbon.identity.package.import.version.range}",
org.wso2.carbon.user.mgt.stub.types.carbon; version="${carbon.identity.package.import.version.range}",
Expand Down
4 changes: 2 additions & 2 deletions ...y-mgt/org.wso2.carbon.security.mgt.ui/src/main/java/org/wso2/carbon/security/ui/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

package org.wso2.carbon.security.ui;

import org.wso2.carbon.security.mgt.stub.keystore.xsd.CertData;
import org.wso2.carbon.security.mgt.stub.keystore.xsd.KeyStoreData;
import org.wso2.carbon.core.keystore.service.xsd.CertData;
import org.wso2.carbon.core.keystore.service.xsd.KeyStoreData;
import org.wso2.carbon.user.mgt.stub.types.carbon.FlaggedName;

import java.util.ArrayList;
Expand Down
4 changes: 2 additions & 2 deletions ...security.mgt.ui/src/main/java/org/wso2/carbon/security/ui/client/KeyStoreAdminClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.core.keystore.service.xsd.KeyStoreData;
import org.wso2.carbon.core.keystore.service.xsd.PaginatedKeyStoreData;
import org.wso2.carbon.identity.core.util.IdentityIOStreamUtils;
import org.wso2.carbon.security.mgt.stub.keystore.AddKeyStore;
import org.wso2.carbon.security.mgt.stub.keystore.AddTrustStore;
Expand All @@ -41,8 +43,6 @@
import org.wso2.carbon.security.mgt.stub.keystore.ImportCertToStore;
import org.wso2.carbon.security.mgt.stub.keystore.KeyStoreAdminServiceStub;
import org.wso2.carbon.security.mgt.stub.keystore.RemoveCertFromStore;
import org.wso2.carbon.security.mgt.stub.keystore.xsd.KeyStoreData;
import org.wso2.carbon.security.mgt.stub.keystore.xsd.PaginatedKeyStoreData;

import java.io.ByteArrayInputStream;
import java.io.File;
Expand Down
4 changes: 2 additions & 2 deletions ...ty-mgt/org.wso2.carbon.security.mgt.ui/src/main/resources/web/keystoremgt/import-cert.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.wso2.carbon.CarbonConstants" %>
<%@ page import="org.wso2.carbon.security.mgt.stub.keystore.xsd.CertData" %>
<%@page import="org.wso2.carbon.security.mgt.stub.keystore.xsd.KeyStoreData" %>
<%@ page import="org.wso2.carbon.core.keystore.service.xsd.CertData" %>
<%@page import="org.wso2.carbon.core.keystore.service.xsd.KeyStoreData" %>
<%@page import="org.wso2.carbon.security.ui.client.KeyStoreAdminClient" %>
<%@page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<%@page import="org.wso2.carbon.ui.CarbonUIUtil" %>
Expand Down
2 changes: 1 addition & 1 deletion ...y-mgt/org.wso2.carbon.security.mgt.ui/src/main/resources/web/keystoremgt/keystore-mgt.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.wso2.carbon.CarbonConstants" %>
<%@page import="org.wso2.carbon.CarbonError" %>
<%@page import="org.wso2.carbon.security.mgt.stub.keystore.xsd.KeyStoreData" %>
<%@page import="org.wso2.carbon.core.keystore.service.xsd.KeyStoreData" %>
<%@page import="org.wso2.carbon.security.ui.SecurityUIConstants" %>
<%@page import="org.wso2.carbon.security.ui.Util" %>
<%@page import="org.wso2.carbon.security.ui.client.KeyStoreAdminClient"%>
Expand Down
6 changes: 3 additions & 3 deletions ...-mgt/org.wso2.carbon.security.mgt.ui/src/main/resources/web/keystoremgt/view-keystore.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.wso2.carbon.CarbonConstants" %>
<%@ page import="org.wso2.carbon.security.mgt.stub.keystore.xsd.CertData" %>
<%@ page import="org.wso2.carbon.security.mgt.stub.keystore.xsd.PaginatedCertData" %>
<%@page import="org.wso2.carbon.security.mgt.stub.keystore.xsd.PaginatedKeyStoreData" %>
<%@ page import="org.wso2.carbon.core.keystore.service.xsd.CertData" %>
<%@ page import="org.wso2.carbon.core.keystore.service.xsd.PaginatedCertData" %>
<%@page import="org.wso2.carbon.core.keystore.service.xsd.PaginatedKeyStoreData" %>
<%@page import="org.wso2.carbon.security.ui.SecurityUIConstants" %>
<%@page import="org.wso2.carbon.security.ui.Util" %>
<%@page import="org.wso2.carbon.security.ui.client.KeyStoreAdminClient" %>
Expand Down
2 changes: 1 addition & 1 deletion ...t/org.wso2.carbon.security.mgt.ui/src/main/resources/web/securityconfig/ut-ks-advance.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<%@page import="org.wso2.carbon.identity.sts.common.stub.config.xsd.KerberosConfigData" %>
<%@page import="org.wso2.carbon.identity.sts.common.stub.config.xsd.SecurityConfigData" %>
<%@page import="org.wso2.carbon.identity.sts.common.stub.config.xsd.SecurityScenarioData" %>
<%@page import="org.wso2.carbon.security.mgt.stub.keystore.xsd.KeyStoreData" %>
<%@page import="org.wso2.carbon.core.keystore.service.xsd.KeyStoreData" %>
<%@page import="org.wso2.carbon.security.ui.SecurityUIConstants" %>
<%@page import="org.wso2.carbon.security.ui.Util" %>
<%@page import="org.wso2.carbon.security.ui.client.KeyStoreAdminClient" %>
Expand Down
56 changes: 3 additions & 53 deletions ...rity.mgt/src/main/java/org/wso2/carbon/security/internal/SecurityMgtServiceComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,17 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.osgi.service.component.annotations.ReferencePolicy;
import org.wso2.carbon.core.RegistryResources;
import org.wso2.carbon.identity.core.util.IdentityCoreInitializedEvent;
import org.wso2.carbon.registry.core.Collection;
import org.wso2.carbon.registry.core.Registry;
import org.wso2.carbon.registry.core.Resource;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.registry.core.jdbc.utils.Transaction;
import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
import org.wso2.carbon.security.SecurityConstants;
import org.wso2.carbon.security.SecurityServiceHolder;
import org.wso2.carbon.security.keystore.KeyStoreManagementService;
import org.wso2.carbon.security.keystore.KeyStoreManagementServiceImpl;
import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.utils.ConfigurationContextService;

Expand All @@ -50,7 +40,7 @@
immediate = true
)
public class SecurityMgtServiceComponent {
private static String POX_SECURITY_MODULE = "POXSecurityModule";

private static final Log log = LogFactory.getLog(SecurityMgtServiceComponent.class);
private static ConfigurationContextService configContextService = null;
private static RealmService realmService;
Expand All @@ -62,22 +52,8 @@ public static ConfigurationContext getServerConfigurationContext() {

@Activate
protected void activate(ComponentContext ctxt) {
try {
BundleContext bundleCtx = ctxt.getBundleContext();
bundleCtx.registerService(KeyStoreManagementService.class.getName(), new KeyStoreManagementServiceImpl(),
null);
try {
addKeystores();
} catch (Exception e) {
String msg = "Error while adding key stores.";
log.error(msg, e);
throw new RuntimeException(msg, e);
}

log.debug("Security Mgt bundle is activated");
} catch (Throwable e) {
log.error("Failed to activate SecurityMgtServiceComponent", e);
}

log.debug("Security Mgt bundle is activated");
}

@Deactivate
Expand Down Expand Up @@ -195,30 +171,4 @@ protected void unsetIdentityCoreInitializedEventService(IdentityCoreInitializedE
public static RegistryService getRegistryService(){
return registryService;
}

private void addKeystores() throws RegistryException {
Registry registry = SecurityServiceHolder.getRegistryService().getGovernanceSystemRegistry();
try {
boolean transactionStarted = Transaction.isStarted();
if (!transactionStarted) {
registry.beginTransaction();
}
if (!registry.resourceExists(SecurityConstants.KEY_STORES)) {
Collection kstores = registry.newCollection();
registry.put(SecurityConstants.KEY_STORES, kstores);

Resource primResource = registry.newResource();
if (!registry.resourceExists(RegistryResources.SecurityManagement.PRIMARY_KEYSTORE_PHANTOM_RESOURCE)) {
registry.put(RegistryResources.SecurityManagement.PRIMARY_KEYSTORE_PHANTOM_RESOURCE,
primResource);
}
}
if (!transactionStarted) {
registry.commitTransaction();
}
} catch (Exception e) {
registry.rollbackTransaction();
throw e;
}
}
}
Loading