Add Capability to retrieve Custom KeyStores #4025

Binara-Sachin · 2024-07-04T22:41:56Z

Purpose

This PR adds the feature to retrieve custom keystores from the KeyStoreManager class.
Custom KeyStores can be configured in the Carbon.xml file which can then be retrieved using KeyStoreManager

`deployment.toml` configuration

[[keystore.custom]]
file_name = "custom.jks"
password = "custom"
type = "JKS"
alias = "custom"
key_password = "custom"

Problem Statement: wso2-enterprise/iam-product-management#67
Public Git Issue: Capability to Configure Custom KeyStores for All Inbound Authentication Protocols product-is#20564

CLAassistant · 2024-07-04T22:42:02Z

All committers have signed the CLA.

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/RegistryResources.java

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreUtil.java

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/RegistryResources.java

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java

…methods

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreUtil.java

core/org.wso2.carbon.core/src/test/java/org/wso2/carbon/core/util/KeyStoreUtilTest.java

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java

jenkins-is-staging · 2024-08-01T04:16:38Z

PR builder started
Link: https://github.com/wso2/product-is/actions/runs/10191907178

jenkins-is-staging · 2024-08-01T06:08:19Z

PR builder completed
Link: https://github.com/wso2/product-is/actions/runs/10191907178
Status: failure

jenkins-is-staging · 2024-08-08T05:00:29Z

PR builder started
Link: https://github.com/wso2/product-is/actions/runs/10296190570

jenkins-is-staging · 2024-08-08T06:47:59Z

PR builder completed
Link: https://github.com/wso2/product-is/actions/runs/10296190570
Status: success

jenkins-is-staging

Approving the pull request based on the successful pr build https://github.com/wso2/product-is/actions/runs/10296190570

pamodaaw · 2024-08-08T08:46:44Z

core/org.wso2.carbon.core/src/test/java/org/wso2/carbon/core/util/KeyStoreUtilTest.java

