Skip to content

chore(QTDI-2053):use safer method to verify certificate #1141

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

Merged
yyin-talend merged 6 commits into from
Jan 15, 2026
Merged

chore(QTDI-2053):use safer method to verify certificate #1141

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2283166
use safer method to verify certificate
yyin-talend Dec 8, 2025
8d07a5c
Merge branch 'master' into yyin/QTDI-2053-VaultClient-Master
yyin-talend Dec 19, 2025
12617f4
Merge branch 'master' into yyin/QTDI-2053-VaultClient-Master
yyin-talend Dec 25, 2025
39e3125
add log
yyin-talend Jan 9, 2026
c49d40f
use log.info
yyin-talend Jan 9, 2026
edf76e9
Fix log message for keystore location configuration
yyin-talend Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions vault-client/src/main/java/org/talend/sdk/components/vault/client/VaultClientSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;

import org.apache.cxf.transport.https.httpclient.DefaultHostnameVerifier;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.talend.sdk.components.vault.configuration.Documentation;

Expand Down Expand Up @@ -190,15 +191,22 @@ private ClientBuilder createClient(final ExecutorService executor, final Optiona
final Optional<String> keystoreType, final String keystorePassword, final Optional<String> truststoreType,
final List<String> serverHostnames) {
final ClientBuilder builder = ClientBuilder.newBuilder();
final DefaultHostnameVerifier hostnameVerifier = new DefaultHostnameVerifier();
builder.connectTimeout(connectTimeout, MILLISECONDS);
builder.readTimeout(readTimeout, MILLISECONDS);
builder.executorService(executor);
if (acceptAnyCertificate) {
builder.hostnameVerifier((host, session) -> true);
builder.sslContext(createUnsafeSSLContext());
} else if (keystoreLocation.isPresent()) {
builder.hostnameVerifier((host, session) -> serverHostnames.contains(host));
builder.sslContext(createSSLContext(keystoreLocation, keystoreType, keystorePassword, truststoreType));
} else {
if (keystoreLocation.isPresent()) {
builder.hostnameVerifier(hostnameVerifier);
builder.sslContext(createSSLContext(keystoreLocation, keystoreType, keystorePassword, truststoreType));
} else {
log.info("TCK vault-client doesn't explicitly define the keystore location. Please configure " +
Copy link
Member

@undx undx Jan 9, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't a warning more relevant?

Copy link
Contributor

@ypiel-talend ypiel-talend Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. I think if properties are not set it uses default java configuration. The two properties seem to be use to specify its own keystore.

"'talend.vault.cache.client.vault.certificate.keystore.location' and " +
"'talend.vault.cache.client.vault.certificate.keystore.type' to define it explicitly.");
}
}
providers.map(it -> Stream.of(it.split(",")).map(String::trim).filter(v -> !v.isEmpty()).map(fqn -> {
try {
Expand Down
Loading