This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7177a0c00d1f164e7978030ef727c731b7058c76 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Jul 9 11:52:05 2020 +0200 CAMEL-15280 - Camel-AWS2-*: Add the ability to trust all certificates when overidding the endpoint - KMS --- .../apache/camel/component/aws2/kms/KMS2Configuration.java | 13 +++++++++++++ .../org/apache/camel/component/aws2/kms/KMS2Endpoint.java | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java index b3cde67..b0b7687 100644 --- a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java +++ b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java @@ -49,6 +49,8 @@ public class KMS2Configuration implements Cloneable { private String region; @UriParam(defaultValue = "false") private boolean pojoRequest; + @UriParam(defaultValue = "false") + private boolean trustAllCertificates; public KmsClient getKmsClient() { return kmsClient; @@ -150,6 +152,17 @@ public class KMS2Configuration implements Cloneable { public void setPojoRequest(boolean pojoRequest) { this.pojoRequest = pojoRequest; } + + public boolean isTrustAllCertificates() { + return trustAllCertificates; + } + + /** + * If we want to trust all certificates in case of overriding the endpoint + */ + public void setTrustAllCertificates(boolean trustAllCertificates) { + this.trustAllCertificates = trustAllCertificates; + } // ************************************************* // diff --git a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java index 70c7120..de619f0 100644 --- a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java +++ b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java @@ -29,11 +29,14 @@ import org.apache.camel.support.ScheduledPollEndpoint; import org.apache.camel.util.ObjectHelper; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; +import software.amazon.awssdk.http.SdkHttpClient; +import software.amazon.awssdk.http.SdkHttpConfigurationOption; import software.amazon.awssdk.http.apache.ApacheHttpClient; import software.amazon.awssdk.http.apache.ProxyConfiguration; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.kms.KmsClient; import software.amazon.awssdk.services.kms.KmsClientBuilder; +import software.amazon.awssdk.utils.AttributeMap; /** * Manage keys stored in AWS KMS instances using AWS SDK version 2.x. @@ -114,6 +117,16 @@ public class KMS2Endpoint extends ScheduledPollEndpoint { if (ObjectHelper.isNotEmpty(configuration.getRegion())) { clientBuilder = clientBuilder.region(Region.of(configuration.getRegion())); } + if (configuration.isTrustAllCertificates()) { + SdkHttpClient ahc = ApacheHttpClient.builder().buildWithDefaults(AttributeMap + .builder() + .put( + SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, + Boolean.TRUE + ) + .build()); + clientBuilder.httpClient(ahc); + } client = clientBuilder.build(); return client; }