This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch CAMEL-20281-config in repository https://gitbox.apache.org/repos/asf/camel.git
commit a5561cfe079bb647bc28de01d1c5f378812fa3ad Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Feb 1 11:52:49 2024 +0100 CAMEL-20281 - Camel-AWS Components: Make it possible to use AwsSessionCredentials to support temporary credentials - AWS Config Signed-off-by: Andrea Cosentino <[email protected]> --- .../aws/config/AWSConfigComponentConfigurer.java | 12 +++ .../aws/config/AWSConfigEndpointConfigurer.java | 12 +++ .../aws/config/AWSConfigEndpointUriFactory.java | 7 +- .../camel/component/aws/config/aws-config.json | 16 +-- .../component/aws/config/AWSConfigComponent.java | 3 +- .../aws/config/AWSConfigConfiguration.java | 27 +++++ .../aws/config/client/AWSConfigClientFactory.java | 3 + .../impl/AWSConfigClientSessionTokenImpl.java | 111 +++++++++++++++++++++ .../aws/config/AWSConfigClientFactoryTest.java | 9 ++ 9 files changed, 191 insertions(+), 9 deletions(-) diff --git a/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigComponentConfigurer.java b/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigComponentConfigurer.java index a2679d80efd..f6a6694af8a 100644 --- a/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigComponentConfigurer.java +++ b/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigComponentConfigurer.java @@ -57,6 +57,8 @@ public class AWSConfigComponentConfigurer extends PropertyConfigurerSupport impl case "region": getOrCreateConfiguration(target).setRegion(property(camelContext, java.lang.String.class, value)); return true; case "secretkey": case "secretKey": getOrCreateConfiguration(target).setSecretKey(property(camelContext, java.lang.String.class, value)); return true; + case "sessiontoken": + case "sessionToken": getOrCreateConfiguration(target).setSessionToken(property(camelContext, java.lang.String.class, value)); return true; case "trustallcertificates": case "trustAllCertificates": getOrCreateConfiguration(target).setTrustAllCertificates(property(camelContext, boolean.class, value)); return true; case "uriendpointoverride": @@ -65,6 +67,8 @@ public class AWSConfigComponentConfigurer extends PropertyConfigurerSupport impl case "useDefaultCredentialsProvider": getOrCreateConfiguration(target).setUseDefaultCredentialsProvider(property(camelContext, boolean.class, value)); return true; case "useprofilecredentialsprovider": case "useProfileCredentialsProvider": getOrCreateConfiguration(target).setUseProfileCredentialsProvider(property(camelContext, boolean.class, value)); return true; + case "usesessioncredentials": + case "useSessionCredentials": getOrCreateConfiguration(target).setUseSessionCredentials(property(camelContext, boolean.class, value)); return true; default: return false; } } @@ -106,6 +110,8 @@ public class AWSConfigComponentConfigurer extends PropertyConfigurerSupport impl case "region": return java.lang.String.class; case "secretkey": case "secretKey": return java.lang.String.class; + case "sessiontoken": + case "sessionToken": return java.lang.String.class; case "trustallcertificates": case "trustAllCertificates": return boolean.class; case "uriendpointoverride": @@ -114,6 +120,8 @@ public class AWSConfigComponentConfigurer extends PropertyConfigurerSupport impl case "useDefaultCredentialsProvider": return boolean.class; case "useprofilecredentialsprovider": case "useProfileCredentialsProvider": return boolean.class; + case "usesessioncredentials": + case "useSessionCredentials": return boolean.class; default: return null; } } @@ -151,6 +159,8 @@ public class AWSConfigComponentConfigurer extends PropertyConfigurerSupport impl case "region": return getOrCreateConfiguration(target).getRegion(); case "secretkey": case "secretKey": return getOrCreateConfiguration(target).getSecretKey(); + case "sessiontoken": + case "sessionToken": return getOrCreateConfiguration(target).getSessionToken(); case "trustallcertificates": case "trustAllCertificates": return getOrCreateConfiguration(target).isTrustAllCertificates(); case "uriendpointoverride": @@ -159,6 +169,8 @@ public class AWSConfigComponentConfigurer extends PropertyConfigurerSupport impl case "useDefaultCredentialsProvider": return getOrCreateConfiguration(target).isUseDefaultCredentialsProvider(); case "useprofilecredentialsprovider": case "useProfileCredentialsProvider": return getOrCreateConfiguration(target).isUseProfileCredentialsProvider(); + case "usesessioncredentials": + case "useSessionCredentials": return getOrCreateConfiguration(target).isUseSessionCredentials(); default: return null; } } diff --git a/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigEndpointConfigurer.java b/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigEndpointConfigurer.java index 6d2df0d76f8..d54d6f5ad36 100644 --- a/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigEndpointConfigurer.java +++ b/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigEndpointConfigurer.java @@ -43,6 +43,8 @@ public class AWSConfigEndpointConfigurer extends PropertyConfigurerSupport imple case "region": target.getConfiguration().setRegion(property(camelContext, java.lang.String.class, value)); return true; case "secretkey": case "secretKey": target.getConfiguration().setSecretKey(property(camelContext, java.lang.String.class, value)); return true; + case "sessiontoken": + case "sessionToken": target.getConfiguration().setSessionToken(property(camelContext, java.lang.String.class, value)); return true; case "trustallcertificates": case "trustAllCertificates": target.getConfiguration().setTrustAllCertificates(property(camelContext, boolean.class, value)); return true; case "uriendpointoverride": @@ -51,6 +53,8 @@ public class AWSConfigEndpointConfigurer extends PropertyConfigurerSupport imple case "useDefaultCredentialsProvider": target.getConfiguration().setUseDefaultCredentialsProvider(property(camelContext, boolean.class, value)); return true; case "useprofilecredentialsprovider": case "useProfileCredentialsProvider": target.getConfiguration().setUseProfileCredentialsProvider(property(camelContext, boolean.class, value)); return true; + case "usesessioncredentials": + case "useSessionCredentials": target.getConfiguration().setUseSessionCredentials(property(camelContext, boolean.class, value)); return true; default: return false; } } @@ -85,6 +89,8 @@ public class AWSConfigEndpointConfigurer extends PropertyConfigurerSupport imple case "region": return java.lang.String.class; case "secretkey": case "secretKey": return java.lang.String.class; + case "sessiontoken": + case "sessionToken": return java.lang.String.class; case "trustallcertificates": case "trustAllCertificates": return boolean.class; case "uriendpointoverride": @@ -93,6 +99,8 @@ public class AWSConfigEndpointConfigurer extends PropertyConfigurerSupport imple case "useDefaultCredentialsProvider": return boolean.class; case "useprofilecredentialsprovider": case "useProfileCredentialsProvider": return boolean.class; + case "usesessioncredentials": + case "useSessionCredentials": return boolean.class; default: return null; } } @@ -123,6 +131,8 @@ public class AWSConfigEndpointConfigurer extends PropertyConfigurerSupport imple case "region": return target.getConfiguration().getRegion(); case "secretkey": case "secretKey": return target.getConfiguration().getSecretKey(); + case "sessiontoken": + case "sessionToken": return target.getConfiguration().getSessionToken(); case "trustallcertificates": case "trustAllCertificates": return target.getConfiguration().isTrustAllCertificates(); case "uriendpointoverride": @@ -131,6 +141,8 @@ public class AWSConfigEndpointConfigurer extends PropertyConfigurerSupport imple case "useDefaultCredentialsProvider": return target.getConfiguration().isUseDefaultCredentialsProvider(); case "useprofilecredentialsprovider": case "useProfileCredentialsProvider": return target.getConfiguration().isUseProfileCredentialsProvider(); + case "usesessioncredentials": + case "useSessionCredentials": return target.getConfiguration().isUseSessionCredentials(); default: return null; } } diff --git a/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigEndpointUriFactory.java b/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigEndpointUriFactory.java index ca52f7b0d6d..3d2ccc27be2 100644 --- a/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigEndpointUriFactory.java +++ b/components/camel-aws/camel-aws-config/src/generated/java/org/apache/camel/component/aws/config/AWSConfigEndpointUriFactory.java @@ -21,7 +21,7 @@ public class AWSConfigEndpointUriFactory extends org.apache.camel.support.compon private static final Set<String> SECRET_PROPERTY_NAMES; private static final Set<String> MULTI_VALUE_PREFIXES; static { - Set<String> props = new HashSet<>(17); + Set<String> props = new HashSet<>(19); props.add("accessKey"); props.add("configClient"); props.add("label"); @@ -35,14 +35,17 @@ public class AWSConfigEndpointUriFactory extends org.apache.camel.support.compon props.add("proxyProtocol"); props.add("region"); props.add("secretKey"); + props.add("sessionToken"); props.add("trustAllCertificates"); props.add("uriEndpointOverride"); props.add("useDefaultCredentialsProvider"); props.add("useProfileCredentialsProvider"); + props.add("useSessionCredentials"); PROPERTY_NAMES = Collections.unmodifiableSet(props); - Set<String> secretProps = new HashSet<>(2); + Set<String> secretProps = new HashSet<>(3); secretProps.add("accessKey"); secretProps.add("secretKey"); + secretProps.add("sessionToken"); SECRET_PROPERTY_NAMES = Collections.unmodifiableSet(secretProps); MULTI_VALUE_PREFIXES = Collections.emptySet(); } diff --git a/components/camel-aws/camel-aws-config/src/generated/resources/org/apache/camel/component/aws/config/aws-config.json b/components/camel-aws/camel-aws-config/src/generated/resources/org/apache/camel/component/aws/config/aws-config.json index 1ac57b92e38..e4207d76056 100644 --- a/components/camel-aws/camel-aws-config/src/generated/resources/org/apache/camel/component/aws/config/aws-config.json +++ b/components/camel-aws/camel-aws-config/src/generated/resources/org/apache/camel/component/aws/config/aws-config.json @@ -40,9 +40,11 @@ "accessKey": { "index": 14, "kind": "property", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" }, "profileCredentialsName": { "index": 15, "kind": "property", "displayName": "Profile Credentials Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "If using a profile credentials provider this parameter will set the profil [...] "secretKey": { "index": 16, "kind": "property", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }, - "trustAllCertificates": { "index": 17, "kind": "property", "displayName": "Trust All Certificates", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the [...] - "useDefaultCredentialsProvider": { "index": 18, "kind": "property", "displayName": "Use Default Credentials Provider", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect [...] - "useProfileCredentialsProvider": { "index": 19, "kind": "property", "displayName": "Use Profile Credentials Provider", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect [...] + "sessionToken": { "index": 17, "kind": "property", "displayName": "Session Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Amazon AWS Session Token used when the user needs to assume a IAM role" }, + "trustAllCertificates": { "index": 18, "kind": "property", "displayName": "Trust All Certificates", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the [...] + "useDefaultCredentialsProvider": { "index": 19, "kind": "property", "displayName": "Use Default Credentials Provider", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect [...] + "useProfileCredentialsProvider": { "index": 20, "kind": "property", "displayName": "Use Profile Credentials Provider", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect [...] + "useSessionCredentials": { "index": 21, "kind": "property", "displayName": "Use Session Credentials", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect to use Session Cr [...] }, "headers": { "CamelAwsConfigOperation": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation we want to perform", "constantName": "org.apache.camel.component.aws.config.AWSConfigConstants#OPERATION" }, @@ -68,8 +70,10 @@ "accessKey": { "index": 11, "kind": "parameter", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" }, "profileCredentialsName": { "index": 12, "kind": "parameter", "displayName": "Profile Credentials Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "If using a profile credentials provider this parameter will set the profi [...] "secretKey": { "index": 13, "kind": "parameter", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }, - "trustAllCertificates": { "index": 14, "kind": "parameter", "displayName": "Trust All Certificates", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the [...] - "useDefaultCredentialsProvider": { "index": 15, "kind": "parameter", "displayName": "Use Default Credentials Provider", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect [...] - "useProfileCredentialsProvider": { "index": 16, "kind": "parameter", "displayName": "Use Profile Credentials Provider", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect [...] + "sessionToken": { "index": 14, "kind": "parameter", "displayName": "Session Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Amazon AWS Session Token used when the user needs to assume a IAM role" }, + "trustAllCertificates": { "index": 15, "kind": "parameter", "displayName": "Trust All Certificates", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the [...] + "useDefaultCredentialsProvider": { "index": 16, "kind": "parameter", "displayName": "Use Default Credentials Provider", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect [...] + "useProfileCredentialsProvider": { "index": 17, "kind": "parameter", "displayName": "Use Profile Credentials Provider", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect [...] + "useSessionCredentials": { "index": 18, "kind": "parameter", "displayName": "Use Session Credentials", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.config.AWSConfigConfiguration", "configurationField": "configuration", "description": "Set whether the Config client should expect to use Session C [...] } } diff --git a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigComponent.java b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigComponent.java index 1c0af0e8134..f64ffbc719d 100644 --- a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigComponent.java +++ b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigComponent.java @@ -49,10 +49,11 @@ public class AWSConfigComponent extends HealthCheckComponent { setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) && Boolean.FALSE.equals(configuration.isUseProfileCredentialsProvider()) + && Boolean.FALSE.equals(configuration.isUseSessionCredentials()) && configuration.getConfigClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { throw new IllegalArgumentException( - "useDefaultCredentialsProvider is set to false, useProfileCredentialsProvider is set to false, Amazon ecs client or accessKey and secretKey must be specified"); + "useDefaultCredentialsProvider is set to false, useProfileCredentialsProvider is set to false, useSessionCredentials is set to false, Amazon config client or accessKey and secretKey must be specified"); } return endpoint; diff --git a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigConfiguration.java b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigConfiguration.java index 6709652910b..85e614e99ca 100644 --- a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigConfiguration.java +++ b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigConfiguration.java @@ -37,6 +37,8 @@ public class AWSConfigConfiguration implements Cloneable { private String accessKey; @UriParam(label = "security", secret = true) private String secretKey; + @UriParam(label = "security", secret = true) + private String sessionToken; @UriParam @Metadata(required = true) private AWSConfigOperations operation; @@ -61,6 +63,8 @@ public class AWSConfigConfiguration implements Cloneable { @UriParam(label = "security") private boolean useProfileCredentialsProvider; @UriParam(label = "security") + private boolean useSessionCredentials; + @UriParam(label = "security") private String profileCredentialsName; public ConfigClient getConfigClient() { @@ -96,6 +100,17 @@ public class AWSConfigConfiguration implements Cloneable { this.secretKey = secretKey; } + public String getSessionToken() { + return sessionToken; + } + + /** + * Amazon AWS Session Token used when the user needs to assume a IAM role + */ + public void setSessionToken(String sessionToken) { + this.sessionToken = sessionToken; + } + public AWSConfigOperations getOperation() { return operation; } @@ -220,6 +235,18 @@ public class AWSConfigConfiguration implements Cloneable { this.useProfileCredentialsProvider = useProfileCredentialsProvider; } + public boolean isUseSessionCredentials() { + return useSessionCredentials; + } + + /** + * Set whether the Config client should expect to use Session Credentials. This is useful in situation in which the + * user needs to assume a IAM role for doing operations in Config. + */ + public void setUseSessionCredentials(boolean useSessionCredentials) { + this.useSessionCredentials = useSessionCredentials; + } + public String getProfileCredentialsName() { return profileCredentialsName; } diff --git a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/client/AWSConfigClientFactory.java b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/client/AWSConfigClientFactory.java index 4f3119ab7ca..0dcd31f101e 100644 --- a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/client/AWSConfigClientFactory.java +++ b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/client/AWSConfigClientFactory.java @@ -19,6 +19,7 @@ package org.apache.camel.component.aws.config.client; import org.apache.camel.component.aws.config.AWSConfigConfiguration; import org.apache.camel.component.aws.config.client.impl.AWSConfigClientIAMOptimizedImpl; import org.apache.camel.component.aws.config.client.impl.AWSConfigClientIAMProfileOptimizedImpl; +import org.apache.camel.component.aws.config.client.impl.AWSConfigClientSessionTokenImpl; import org.apache.camel.component.aws.config.client.impl.AWSConfigClientStandardImpl; /** @@ -40,6 +41,8 @@ public final class AWSConfigClientFactory { return new AWSConfigClientIAMOptimizedImpl(configuration); } else if (Boolean.TRUE.equals(configuration.isUseProfileCredentialsProvider())) { return new AWSConfigClientIAMProfileOptimizedImpl(configuration); + } else if (Boolean.TRUE.equals(configuration.isUseSessionCredentials())) { + return new AWSConfigClientSessionTokenImpl(configuration); } else { return new AWSConfigClientStandardImpl(configuration); } diff --git a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/client/impl/AWSConfigClientSessionTokenImpl.java b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/client/impl/AWSConfigClientSessionTokenImpl.java new file mode 100644 index 00000000000..b0c368a9ec2 --- /dev/null +++ b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/client/impl/AWSConfigClientSessionTokenImpl.java @@ -0,0 +1,111 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.camel.component.aws.config.client.impl; + +import java.net.URI; + +import org.apache.camel.component.aws.config.AWSConfigConfiguration; +import org.apache.camel.component.aws.config.client.AWSConfigInternalClient; +import org.apache.camel.util.ObjectHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import software.amazon.awssdk.auth.credentials.AwsSessionCredentials; +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.config.ConfigClient; +import software.amazon.awssdk.services.config.ConfigClientBuilder; +import software.amazon.awssdk.utils.AttributeMap; + +/** + * Manage an AWS Config client for all users to use. This implementation is for local instances to use a static and + * solid credential set. + */ +public class AWSConfigClientSessionTokenImpl implements AWSConfigInternalClient { + private static final Logger LOG = LoggerFactory.getLogger(AWSConfigClientSessionTokenImpl.class); + private AWSConfigConfiguration configuration; + + /** + * Constructor that uses the config file. + */ + public AWSConfigClientSessionTokenImpl(AWSConfigConfiguration configuration) { + LOG.trace("Creating an AWS Config manager using static credentials."); + this.configuration = configuration; + } + + /** + * Getting the Config AWS client that is used. + * + * @return Amazon Config Client. + */ + @Override + public ConfigClient getConfigClient() { + ConfigClient client = null; + ConfigClientBuilder clientBuilder = ConfigClient.builder(); + ProxyConfiguration.Builder proxyConfig = null; + ApacheHttpClient.Builder httpClientBuilder = null; + boolean isClientConfigFound = false; + if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) { + proxyConfig = ProxyConfiguration.builder(); + URI proxyEndpoint = URI.create(configuration.getProxyProtocol() + "://" + configuration.getProxyHost() + ":" + + configuration.getProxyPort()); + proxyConfig.endpoint(proxyEndpoint); + httpClientBuilder = ApacheHttpClient.builder().proxyConfiguration(proxyConfig.build()); + isClientConfigFound = true; + } + if (configuration.getAccessKey() != null && configuration.getSecretKey() != null + && configuration.getSessionToken() != null) { + AwsSessionCredentials cred = AwsSessionCredentials.create(configuration.getAccessKey(), + configuration.getSecretKey(), configuration.getSessionToken()); + if (isClientConfigFound) { + clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder) + .credentialsProvider(StaticCredentialsProvider.create(cred)); + } else { + clientBuilder = clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred)); + } + } else { + if (!isClientConfigFound) { + clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder); + } + } + if (ObjectHelper.isNotEmpty(configuration.getRegion())) { + clientBuilder = clientBuilder.region(Region.of(configuration.getRegion())); + } + if (configuration.isOverrideEndpoint()) { + clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride())); + } + if (configuration.isTrustAllCertificates()) { + if (httpClientBuilder == null) { + httpClientBuilder = ApacheHttpClient.builder(); + } + SdkHttpClient ahc = httpClientBuilder.buildWithDefaults(AttributeMap + .builder() + .put( + SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, + Boolean.TRUE) + .build()); + // set created http client to use instead of builder + clientBuilder.httpClient(ahc); + clientBuilder.httpClientBuilder(null); + } + client = clientBuilder.build(); + return client; + } +} diff --git a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigClientFactoryTest.java b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigClientFactoryTest.java index e6e47de6e7a..64951e30867 100644 --- a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigClientFactoryTest.java +++ b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigClientFactoryTest.java @@ -19,6 +19,7 @@ package org.apache.camel.component.aws.config; import org.apache.camel.component.aws.config.client.AWSConfigClientFactory; import org.apache.camel.component.aws.config.client.AWSConfigInternalClient; import org.apache.camel.component.aws.config.client.impl.AWSConfigClientIAMOptimizedImpl; +import org.apache.camel.component.aws.config.client.impl.AWSConfigClientSessionTokenImpl; import org.apache.camel.component.aws.config.client.impl.AWSConfigClientStandardImpl; import org.junit.jupiter.api.Test; @@ -48,4 +49,12 @@ public class AWSConfigClientFactoryTest { AWSConfigInternalClient configClient = AWSConfigClientFactory.getConfigClient(configConfiguration); assertTrue(configClient instanceof AWSConfigClientIAMOptimizedImpl); } + + @Test + public void getSessionTokenConfigClient() { + AWSConfigConfiguration configConfiguration = new AWSConfigConfiguration(); + configConfiguration.setUseSessionCredentials(true); + AWSConfigInternalClient configClient = AWSConfigClientFactory.getConfigClient(configConfiguration); + assertTrue(configClient instanceof AWSConfigClientSessionTokenImpl); + } }
