Merge pull request #192 from hwupathum/pkcs12

Use getKeystoreInstance from KeystoreUtils
wso2-extensions · Oct 3, 2024 · 3dc4190 · 3dc4190
2 parents 18f44b3 + 0c558f7
commit 3dc4190
Show file tree

Hide file tree

Showing 18 changed files with 187 additions and 17 deletions.
diff --git a/...ity/conditional/auth/functions/analytics/internal/AnalyticsFunctionsServiceComponent.java b/...ity/conditional/auth/functions/analytics/internal/AnalyticsFunctionsServiceComponent.java
@@ -40,6 +40,7 @@
 import org.wso2.carbon.identity.governance.IdentityGovernanceService;
 import org.wso2.carbon.identity.governance.common.IdentityConnectorConfig;
 import org.wso2.carbon.utils.Axis2ConfigurationContextObserver;
+import org.wso2.carbon.utils.security.KeystoreUtils;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -91,7 +92,7 @@ protected void activate(ComponentContext context) {
             String keyStoreType = config.getFirstProperty("Security.TrustStore.Type");
             String password = config.getFirstProperty("Security.TrustStore.Password");
             try (InputStream keyStoreStream = new FileInputStream(filePath)) {
-                KeyStore keyStore = KeyStore.getInstance(keyStoreType); // or "PKCS12"
+                KeyStore keyStore = KeystoreUtils.getKeystoreInstance(keyStoreType); // or "PKCS12"
                 keyStore.load(keyStoreStream, password.toCharArray());
                 AnalyticsFunctionsServiceHolder.getInstance().setTrustStore(keyStore);
             } catch (IOException | CertificateException | KeyStoreException | NoSuchAlgorithmException e) {

diff --git a/...2/carbon/identity/conditional/auth/functions/analytics/CallAnalyticsFunctionImplTest.java b/...2/carbon/identity/conditional/auth/functions/analytics/CallAnalyticsFunctionImplTest.java
@@ -22,6 +22,8 @@
 import com.google.gson.JsonObject;
 import org.graalvm.polyglot.HostAccess;
 import org.mockito.Mockito;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -37,6 +39,7 @@
 import org.wso2.carbon.identity.application.common.model.Property;
 import org.wso2.carbon.identity.application.common.model.ServiceProvider;
 import org.wso2.carbon.identity.application.common.model.script.AuthenticationScriptConfig;
+import org.wso2.carbon.identity.central.log.mgt.internal.CentralLogMgtServiceComponentHolder;
 import org.wso2.carbon.identity.common.testng.InjectMicroservicePort;
 import org.wso2.carbon.identity.common.testng.WithCarbonHome;
 import org.wso2.carbon.identity.common.testng.WithH2Database;
@@ -47,6 +50,7 @@
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsTestException;
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.ResponseValidator;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
+import org.wso2.carbon.identity.event.services.IdentityEventService;
 import org.wso2.carbon.identity.governance.IdentityGovernanceException;
 import org.wso2.carbon.identity.governance.IdentityGovernanceService;
 import org.wso2.carbon.user.api.UserRealm;
@@ -65,6 +69,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
+import static org.mockito.Mockito.mock;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
@@ -86,6 +91,19 @@ public class CallAnalyticsFunctionImplTest extends JsSequenceHandlerAbstractTest
     @InjectMicroservicePort
     private int microServicePort;
 
+    @BeforeClass
+    protected void setUpMocks() {
+
+        IdentityEventService identityEventService = mock(IdentityEventService.class);
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(identityEventService);
+    }
+
+    @AfterClass
+    protected void tearDown() {
+
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(null);
+    }
+
     @BeforeMethod
     protected void setUp() throws Exception {
 

diff --git a/...n/identity/conditional/auth/functions/choreo/internal/ChoreoFunctionServiceComponent.java b/...n/identity/conditional/auth/functions/choreo/internal/ChoreoFunctionServiceComponent.java
@@ -39,13 +39,15 @@
 import org.wso2.carbon.identity.secret.mgt.core.SecretResolveManager;
 import org.wso2.carbon.identity.secret.mgt.core.SecretResolveManagerImpl;
 import org.wso2.carbon.utils.Axis2ConfigurationContextObserver;
+import org.wso2.carbon.utils.security.KeystoreUtils;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
 
 /**
@@ -87,10 +89,11 @@ protected void activate(ComponentContext context) throws FrameworkException {
         String keyStoreType = config.getFirstProperty("Security.TrustStore.Type");
         String password = config.getFirstProperty("Security.TrustStore.Password");
         try (InputStream keyStoreStream = new FileInputStream(filePath)) {
-            KeyStore keyStore = KeyStore.getInstance(keyStoreType); // or "PKCS12"
+            KeyStore keyStore = KeystoreUtils.getKeystoreInstance(keyStoreType); // or "PKCS12"
             keyStore.load(keyStoreStream, password.toCharArray());
             ChoreoFunctionServiceHolder.getInstance().setTrustStore(keyStore);
-        } catch (IOException | CertificateException | KeyStoreException | NoSuchAlgorithmException e) {
+        } catch (IOException | CertificateException | KeyStoreException | NoSuchAlgorithmException |
+                 NoSuchProviderException e) {
             LOG.error("Error while loading truststore.", e);
             throw new FrameworkException("Error while trying to load Key Store.", e);
         }

diff --git a/...rg/wso2/carbon/identity/conditional/auth/functions/choreo/CallChoreoFunctionImplTest.java b/...rg/wso2/carbon/identity/conditional/auth/functions/choreo/CallChoreoFunctionImplTest.java
@@ -34,7 +34,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.graalvm.polyglot.HostAccess;
 import org.mockito.Mockito;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -49,6 +51,7 @@
 import org.wso2.carbon.identity.application.common.model.LocalAndOutboundAuthenticationConfig;
 import org.wso2.carbon.identity.application.common.model.ServiceProvider;
 import org.wso2.carbon.identity.application.common.model.script.AuthenticationScriptConfig;
+import org.wso2.carbon.identity.central.log.mgt.internal.CentralLogMgtServiceComponentHolder;
 import org.wso2.carbon.identity.common.testng.InjectMicroservicePort;
 import org.wso2.carbon.identity.common.testng.WithCarbonHome;
 import org.wso2.carbon.identity.common.testng.WithH2Database;
@@ -62,6 +65,7 @@
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsTestException;
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.ResponseValidator;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
+import org.wso2.carbon.identity.event.services.IdentityEventService;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.core.service.RealmService;
 
@@ -81,6 +85,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import static org.mockito.Mockito.mock;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
@@ -115,6 +120,19 @@ public class CallChoreoFunctionImplTest extends JsSequenceHandlerAbstractTest {
     @InjectMicroservicePort
     private int microServicePort;
 
+    @BeforeClass
+    protected void setUpMocks() {
+
+        IdentityEventService identityEventService = mock(IdentityEventService.class);
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(identityEventService);
+    }
+
+    @AfterClass
+    protected void tearDown() {
+
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(null);
+    }
+
     @BeforeMethod
     protected void setUp() throws Exception {
 

diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml
@@ -153,6 +153,7 @@
                             org.wso2.carbon.identity.event; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.governance; version="${identity.governance.import.version.range}",
                             org.wso2.carbon.identity.governance.common; version="${identity.governance.import.version.range}",
+                            org.wso2.carbon.utils.*;version="${carbon.kernel.package.import.version.range}",
                         </Import-Package>
                     </instructions>
                 </configuration>

diff --git a/...on/identity/conditional/auth/functions/elk/internal/ElasticFunctionsServiceComponent.java b/...on/identity/conditional/auth/functions/elk/internal/ElasticFunctionsServiceComponent.java
@@ -37,6 +37,7 @@
 import org.wso2.carbon.identity.core.util.IdentityCoreInitializedEvent;
 import org.wso2.carbon.identity.governance.IdentityGovernanceService;
 import org.wso2.carbon.identity.governance.common.IdentityConnectorConfig;
+import org.wso2.carbon.utils.security.KeystoreUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -83,7 +84,7 @@ protected void activate(ComponentContext context) {
             String keyStoreType = config.getFirstProperty(SECURITY_TRUSTSTORE_TYPE);
             String password = config.getFirstProperty(SECURITY_TRUSTSTORE_PASSWORD);
             try (InputStream keyStoreStream = Files.newInputStream(Paths.get(filePath))) {
-                KeyStore keyStore = KeyStore.getInstance(keyStoreType); // or "PKCS12"
+                KeyStore keyStore = KeystoreUtils.getKeystoreInstance(keyStoreType); // or "PKCS12"
                 keyStore.load(keyStoreStream, password.toCharArray());
                 ElasticFunctionsServiceHolder.getInstance().setTrustStore(keyStore);
             } catch (IOException | CertificateException | KeyStoreException | NoSuchAlgorithmException e) {

diff --git a/.../org/wso2/carbon/identity/conditional/auth/functions/elk/CallElasticFunctionImplTest.java b/.../org/wso2/carbon/identity/conditional/auth/functions/elk/CallElasticFunctionImplTest.java
@@ -21,6 +21,7 @@
 import com.google.gson.Gson;
 import org.json.JSONObject;
 import org.mockito.Mockito;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
@@ -33,6 +34,7 @@
 import org.wso2.carbon.identity.application.authentication.framework.store.LongWaitStatusStoreService;
 import org.wso2.carbon.identity.application.common.model.Property;
 import org.wso2.carbon.identity.application.common.model.ServiceProvider;
+import org.wso2.carbon.identity.central.log.mgt.internal.CentralLogMgtServiceComponentHolder;
 import org.wso2.carbon.identity.common.testng.WithCarbonHome;
 import org.wso2.carbon.identity.common.testng.WithH2Database;
 import org.wso2.carbon.identity.common.testng.WithMicroService;
@@ -42,6 +44,7 @@
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsSequenceHandlerAbstractTest;
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsTestException;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
+import org.wso2.carbon.identity.event.services.IdentityEventService;
 import org.wso2.carbon.identity.governance.IdentityGovernanceException;
 import org.wso2.carbon.identity.governance.IdentityGovernanceService;
 import org.wso2.msf4j.Response;
@@ -56,6 +59,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.mockito.Mockito.mock;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
@@ -74,13 +78,21 @@ public class CallElasticFunctionImplTest extends JsSequenceHandlerAbstractTest {
     @InjectMicroservicePort
     private int microServicePort;
 
+    @AfterClass
+    protected void tearDown() {
+
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(null);
+    }
+
     @BeforeClass
     @Parameters({"scriptEngine"})
     protected void initClass(String scriptEngine) throws Exception {
 
         super.setUp(scriptEngine);
         CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME = true;
         sequenceHandlerRunner.registerJsFunction("callElastic", new CallElasticFunctionImpl());
+        IdentityEventService identityEventService = mock(IdentityEventService.class);
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(identityEventService);
     }
 
     @Test

diff --git a/...java/org/wso2/carbon/identity/conditional/auth/functions/http/CookieFunctionImplTest.java b/...java/org/wso2/carbon/identity/conditional/auth/functions/http/CookieFunctionImplTest.java
@@ -24,6 +24,8 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -40,13 +42,15 @@
 import org.wso2.carbon.identity.application.authentication.framework.internal.FrameworkServiceDataHolder;
 import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants;
 import org.wso2.carbon.identity.application.common.model.ServiceProvider;
+import org.wso2.carbon.identity.central.log.mgt.internal.CentralLogMgtServiceComponentHolder;
 import org.wso2.carbon.identity.common.testng.WithCarbonHome;
 import org.wso2.carbon.identity.common.testng.WithH2Database;
 import org.wso2.carbon.identity.common.testng.WithRealmService;
 import org.wso2.carbon.identity.conditional.auth.functions.http.util.HTTPConstants;
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsSequenceHandlerAbstractTest;
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsSequenceHandlerRunner;
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsTestException;
+import org.wso2.carbon.identity.event.services.IdentityEventService;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -55,6 +59,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 /**
@@ -65,6 +70,19 @@
 @WithRealmService(injectToSingletons = FrameworkServiceDataHolder.class)
 public class CookieFunctionImplTest extends JsSequenceHandlerAbstractTest {
 
+    @BeforeClass
+    protected void setUpMocks() {
+
+        IdentityEventService identityEventService = mock(IdentityEventService.class);
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(identityEventService);
+    }
+
+    @AfterClass
+    protected void tearDown() {
+
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(null);
+    }
+
     @BeforeMethod
     protected void setUp() throws Exception {
 

diff --git a/...ava/org/wso2/carbon/identity/conditional/auth/functions/http/HTTPGetFunctionImplTest.java b/...ava/org/wso2/carbon/identity/conditional/auth/functions/http/HTTPGetFunctionImplTest.java
@@ -47,6 +47,7 @@
 import org.wso2.carbon.identity.application.common.model.LocalAndOutboundAuthenticationConfig;
 import org.wso2.carbon.identity.application.common.model.ServiceProvider;
 import org.wso2.carbon.identity.application.common.model.script.AuthenticationScriptConfig;
+import org.wso2.carbon.identity.central.log.mgt.internal.CentralLogMgtServiceComponentHolder;
 import org.wso2.carbon.identity.common.testng.InjectMicroservicePort;
 import org.wso2.carbon.identity.common.testng.WithCarbonHome;
 import org.wso2.carbon.identity.common.testng.WithH2Database;
@@ -57,6 +58,7 @@
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsTestException;
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.ResponseValidator;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
+import org.wso2.carbon.identity.event.services.IdentityEventService;
 
 import java.util.Date;
 import java.time.Instant;
@@ -74,6 +76,7 @@
 import javax.ws.rs.Produces;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.doNothing;
@@ -127,12 +130,15 @@ protected void initClass(String scriptEngine) throws Exception {
         // Mocking the executeHttpMethod method to avoid actual http calls.
         httpGetFunction = spy(new HTTPGetFunctionImpl());
         doNothing().when(httpGetFunction).executeHttpMethod(any(), any(), any());
+        IdentityEventService identityEventService = mock(IdentityEventService.class);
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(identityEventService);
     }
 
     @AfterClass
     protected void tearDown() {
 
         unsetAllowedDomains();
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(null);
     }
 
     @AfterMethod

diff --git a/...va/org/wso2/carbon/identity/conditional/auth/functions/http/HTTPPostFunctionImplTest.java b/...va/org/wso2/carbon/identity/conditional/auth/functions/http/HTTPPostFunctionImplTest.java
@@ -47,6 +47,7 @@
 import org.wso2.carbon.identity.application.common.model.LocalAndOutboundAuthenticationConfig;
 import org.wso2.carbon.identity.application.common.model.ServiceProvider;
 import org.wso2.carbon.identity.application.common.model.script.AuthenticationScriptConfig;
+import org.wso2.carbon.identity.central.log.mgt.internal.CentralLogMgtServiceComponentHolder;
 import org.wso2.carbon.identity.common.testng.InjectMicroservicePort;
 import org.wso2.carbon.identity.common.testng.WithCarbonHome;
 import org.wso2.carbon.identity.common.testng.WithH2Database;
@@ -57,6 +58,7 @@
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.JsTestException;
 import org.wso2.carbon.identity.conditional.auth.functions.test.utils.sequence.ResponseValidator;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
+import org.wso2.carbon.identity.event.services.IdentityEventService;
 
 import java.util.Date;
 import java.time.Instant;
@@ -73,6 +75,7 @@
 import javax.ws.rs.Produces;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.doNothing;
@@ -123,12 +126,15 @@ protected void initClass(String scriptEngine) throws Exception {
         // Mocking the executeHttpMethod method to avoid actual http calls.
         httpPostFunction = spy(new HTTPPostFunctionImpl());
         doNothing().when(httpPostFunction).executeHttpMethod(any(), any(), any());
+        IdentityEventService identityEventService = mock(IdentityEventService.class);
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(identityEventService);
     }
 
     @AfterClass
     protected void tearDown() {
 
         unsetAllowedDomains();
+        CentralLogMgtServiceComponentHolder.getInstance().setIdentityEventService(null);
     }
 
     @AfterMethod

diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml
@@ -136,7 +136,7 @@
                             org.wso2.carbon.identity.event.event; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.event.services; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.event.handler.notification.exception;
-                            version="${identity.event.handler.notification.version}",
+                            version="${identity.event.handler.notification.version.range}",
                             org.wso2.carbon.identity.central.log.mgt.utils; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.user.core.service; version="${carbon.kernel.package.import.version.range}"
                         </Import-Package>