Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,19 @@ namespace Aws
*/
virtual AWSCredentials GetAWSCredentials() = 0;

/**
* Forces reloading the credentials returned by GetAWSCredentials().
* Credentials are reloaded when they're expired or due to their reload frequency or after this function is called.
*/
virtual void SetNeedRefresh();

protected:
/**
* The default implementation keeps up with the cache times and lets you know if it's time to refresh your internal caching
* to aid your implementation of GetAWSCredentials.
*/
virtual bool IsTimeToRefresh(long reloadFrequency);
virtual bool IsSetNeedRefresh();
virtual void Reload();
mutable Aws::Utils::Threading::ReaderWriterLock m_reloadLock;
private:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ namespace Aws
*/
virtual AWSCredentials GetAWSCredentials();

virtual void SetNeedRefresh();

/**
* Gets all providers stored in this chain.
*/
Expand Down
16 changes: 16 additions & 0 deletions src/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,22 @@ bool AWSCredentialsProvider::IsTimeToRefresh(long reloadFrequency)
return false;
}

void AWSCredentialsProvider::SetNeedRefresh()
{
ReaderLockGuard guard(m_reloadLock);
if (m_lastLoadedMs != 0)
{
guard.UpgradeToWriterLock();
m_lastLoadedMs = 0;
}
}

bool AWSCredentialsProvider::IsSetNeedRefresh()
{
/// This function is called from implementations of RefreshIfExpired() at the point when m_reloadLock is locked.
return m_lastLoadedMs == 0;
}


static const char* ENVIRONMENT_LOG_TAG = "EnvironmentAWSCredentialsProvider";

Expand Down
13 changes: 13 additions & 0 deletions src/aws-cpp-sdk-core/source/auth/AWSCredentialsProviderChain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,19 @@ AWSCredentials AWSCredentialsProviderChain::GetAWSCredentials()
return AWSCredentials();
}

void AWSCredentialsProviderChain::SetNeedRefresh()
{
for (auto&& credentialsProvider : m_providerChain)
credentialsProvider->SetNeedRefresh();

ReaderLockGuard lock(m_cachedProviderLock);
if (m_cachedProvider)
{
lock.UpgradeToWriterLock();
m_cachedProvider.reset();
}
}

DefaultAWSCredentialsProviderChain::DefaultAWSCredentialsProviderChain() : AWSCredentialsProviderChain()
{
AddProvider(Aws::MakeShared<EnvironmentAWSCredentialsProvider>(DefaultCredentialsProviderChainTag));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,15 @@ void GeneralHTTPCredentialsProvider::Reload()
token = credentialsView.GetString("Token");
AWS_LOGSTREAM_DEBUG(GEN_HTTP_LOG_TAG, "Successfully pulled credentials from metadata service with access key " << accessKey);

auto old_credentials = m_credentials;

m_credentials.SetAWSAccessKeyId(accessKey);
m_credentials.SetAWSSecretKey(secretKey);
m_credentials.SetSessionToken(token);
m_credentials.SetExpiration(Aws::Utils::DateTime(credentialsView.GetString("Expiration"), Aws::Utils::DateFormat::ISO_8601));
AWSCredentialsProvider::Reload();

AWS_LOGSTREAM_DEBUG(GEN_HTTP_LOG_TAG, "Got " << ((m_credentials == old_credentials) ? "same " : "") << "credentials from ECSCredentialService.");
}

void GeneralHTTPCredentialsProvider::RefreshIfExpired()
Expand Down
Loading