Fix GCS Keystore Handling in FIPS Mode #75028
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
In FIPS mode loading the `.p12` keystore used by the new SDK version is not supported because of "PBE AlgorithmParameters not available". Fortunately, the SDK still includes the old jks trust store so we can just manually load it the same way it was loaded by the previous version to fix things. Also, fixed `SocketAccess` to properly rethrow this kind of exception and not run into a class cast issue. Closes elastic#75023 relates googleapis/google-api-java-client#1738
original-brownbear
added
>non-issue
:Distributed/Snapshot/Restore
|
Pinging @elastic/es-distributed (Team:Distributed) |
fcofdez
reviewed
Jul 7, 2021
| @@ -126,7 +128,11 @@ private Storage createClient(GoogleCloudStorageClientSettings clientSettings, | |||
| final NetHttpTransport.Builder builder = new NetHttpTransport.Builder(); | |||
| // requires java.lang.RuntimePermission "setFactory" | |||
| // Pin the TLS trust certificates. | |||
| builder.trustCertificates(GoogleUtils.getCertificateTrustStore()); | |||
| final KeyStore certTrustStore = SecurityUtils.getJavaKeyStore(); | |||
| try (InputStream keyStoreStream = GoogleUtils.class.getResourceAsStream("google.jks")) { | |||
There was a problem hiding this comment.
nit: Could you add a comment explaining why we have to load this key store?
tlrx
approved these changes
Jul 7, 2021
| @@ -126,7 +128,11 @@ private Storage createClient(GoogleCloudStorageClientSettings clientSettings, | |||
| final NetHttpTransport.Builder builder = new NetHttpTransport.Builder(); | |||
| // requires java.lang.RuntimePermission "setFactory" | |||
| // Pin the TLS trust certificates. | |||
| builder.trustCertificates(GoogleUtils.getCertificateTrustStore()); | |||
| final KeyStore certTrustStore = SecurityUtils.getJavaKeyStore(); | |||
| try (InputStream keyStoreStream = GoogleUtils.class.getResourceAsStream("google.jks")) { | |||
There was a problem hiding this comment.
Can we add a small comment why GoogleUtils.getCertificateTrustStore() is not used directly?
|
Thanks Francisco + Tanguy! |
felixbarny
pushed a commit
to felixbarny/elasticsearch
that referenced
this pull request
Jul 8, 2021
In FIPS mode loading the `.p12` keystore used by the new SDK version is not supported because of "PBE AlgorithmParameters not available". Fortunately, the SDK still includes the old jks trust store so we can just manually load it the same way it was loaded by the previous version to fix things. Also, fixed `SocketAccess` to properly rethrow this kind of exception and not run into a class cast issue. Closes elastic#75023 relates googleapis/google-api-java-client#1738
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.
Fallout from upgrading the GCS dep. in #74938
In FIPS mode loading the
.p12keystore used by the new SDK version is not supportedbecause of "PBE AlgorithmParameters not available". Fortunately, the SDK still includes
the old jks trust store so we can just manually load it the same way it was loaded by
the previous version to fix things.
Also, fixed
SocketAccessto properly rethrow this kind of exception and not run intoa class cast issue.
Closes #75023
Relates googleapis/google-api-java-client#1738
non-issue as this hasn't been released yet