github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

EnvironmentCredential with ClientSecretCredential support (#442)

Browse Source
This commit is contained in:
Anton Kolesnyk 2020-08-13 14:28:08 -07:00 committed by GitHub
parent e3394ec3f5
commit cc78776bcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 86 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sdk/core/azure-core/inc/credentials/credentials.hpp
View File

@ -3,8 +3,10 @@
#pragma once
#include <chrono>
#include <context.hpp>
#include <chrono>
#include <memory>
#include <stdexcept>
#include <string>
#include <utility>
@ -23,9 +25,10 @@ namespace Azure { namespace Core { namespace Credentials {
virtual AccessToken GetToken(Context const& context, std::vector<std::string> const& scopes)
const = 0;
virtual ~TokenCredential() = default;
protected:
TokenCredential() {}
virtual ~TokenCredential(){};
private:
TokenCredential(TokenCredential const&) = delete;
@ -36,10 +39,10 @@ namespace Azure { namespace Core { namespace Credentials {
private:
static std::string const g_aadGlobalAuthority;
std::string const m_tenantId;
std::string const m_clientId;
std::string const m_clientSecret;
std::string const m_authority;
std::string m_tenantId;
std::string m_clientId;
std::string m_clientSecret;
std::string m_authority;
public:
explicit ClientSecretCredential(
@ -61,4 +64,14 @@ namespace Azure { namespace Core { namespace Credentials {
explicit AuthenticationException(std::string const& msg) : std::runtime_error(msg) {}
};
class EnvironmentCredential : public TokenCredential {
std::unique_ptr<TokenCredential> m_credentialImpl;
public:
explicit EnvironmentCredential();
AccessToken GetToken(Context const& context, std::vector<std::string> const& scopes)
const override;
};
}}} // namespace Azure::Core::Credentials

67
sdk/core/azure-core/src/credentials/credentials.cpp
View File

@ -6,6 +6,8 @@
#include <http/curl/curl.hpp>
#include <http/http.hpp>
#include <http/pipeline.hpp>
#include <cstdlib>
#include <iomanip>
#include <sstream>
#include <stdexcept>
@ -196,3 +198,68 @@ AccessToken Azure::Core::Credentials::ClientSecretCredential::GetToken(
throw AuthenticationException("unknown error");
}
}
Azure::Core::Credentials::EnvironmentCredential::EnvironmentCredential()
{
#ifdef _MSC_VER
#pragma warning(push)
// warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s
// instead.
#pragma warning(disable : 4996)
#endif
auto tenantId = std::getenv("AZURE_TENANT_ID");
auto clientId = std::getenv("AZURE_CLIENT_ID");
auto clientSecret = std::getenv("AZURE_CLIENT_SECRET");
auto authority = std::getenv("AZURE_AUTHORITY_HOST");
// auto username = std::getenv("AZURE_USERNAME");
// auto password = std::getenv("AZURE_PASSWORD");
//
// auto clientCertificatePath = std::getenv("AZURE_CLIENT_CERTIFICATE_PATH");
#ifdef _MSC_VER
#pragma warning(pop)
#endif
if (tenantId != nullptr && clientId != nullptr)
{
if (clientSecret != nullptr)
{
if (authority != nullptr)
{
m_credentialImpl.reset(
new ClientSecretCredential(tenantId, clientId, clientSecret, authority));
}
else
{
m_credentialImpl.reset(new ClientSecretCredential(tenantId, clientId, clientSecret));
}
}
// TODO: These credential types are not implemented. Uncomment when implemented.
// else if (username != nullptr && password != nullptr)
//{
// m_credentialImpl.reset(
// new UsernamePasswordCredential(username, password, tenantId, clientId));
//}
// else if (clientCertificatePath != nullptr)
//{
// m_credentialImpl.reset(
// new ClientCertificateCredential(tenantId, clientId, clientCertificatePath));
//}
}
}
AccessToken Azure::Core::Credentials::EnvironmentCredential::GetToken(
Context const& context,
std::vector<std::string> const& scopes) const
{
if (!m_credentialImpl)
{
throw AuthenticationException("EnvironmentCredential authentication unavailable. "
"Environment variables are not fully configured.");
}
return m_credentialImpl->GetToken(context, scopes);
}