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

Add Capability to retrieve Custom KeyStores #4025

Merged
merged 21 commits into from
Aug 9, 2024
Merged

Add Capability to retrieve Custom KeyStores #4025

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9288599
Add capability to retrieve custom keystores
Binara-Sachin Jul 4, 2024
44a531c
Fix getTenantKeyStore method argument
Binara-Sachin Jul 4, 2024
f2f8eb1
Change custom keystore implementation
Binara-Sachin Jul 14, 2024
712bc15
Add custom keystore template to carbon.xml.j2 file
Binara-Sachin Jul 14, 2024
4ece3ba
Add get certificate methods
Binara-Sachin Jul 15, 2024
616e1d0
Change access modifiers
Binara-Sachin Jul 15, 2024
a0533c7
Minor improvements
Binara-Sachin Jul 17, 2024
c1687dc
Remove exception handling within methods.
Binara-Sachin Jul 17, 2024
9ee2fb4
Change access modifiers of newly added methods.
Binara-Sachin Jul 17, 2024
524827b
Add exception handling to getPrivateKey method
Binara-Sachin Jul 20, 2024
33d5043
Add getCustomKeyStoreConfig method and improvements to existing util …
Binara-Sachin Jul 24, 2024
938baad
Minor improvements
Binara-Sachin Jul 29, 2024
0b08e4c
Add KeyStoreUtilTest
Binara-Sachin Jul 29, 2024
429aaa1
Change Carbon.xml.j2 template
Binara-Sachin Jul 29, 2024
3aa02c8
Minor improvements
Binara-Sachin Jul 31, 2024
6ea03c4
Minor improvements
Binara-Sachin Jul 31, 2024
9584f21
Improve null checks
Binara-Sachin Jul 31, 2024
93a9c64
Improvements to test cases in KeyStoreUtilTest.java
Binara-Sachin Jul 31, 2024
bb1cd7d
Add debug logs to KeyStoreManager.java
Binara-Sachin Jul 31, 2024
468facb
Improvements and bug fixes
Binara-Sachin Aug 1, 2024
caf0241
Improve KeyStoreUtilTest
Binara-Sachin Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/RegistryResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,20 @@ public static final class SecurityManagement {
public static final String SERVER_INTERNAL_PRIVATE_KEY_PASSWORD = "Security.InternalKeyStore.KeyPassword";
public static final String SERVER_INTERNAL_KEYSTORE_TYPE = "Security.InternalKeyStore.Type";

//Custom KeyStore related constants
Binara-Sachin marked this conversation as resolved.
Show resolved Hide resolved
public static final class CustomKeyStore {
public static final String KEYSTORE_PREFIX = "CustomKeyStore/";
Binara-Sachin marked this conversation as resolved.
Show resolved Hide resolved

public static final String ELEM_SECURITY = "Security";
public static final String ELEM_CUSTOM_KEYSTORES = "CustomKeyStores";

public static final String PROP_LOCATION = "Location";
public static final String PROP_TYPE = "Type";
public static final String PROP_PASSWORD = "Password";
public static final String PROP_KEY_ALIAS = "KeyAlias";
public static final String PROP_KEY_PASSWORD = "KeyPassword";
}

//generated pub. key - multitenancy scenario
public static final String TENANT_PUBKEY_RESOURCE = RegistryResources.ROOT +
"security/pub-key";
Expand Down