Skip to content

add timeout to IMDS when used in DefaultAzureCredential #1016

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
rylev merged 5 commits into from
Nov 29, 2022
Merged

add timeout to IMDS when used in DefaultAzureCredential #1016

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f313a6a
make checking IMDS for tokens happen last in DefaultAzureCredential
demoray Aug 16, 2022
feb9028
Merge branch 'main' into make-managed-identity-last
demoray Aug 24, 2022
279c276
Merge branch 'main' into make-managed-identity-last
demoray Nov 28, 2022
e376633
address feedback
demoray Nov 28, 2022
b6793a2
use azure-core and a minimal future rather than futures-time
demoray Nov 28, 2022
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
23 changes: 7 additions & 16 deletions sdk/identity/src/token_credentials/default_credentials.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ impl DefaultAzureCredentialBuilder {
super::EnvironmentCredential::default(),
));
}
if self.include_managed_identity_credential {
sources.push(DefaultAzureCredentialEnum::ManagedIdentity(
ImdsManagedIdentityCredential::default(),
))
}
if self.include_azure_cli_credential {
sources.push(DefaultAzureCredentialEnum::AzureCli(
AzureCliCredential::new(),
));
}
if self.include_managed_identity_credential {
sources.push(DefaultAzureCredentialEnum::ManagedIdentity(
ImdsManagedIdentityCredential::default(),
))
}
DefaultAzureCredential::with_sources(sources)
}
}
Expand Down Expand Up @@ -113,8 +113,8 @@ impl TokenCredential for DefaultAzureCredentialEnum {
///
/// The following credential types if enabled will be tried, in order:
/// - EnvironmentCredential
/// - ManagedIdentityCredential
/// - AzureCliCredential
/// - ManagedIdentityCredential
/// Consult the documentation of these credential types for more information on how they attempt authentication.
pub struct DefaultAzureCredential {
sources: Vec<DefaultAzureCredentialEnum>,
Expand All @@ -131,16 +131,7 @@ impl DefaultAzureCredential {

impl Default for DefaultAzureCredential {
fn default() -> Self {
DefaultAzureCredential {
sources: vec![
#[cfg(feature = "enable_reqwest")]
DefaultAzureCredentialEnum::Environment(super::EnvironmentCredential::default()),
DefaultAzureCredentialEnum::ManagedIdentity(
ImdsManagedIdentityCredential::default(),
),
DefaultAzureCredentialEnum::AzureCli(AzureCliCredential::new()),
],
}
DefaultAzureCredentialBuilder::new().build()
}
}

Expand Down