Load cert from file system in key vault #21947
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
|
Hi, @lzc-1997-abel , please fix the pipeline failure: https://dev.azure.com/azure-sdk/public/_build/results?buildId=934882&view=logs&j=c9d240ae-d682-5859-bc40-e53679190efe&t=40323220-fbf5-56cf-78c9-a2f416f2d69b&l=22 |
|
/azp run java - keyvault - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run java - spring - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
chenrujun
suggested changes
Jun 9, 2021
...curity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/ClasspathCertificates.java
Outdated
Show resolved
Hide resolved
...urity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/FileSystemCertificates.java
Outdated
Show resolved
Hide resolved
...urity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/FileSystemCertificates.java
Outdated
Show resolved
Hide resolved
...urity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/FileSystemCertificates.java
Outdated
Show resolved
Hide resolved
...urity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/FileSystemCertificates.java
Outdated
Show resolved
Hide resolved
...re-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
Outdated
Show resolved
Hide resolved
...re-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
Outdated
Show resolved
Hide resolved
...y-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/FileSystemCertificatesTest.java
Outdated
Show resolved
Hide resolved
...vault-jca/src/test/java/com/azure/security/keyvault/jca/test/FileSystemCertificatesTest.java
Outdated
Show resolved
Hide resolved
...vault-jca/src/test/java/com/azure/security/keyvault/jca/test/FileSystemCertificatesTest.java
Outdated
Show resolved
Hide resolved
chenrujun
suggested changes
Jun 11, 2021
...ecurity-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultCertificates.java
Outdated
Show resolved
Hide resolved
...re-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
Outdated
Show resolved
Hide resolved
...re-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
Outdated
Show resolved
Hide resolved
...re-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
Outdated
Show resolved
Hide resolved
...re-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java
Outdated
Show resolved
Hide resolved
...vault-jca/src/test/java/com/azure/security/keyvault/jca/test/FileSystemCertificatesTest.java
Outdated
Show resolved
Hide resolved
...vault-jca/src/test/java/com/azure/security/keyvault/jca/test/FileSystemCertificatesTest.java
Show resolved
Hide resolved
...ty-test-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/test/JreKeyStoreTest.java
Outdated
Show resolved
Hide resolved
...ty-test-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/test/JreKeyStoreTest.java
Outdated
Show resolved
Hide resolved
| customCertificates = new FileSystemCertificates(customPath); | ||
| keyVaultCertificates = new KeyVaultCertificates(refreshInterval, keyVaultClient, this); | ||
| classpathCertificates = new ClasspathCertificates(); | ||
| allCertificates = Arrays.asList(jreCertificates, wellKnowCertificates, customCertificates, keyVaultCertificates, classpathCertificates); |
There was a problem hiding this comment.
Could you please add unit test for the priority? For example:
- wellKnowCertificates and customCertificates has same alias, the first one will be used.
- Same to customCertificates and classpathCertificates
chenrujun
approved these changes
Jun 15, 2021
| import java.security.cert.CertificateException; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| public class PropertyConvertorUtils { | ||
|
|
||
| public static void putEnvironmentPropertyToSystemProperty(List<String> key) { | ||
| public static void putEnvironmentPropertyToSystemPropertyForKeyVaultJca(List<String> key) { |
There was a problem hiding this comment.
nit: Delete parameter of this method, because it's always equal to SYSTEM_PROPERTIES.
Hi, @stliu , sorry that I forgot this. Please review this PR again. And @lzc-1997-abel will create another PR to :
|
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.
related issue: #21611
we need support load cert from file system(A configurable path).