-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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.
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
Add support for 2-way SSL when connecting with LdapServer #11070
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
147 changes: 147 additions & 0 deletions
147
lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ssl/SslUtils.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.plugin.base.ssl; | ||
|
|
||
| import io.airlift.security.pem.PemReader; | ||
|
|
||
| import javax.net.ssl.KeyManager; | ||
| import javax.net.ssl.KeyManagerFactory; | ||
| import javax.net.ssl.SSLContext; | ||
| import javax.net.ssl.TrustManager; | ||
| import javax.net.ssl.TrustManagerFactory; | ||
| import javax.net.ssl.X509TrustManager; | ||
| import javax.security.auth.x500.X500Principal; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileInputStream; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.security.GeneralSecurityException; | ||
| import java.security.KeyStore; | ||
| import java.security.cert.Certificate; | ||
| import java.security.cert.CertificateExpiredException; | ||
| import java.security.cert.CertificateNotYetValidException; | ||
| import java.security.cert.X509Certificate; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import static java.util.Collections.list; | ||
|
|
||
| public final class SslUtils | ||
| { | ||
| private SslUtils() {} | ||
|
|
||
| public static SSLContext createSSLContext( | ||
| Optional<File> keyStorePath, | ||
| Optional<String> keyStorePassword, | ||
| Optional<File> trustStorePath, | ||
| Optional<String> trustStorePassword) | ||
| throws GeneralSecurityException, IOException | ||
| { | ||
| // load KeyStore if configured and get KeyManagers | ||
| KeyStore keyStore = null; | ||
| KeyManager[] keyManagers = null; | ||
| if (keyStorePath.isPresent()) { | ||
| char[] keyManagerPassword; | ||
| try { | ||
| // attempt to read the key store as a PEM file | ||
| keyStore = PemReader.loadKeyStore(keyStorePath.get(), keyStorePath.get(), keyStorePassword); | ||
| // for PEM encoded keys, the password is used to decrypt the specific key (and does not protect the keystore itself) | ||
| keyManagerPassword = new char[0]; | ||
| } | ||
| catch (IOException | GeneralSecurityException ignored) { | ||
| keyManagerPassword = keyStorePassword.map(String::toCharArray).orElse(null); | ||
|
|
||
| keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); | ||
| try (InputStream in = new FileInputStream(keyStorePath.get())) { | ||
| keyStore.load(in, keyManagerPassword); | ||
| } | ||
| } | ||
| validateCertificates(keyStore); | ||
| KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); | ||
| keyManagerFactory.init(keyStore, keyManagerPassword); | ||
| keyManagers = keyManagerFactory.getKeyManagers(); | ||
| } | ||
|
|
||
| // load TrustStore if configured, otherwise use KeyStore | ||
| KeyStore trustStore = keyStore; | ||
| if (trustStorePath.isPresent()) { | ||
| trustStore = loadTrustStore(trustStorePath.get(), trustStorePassword); | ||
| } | ||
|
|
||
| // create TrustManagerFactory | ||
| TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); | ||
| trustManagerFactory.init(trustStore); | ||
|
|
||
| // get X509TrustManager | ||
| TrustManager[] trustManagers = trustManagerFactory.getTrustManagers(); | ||
| if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) { | ||
| throw new RuntimeException("Unexpected default trust managers:" + Arrays.toString(trustManagers)); | ||
| } | ||
| // create SSLContext | ||
| SSLContext result = SSLContext.getInstance("SSL"); | ||
| result.init(keyManagers, trustManagers, null); | ||
| return result; | ||
| } | ||
|
|
||
| private static KeyStore loadTrustStore(File trustStorePath, Optional<String> trustStorePassword) | ||
| throws IOException, GeneralSecurityException | ||
| { | ||
| KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType()); | ||
| try { | ||
| // attempt to read the trust store as a PEM file | ||
| List<X509Certificate> certificateChain = PemReader.readCertificateChain(trustStorePath); | ||
| if (!certificateChain.isEmpty()) { | ||
| trustStore.load(null, null); | ||
| for (X509Certificate certificate : certificateChain) { | ||
| X500Principal principal = certificate.getSubjectX500Principal(); | ||
| trustStore.setCertificateEntry(principal.getName(), certificate); | ||
| } | ||
| return trustStore; | ||
| } | ||
| } | ||
| catch (IOException | GeneralSecurityException ignored) { | ||
| } | ||
|
|
||
| try (InputStream in = new FileInputStream(trustStorePath)) { | ||
| trustStore.load(in, trustStorePassword.map(String::toCharArray).orElse(null)); | ||
| } | ||
| return trustStore; | ||
| } | ||
|
|
||
| private static void validateCertificates(KeyStore keyStore) | ||
| throws GeneralSecurityException | ||
| { | ||
| for (String alias : list(keyStore.aliases())) { | ||
| if (!keyStore.isKeyEntry(alias)) { | ||
| continue; | ||
| } | ||
| Certificate certificate = keyStore.getCertificate(alias); | ||
| if (!(certificate instanceof X509Certificate)) { | ||
| continue; | ||
| } | ||
|
|
||
| try { | ||
| ((X509Certificate) certificate).checkValidity(); | ||
| } | ||
| catch (CertificateExpiredException e) { | ||
| throw new CertificateExpiredException("KeyStore certificate is expired: " + e.getMessage()); | ||
| } | ||
| catch (CertificateNotYetValidException e) { | ||
| throw new CertificateNotYetValidException("KeyStore certificate is not yet valid: " + e.getMessage()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about creating builder instead of this factory method?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then it will be a different refactor. Now it is simple extraction. Maybe separate PR or commit if we go with the builder approach?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At most of the places we build it from config - so builder might not help us. It makes it a bit more complicated.