+            assertEquals(KeyStoreUtil.getCustomKeyStoreConfig(keyStoreConfigElement, configName), expectedValue);
+        } catch (Exception e) {
+            // Print stacktrace and fail the test
+            e.printStackTrace();


handle the exception properly

Fixed in caf0241

jenkins-is-staging · 2024-08-09T04:43:24Z

PR builder started
Link: https://github.com/wso2/product-is/actions/runs/10313768488

jenkins-is-staging · 2024-08-09T06:30:39Z

PR builder completed
Link: https://github.com/wso2/product-is/actions/runs/10313768488
Status: success

jenkins-is-staging

Approving the pull request based on the successful pr build https://github.com/wso2/product-is/actions/runs/10313768488

Add capability to retrieve custom keystores

9288599

Binara-Sachin added 5 commits July 5, 2024 04:12

Fix getTenantKeyStore method argument

44a531c

Change custom keystore implementation

f2f8eb1

Add custom keystore template to carbon.xml.j2 file

712bc15

Add get certificate methods

4ece3ba

Change access modifiers

616e1d0

Binara-Sachin mentioned this pull request Jul 15, 2024

Add IdentityKeyStoreResolver and Util Classes wso2/carbon-identity-framework#5794

Open

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/RegistryResources.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreUtil.java Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreUtil.java Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/RegistryResources.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

ImalshaG reviewed Jul 15, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

Binara-Sachin added 4 commits July 17, 2024 17:46

Minor improvements

a0533c7

Remove exception handling within methods.

c1687dc

Change access modifiers of newly added methods.

9ee2fb4

Add exception handling to getPrivateKey method

524827b

Binara-Sachin mentioned this pull request Jul 22, 2024

Integrate IdentityKeyStoreResolver wso2-extensions/identity-inbound-auth-oauth#2524

Open

lakshithakasun reviewed Jul 23, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Show resolved Hide resolved

lakshithakasun reviewed Jul 23, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Show resolved Hide resolved

Add getCustomKeyStoreConfig method and improvements to existing util …

33d5043

…methods

DInuwan97 reviewed Jul 24, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Show resolved Hide resolved

DInuwan97 reviewed Jul 24, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Show resolved Hide resolved

pamodaaw reviewed Jul 30, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreUtil.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 30, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreUtil.java Show resolved Hide resolved

pamodaaw reviewed Jul 30, 2024

View reviewed changes

core/org.wso2.carbon.core/src/test/java/org/wso2/carbon/core/util/KeyStoreUtilTest.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 30, 2024

View reviewed changes

core/org.wso2.carbon.core/src/test/java/org/wso2/carbon/core/util/KeyStoreUtilTest.java Outdated Show resolved Hide resolved

pamodaaw reviewed Jul 30, 2024

View reviewed changes

core/org.wso2.carbon.core/src/test/java/org/wso2/carbon/core/util/KeyStoreUtilTest.java Outdated Show resolved Hide resolved

Binara-Sachin marked this pull request as ready for review July 30, 2024 04:39

Minor improvements

3aa02c8

ImalshaG reviewed Jul 31, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

ImalshaG reviewed Jul 31, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

ImalshaG reviewed Jul 31, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

ImalshaG reviewed Jul 31, 2024

View reviewed changes

core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java Outdated Show resolved Hide resolved

Binara-Sachin added 5 commits July 31, 2024 10:53

Minor improvements

6ea03c4

Improve null checks

9584f21

Improvements to test cases in KeyStoreUtilTest.java

93a9c64

Add debug logs to KeyStoreManager.java

bb1cd7d

Improvements and bug fixes

468facb

jenkins-is-staging approved these changes Aug 8, 2024

View reviewed changes

pamodaaw previously approved these changes Aug 8, 2024

View reviewed changes

pamodaaw reviewed Aug 8, 2024

View reviewed changes

Improve KeyStoreUtilTest

caf0241

Binara-Sachin dismissed pamodaaw’s stale review via caf0241 August 8, 2024 18:40

jenkins-is-staging approved these changes Aug 9, 2024

View reviewed changes

pamodaaw approved these changes Aug 9, 2024

View reviewed changes

ZiyamSanthosh merged commit a24d312 into wso2:4.10.x Aug 9, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Capability to retrieve Custom KeyStores #4025

Add Capability to retrieve Custom KeyStores #4025

Binara-Sachin commented Jul 4, 2024 •

edited

Loading

CLAassistant commented Jul 4, 2024 •

edited

Loading

jenkins-is-staging commented Aug 1, 2024

jenkins-is-staging commented Aug 1, 2024

jenkins-is-staging commented Aug 8, 2024

jenkins-is-staging commented Aug 8, 2024

jenkins-is-staging left a comment

pamodaaw Aug 8, 2024

Binara-Sachin Aug 8, 2024

jenkins-is-staging commented Aug 9, 2024

jenkins-is-staging commented Aug 9, 2024

jenkins-is-staging left a comment

Add Capability to retrieve Custom KeyStores #4025

Add Capability to retrieve Custom KeyStores #4025

Conversation

Binara-Sachin commented Jul 4, 2024 • edited Loading

Purpose

deployment.toml configuration

CLAassistant commented Jul 4, 2024 • edited Loading

jenkins-is-staging commented Aug 1, 2024

jenkins-is-staging commented Aug 1, 2024

jenkins-is-staging commented Aug 8, 2024

jenkins-is-staging commented Aug 8, 2024

jenkins-is-staging left a comment

Choose a reason for hiding this comment

pamodaaw Aug 8, 2024

Choose a reason for hiding this comment

Binara-Sachin Aug 8, 2024

Choose a reason for hiding this comment

jenkins-is-staging commented Aug 9, 2024

jenkins-is-staging commented Aug 9, 2024

jenkins-is-staging left a comment

Choose a reason for hiding this comment

Binara-Sachin commented Jul 4, 2024 •

edited

Loading

`deployment.toml` configuration

CLAassistant commented Jul 4, 2024 •

edited

Loading