Introduce KeyStoreDAO and database based keystore persistence manager…

… implementation
wso2 · Dec 4, 2024 · b7ac1d7 · b7ac1d7
1 parent d61106f
commit b7ac1d7
Show file tree

Hide file tree

Showing 24 changed files with 3,441 additions and 13 deletions.
diff --git a/core/org.wso2.carbon.core/pom.xml b/core/org.wso2.carbon.core/pom.xml
@@ -174,6 +174,11 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.metatype.annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.utils</groupId>
+            <artifactId>org.wso2.carbon.database.utils</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
@@ -238,12 +243,14 @@
                             org.apache.axiom.*; version="${imp.pkg.version.axiom}",
                             org.apache.neethi.*; version="${neethi.osgi.version.range}",
                             javax.xml.namespace; version=0.0.0,
+                            javax.sql.*,
                             javax.servlet; version="${imp.pkg.version.javax.servlet}",
                             javax.servlet.http; version="${imp.pkg.version.javax.servlet}",
                             javax.xml.stream.*; version=1.0.1,
                             org.wso2.carbon.registry.core.service,
                             org.wso2.carbon.user.core.*; version=0.0.0,
                             org.bouncycastle.*; version="${imp.pkg.version.bcp}",
+                            org.wso2.carbon.database.utils.jdbc.*;version="${org.wso2.carbon.database.utils.version.range}",
                             *;resolution:=optional
                         </Import-Package>
                         <Embed-Dependency>

diff --git a/...rg.wso2.carbon.core/src/main/java/org/wso2/carbon/core/internal/CarbonCoreDataHolder.java b/...rg.wso2.carbon.core/src/main/java/org/wso2/carbon/core/internal/CarbonCoreDataHolder.java
@@ -22,15 +22,20 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.service.http.HttpService;
 import org.wso2.carbon.base.api.ServerConfigurationService;
+import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.core.clustering.api.CoordinatedActivity;
 import org.wso2.carbon.crypto.api.CryptoService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
+import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.service.RealmService;
+import org.wso2.carbon.user.core.util.DatabaseUtil;
 
-import org.wso2.carbon.core.clustering.api.CoordinatedActivity;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.sql.DataSource;
+
 /**
  * This singleton data holder contains all the data required by the Carbon core OSGi bundle
  */
@@ -49,6 +54,7 @@ public class CarbonCoreDataHolder {
 
     private List<CoordinatedActivity> coordinatedActivities = new ArrayList<CoordinatedActivity>() ;
     private CryptoService cryptoService;
+    private DataSource dataSource;
 
     public  static CarbonCoreDataHolder getInstance() {
         return instance;
@@ -166,4 +172,19 @@ public CryptoService getCryptoService() {
 
         return cryptoService;
     }
+
+    public DataSource getDataSource() {
+
+        return dataSource;
+    }
+
+    public void initDataSource() {
+
+        try {
+            this.dataSource = DatabaseUtil.getRealmDataSource(CarbonContext.getThreadLocalCarbonContext().
+                    getUserRealm().getRealmConfiguration());
+        } catch (UserStoreException e) {
+            log.error("Error while retrieving user management data source.", e);
+        }
+    }
 }
diff --git a/...2.carbon.core/src/main/java/org/wso2/carbon/core/internal/CarbonCoreServiceComponent.java b/...2.carbon.core/src/main/java/org/wso2/carbon/core/internal/CarbonCoreServiceComponent.java
@@ -83,6 +83,7 @@ protected void activate(ComponentContext ctxt) {
 
             carbonServerManager = new CarbonServerManager();
             carbonServerManager.start(ctxt.getBundleContext());
+            CarbonCoreDataHolder.getInstance().initDataSource();
         } catch (Throwable e) {
             log.error("Failed to activate Carbon Core bundle ", e);
         }