Merge keystore dao to kernel core #3659
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…velopment iteration
…_KEY_STORE table.
… into merge-keystore-dao-to-kernel-core
|
|
This was referenced Sep 4, 2023
core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/internal/KeyStoreMgtComponent.java
Show resolved
Hide resolved
core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/internal/KeyStoreMgtComponent.java
Outdated
Show resolved
Hide resolved
core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/util/KeyStoreManager.java
Outdated
Show resolved
Hide resolved
| @@ -217,6 +215,7 @@ public Key getPrivateKey(String keyStoreName, String alias) { | |||
| * @return password of the key store | |||
| * @throws Exception Error when reading the registry resource of decrypting the password | |||
| */ | |||
| // TODO: deprecate this method in the future since we are no longer using registry for key store management. | |||
There was a problem hiding this comment.
Let's incorporate this change as well.
There was a problem hiding this comment.
Resolved with 2660884.
(The usage will be removed with a different PR.)
|
|
||
| keyStoreDAO.updateKeyStore(this.tenantUUID, updatedKeyStoreModel); | ||
|
|
||
| // TODO: is it correct to use new Date() here? The value stored in DB might be different. |
There was a problem hiding this comment.
If there is a problem, either fix it or report a git issue.
| @@ -0,0 +1,105 @@ | |||
| /* | |||
| * Copyright (c) 2010, WSO2 LLC. (https://www.wso2.com). | |||
There was a problem hiding this comment.
Suggested change
| * Copyright (c) 2010, WSO2 LLC. (https://www.wso2.com). | |
| * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). |
There was a problem hiding this comment.
Though this file looks like newly added, it is an old file with a git history.
...2.carbon.core/src/main/java/org/wso2/carbon/core/keystore/service/PaginatedKeyStoreData.java
Show resolved
Hide resolved
| @@ -0,0 +1,95 @@ | |||
| /* | |||
| * Copyright (c) 2010, WSO2 LLC. (https://www.wso2.com). | |||
There was a problem hiding this comment.
Suggested change
| * Copyright (c) 2010, WSO2 LLC. (https://www.wso2.com). | |
| * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). |
Check the other license headers as well.
There was a problem hiding this comment.
Though this file looks like newly added, it is an old file with a git history.
Co-authored-by: Maduranga Siriwardena <[email protected]>
mpmadhavig
merged commit 9be10c0
into
wso2:feature-remove-registry-from-keystore
1 check was pending
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe
This effort will move the keystore package from security-mgt:security-mgt to the kernel:core. The decision has been taken to do so was due to a cyclic dependency between the keystore package and the keyStoreAdmin in carbon-core.
The effort includes the DAO layer implementation inrtroduced when removing registry implementation from keystore. Commits made to this PR has been moved to here.
Related issues
Related PRs