Skip to content

update crt, enable HTTPS_PROXY var for crt credentials providers #3776

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

Draft
sbiscigl wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −6
Draft

update crt, enable HTTPS_PROXY var for crt credentials providers #3776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion crt/aws-crt-cpp
Open in desktop
Submodule aws-crt-cpp updated 21 files
+1 −1 VERSION
+1 −1 crt/aws-c-event-stream
+10 −0 include/aws/crt/auth/Credentials.h
+66 −0 include/aws/crt/http/HttpConnection.h
+16 −0 include/aws/crt/mqtt/Mqtt5Client.h
+6 −2 include/aws/crt/mqtt/MqttClient.h
+1 −0 include/aws/crt/mqtt/MqttTypes.h
+3 −0 include/aws/crt/mqtt/private/MqttConnectionCore.h
+39 −0 include/aws/crt/mqtt/private/MqttShared.h
+2 −2 include/aws/iot/Mqtt5Client.h
+11 −5 include/aws/iot/MqttClient.h
+20 −0 source/auth/Credentials.cpp
+18 −0 source/http/HttpConnection.cpp
+2 −0 source/iot/Mqtt5Client.cpp
+24 −9 source/iot/MqttClient.cpp
+13 −1 source/mqtt/Mqtt5Client.cpp
+6 −2 source/mqtt/MqttClient.cpp
+17 −2 source/mqtt/MqttConnectionCore.cpp
+2 −0 tests/CMakeLists.txt
+77 −0 tests/Mqtt5ClientTest.cpp
+71 −2 tests/MqttClientTest.cpp
4 changes: 2 additions & 2 deletions prefetch_crt_dependency.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# SPDX-License-Identifier: Apache-2.0.

CRT_URI_PREFIX=https://codeload.github.com/awslabs
CRT_URI=${CRT_URI_PREFIX}/aws-crt-cpp/zip/25a2e61972f5a0d517c6dc62533fdc7d7bd122a1 # v0.37.4
CRT_URI=${CRT_URI_PREFIX}/aws-crt-cpp/zip/19d1cb67f94011561368d508583efa5308618712 # v0.38.3

AWS_C_AUTH_URI=${CRT_URI_PREFIX}/aws-c-auth/zip/fc4b87655e5cd3921f18d1859193c74af4102071 # v0.10.1
AWS_C_CAL_URI=${CRT_URI_PREFIX}/aws-c-cal/zip/1cb9412158890201a6ffceed779f90fe1f48180c # v0.9.13
AWS_C_COMMON_URI=${CRT_URI_PREFIX}/aws-c-common/zip/95515a8b1ff40d5bb14f965ca4cbbe99ad1843df # v0.12.6
AWS_C_COMPRESSION_URI=${CRT_URI_PREFIX}/aws-c-compression/zip/d8264e64f698341eb03039b96b4f44702a9b3f83 # v0.3.2
AWS_C_EVENT_STREAM_URI=${CRT_URI_PREFIX}/aws-c-event-stream/zip/c741f95e9050a1a4bed4b3aa7543bd3e024f6e56 # v0.6.0
AWS_C_EVENT_STREAM_URI=${CRT_URI_PREFIX}/aws-c-event-stream/zip/66cafb1d8bb1bfeb62a7601ce03d1a6fcd4798ed # v0.6.1
AWS_C_HTTP_URI=${CRT_URI_PREFIX}/aws-c-http/zip/0d8e1a933f46b8af984dfc8168ebcdf32748c184 # v0.10.11
AWS_C_IO_URI=${CRT_URI_PREFIX}/aws-c-io/zip/bfb0819d3906502483611ce832a5ec6b897c8421 # v0.26.1
AWS_C_MQTT_URI=${CRT_URI_PREFIX}/aws-c-mqtt/zip/41b6a7d6d566a56eff69743df66c077d56a80c9d # v0.14.0
Expand Down
27 changes: 24 additions & 3 deletions src/aws-cpp-sdk-core/source/auth/ProfileCredentialsProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
/**
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0.
*/
#include <aws/core/Globals.h>
#include <aws/core/auth/CrtCredentialsProvider.h>
#include <aws/core/auth/ProfileCredentialsProvider.h>
#include <aws/core/client/UserAgent.h>
#include <aws/core/platform/Environment.h>
#include <aws/core/platform/FileSystem.h>
#include <aws/crt/auth/Credentials.h>
#include <aws/crt/http/HttpConnection.h>

#include <chrono>

Expand All @@ -17,6 +23,23 @@ const char PROFILE_AWS_CREDENTIALS_FILE[] = "AWS_SHARED_CREDENTIALS_FILE";
const char PROFILE_DEFAULT_CREDENTIALS_FILE[] = "credentials";
const char PROFILE_PROFILE_DIRECTORY[] = ".aws";
const long DEFAULT_REFRESH_RATE_MS = 300000;

std::shared_ptr<Aws::Crt::Auth::ICredentialsProvider> GetProfileCrtProvider(const char* profile) {
CredentialsProviderProfileConfig config{};
config.ProfileNameOverride = Aws::Crt::ByteCursorFromCString(profile);
config.Bootstrap = Aws::GetDefaultClientBootstrap();

Aws::Crt::Http::ProxyEnvVarOptions options{};
options.proxyEnvVarType = Aws::Crt::Http::ProxyEnvVarType::Enabled;
options.connectionType = Aws::Crt::Http::AwsHttpProxyConnectionType::Legacy;
const auto tlsOptions = Aws::GetDefaultTlsConnectionOptions();
if (tlsOptions) {
options.TlsOptions = *tlsOptions;
}
config.ProxyEnvVarOptions = options;

return CredentialsProvider::CreateCredentialsProviderProfile(config);
}
} // namespace

class ProfileCredentialsProvider::ProfileCredentialsProviderImp : public CrtCredentialsProvider {
Expand All @@ -32,9 +55,7 @@ class ProfileCredentialsProvider::ProfileCredentialsProviderImp : public CrtCred
ProfileCredentialsProviderImp(const char* profile)
: CrtCredentialsProvider(
[profile]() -> std::shared_ptr<ICredentialsProvider> {
CredentialsProviderProfileConfig config;
config.ProfileNameOverride = Aws::Crt::ByteCursorFromCString(profile);
return CredentialsProvider::CreateCredentialsProviderProfile(config);
return GetProfileCrtProvider(profile);
},
std::chrono::milliseconds(DEFAULT_REFRESH_RATE_MS), UserAgentFeature::CREDENTIALS_PROFILE,
"ProfileCredentialsProvider") {}
Expand Down
8 changes: 8 additions & 0 deletions src/aws-cpp-sdk-core/source/auth/STSCredentialsProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ std::shared_ptr<Aws::Crt::Auth::ICredentialsProvider> GetSTSCrtProvider(
}()
.c_str();

Aws::Crt::Http::ProxyEnvVarOptions options{};
options.proxyEnvVarType = Aws::Crt::Http::ProxyEnvVarType::Enabled;
options.connectionType = Aws::Crt::Http::AwsHttpProxyConnectionType::Legacy;
if (tlsOptions) {
options.TlsOptions = *tlsOptions;
}
stsConfig.ProxyEnvVarOptions = options;

return Aws::Crt::Auth::CredentialsProvider::CreateCredentialsProviderSTSWebIdentity(stsConfig);
}
} // namespace
Expand Down
Loading