Skip to content

[DRAFT] Enable credential provider support for proxy environment variables #1751

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
passaro wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[DRAFT] Enable credential provider support for proxy environment variables #1751

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
14 changes: 13 additions & 1 deletion mountpoint-s3-crt/src/auth/credentials.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use mountpoint_s3_crt_sys::{
aws_credentials_provider_new_cached, aws_credentials_provider_new_chain_default,
aws_credentials_provider_new_profile, aws_credentials_provider_new_static,
aws_credentials_provider_profile_options, aws_credentials_provider_release,
aws_credentials_provider_static_options,
aws_credentials_provider_static_options, aws_http_proxy_env_var_type, proxy_env_var_settings,
};

use crate::auth::auth_library_init;
Expand Down Expand Up @@ -74,8 +74,14 @@ impl CredentialsProvider {
) -> Result<Self, Error> {
auth_library_init(allocator);

let proxy_ev_settings = proxy_env_var_settings {
env_var_type: aws_http_proxy_env_var_type::AWS_HPEV_ENABLE,
..Default::default()
};

let inner_options = aws_credentials_provider_chain_default_options {
bootstrap: options.bootstrap.inner.as_ptr(),
proxy_ev_settings: &raw const proxy_ev_settings,
..Default::default()
};

Expand Down Expand Up @@ -104,6 +110,11 @@ impl CredentialsProvider {
pub fn new_profile(allocator: &Allocator, options: CredentialsProviderProfileOptions) -> Result<Self, Error> {
auth_library_init(allocator);

let mut proxy_ev_settings = proxy_env_var_settings {
env_var_type: aws_http_proxy_env_var_type::AWS_HPEV_ENABLE,
..Default::default()
};

// SAFETY: aws_credentials_provider_new_profile makes a copy of bootstrap
// and contents of profile_name_override.
// SAFETY: aws_credentials_provider_new_cached increments the reference counter of
Expand All @@ -112,6 +123,7 @@ impl CredentialsProvider {
let inner_options = aws_credentials_provider_profile_options {
bootstrap: options.bootstrap.inner.as_ptr(),
profile_name_override: options.profile_name_override.as_aws_byte_cursor(),
proxy_ev_settings: &raw mut proxy_ev_settings,
..Default::default()
};

Expand Down
Loading