diff options
| author | Per Larsson <[email protected]> | 2022-01-25 18:36:41 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-01-25 18:36:41 +0100 |
| commit | 060c3ed4b49c6341d1a917ec728d26bda7e41494 (patch) | |
| tree | 054b147827833efd715a08f08f85d7d2e25c609c /zenserver/auth | |
| parent | Fixed missing object in project oplog response. (diff) | |
| download | zen-060c3ed4b49c6341d1a917ec728d26bda7e41494.tar.xz zen-060c3ed4b49c6341d1a917ec728d26bda7e41494.zip | |
Added auth manager with support for OIDC providers.
Diffstat (limited to 'zenserver/auth')
| -rw-r--r-- | zenserver/auth/authmgr.cpp | 72 | ||||
| -rw-r--r-- | zenserver/auth/authmgr.h | 36 | ||||
| -rw-r--r-- | zenserver/auth/authservice.cpp | 33 | ||||
| -rw-r--r-- | zenserver/auth/authservice.h | 5 |
4 files changed, 144 insertions, 2 deletions
diff --git a/zenserver/auth/authmgr.cpp b/zenserver/auth/authmgr.cpp new file mode 100644 index 000000000..af579d950 --- /dev/null +++ b/zenserver/auth/authmgr.cpp @@ -0,0 +1,72 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#include <auth/authmgr.h> +#include <zencore/logging.h> + +#include <chrono> +#include <condition_variable> +#include <shared_mutex> +#include <thread> +#include <unordered_map> + +namespace zen { + +class AuthMgrImpl final : public AuthMgr +{ +public: + AuthMgrImpl(const AuthConfig& Config) : m_Log(logging::Get("auth")) + { + ZEN_UNUSED(Config); + } + + virtual ~AuthMgrImpl() {} + + virtual void AddOpenIdProvider(const AddOpenIdProviderParams& Params) final + { + std::string NewProviderName = std::string(Params.Name); + + OpenIdProvider* NewProvider = nullptr; + + { + std::unique_lock _(m_ProviderMutex); + + if (m_OpenIdProviders.contains(NewProviderName)) + { + return; + } + + auto InsertResult = m_OpenIdProviders.emplace(NewProviderName, std::make_unique<OpenIdProvider>()); + NewProvider = InsertResult.first->second.get(); + } + + NewProvider->Name = std::string(Params.Name); + NewProvider->Url = std::string(Params.Url); + NewProvider->ClientId = std::string(Params.ClientId); + + ZEN_INFO("added OpenID provider '{} - {}'", Params.Name, Params.Url); + } + +private: + struct OpenIdProvider + { + std::string Name; + std::string Url; + std::string ClientId; + }; + + using OpenIdProviderMap = std::unordered_map<std::string, std::unique_ptr<OpenIdProvider>>; + + spdlog::logger& Log() { return m_Log; } + + spdlog::logger& m_Log; + std::mutex m_ProviderMutex; + OpenIdProviderMap m_OpenIdProviders; +}; + +std::unique_ptr<AuthMgr> +MakeAuthMgr(const AuthConfig& Config) +{ + return std::make_unique<AuthMgrImpl>(Config); +} + +} // namespace zen diff --git a/zenserver/auth/authmgr.h b/zenserver/auth/authmgr.h new file mode 100644 index 000000000..33bd15ee9 --- /dev/null +++ b/zenserver/auth/authmgr.h @@ -0,0 +1,36 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#include <zencore/string.h> + +#include <filesystem> +#include <memory> + +namespace zen { + +class AuthMgr +{ +public: + virtual ~AuthMgr() = default; + + struct AddOpenIdProviderParams + { + std::string_view Name; + std::string_view Url; + std::string_view ClientId; + }; + + virtual void AddOpenIdProvider(const AddOpenIdProviderParams& Params) = 0; + + struct AddOpenIdTokenParams + { + }; +}; + +struct AuthConfig +{ + std::filesystem::path RootDirectory; +}; + +std::unique_ptr<AuthMgr> MakeAuthMgr(const AuthConfig& Config); + +} // namespace zen diff --git a/zenserver/auth/authservice.cpp b/zenserver/auth/authservice.cpp index c6def15b4..8200b9c9b 100644 --- a/zenserver/auth/authservice.cpp +++ b/zenserver/auth/authservice.cpp @@ -1,18 +1,49 @@ // Copyright Epic Games, Inc. All Rights Reserved. #include <auth/authservice.h> +#include <auth/authmgr.h> + +#include <zencore/compactbinarybuilder.h> #include <zencore/string.h> +#include <json11.hpp> + namespace zen { using namespace std::literals; -HttpAuthService::HttpAuthService() +HttpAuthService::HttpAuthService(AuthMgr& AuthMgr) : m_AuthMgr(AuthMgr) { m_Router.RegisterRoute( "token", [this](HttpRouterRequest& RouterRequest) { HttpServerRequest& ServerRequest = RouterRequest.ServerRequest(); + + const HttpContentType ContentType = ServerRequest.RequestContentType(); + + if ((ContentType == HttpContentType::kUnknownContentType || ContentType == HttpContentType::kJSON) == false) + { + return ServerRequest.WriteResponse(HttpResponseCode::BadRequest); + } + + const IoBuffer Body = ServerRequest.ReadPayload(); + + std::string JsonText(reinterpret_cast<const char*>(Body.GetData()), Body.GetSize()); + std::string JsonError; + json11::Json TokenInfo = json11::Json::parse(JsonText, JsonError); + + if (!JsonError.empty()) + { + CbObjectWriter Response; + Response << "Result"sv << false; + Response << "Error"sv << JsonError; + + return ServerRequest.WriteResponse(HttpResponseCode::BadRequest, Response.Save()); + } + + const std::string RefreshToken = TokenInfo["RefreshToken"].string_value(); + const std::string AccessToken = TokenInfo["AccessToken"].string_value(); + ServerRequest.WriteResponse(HttpResponseCode::OK); }, HttpVerb::kPost); diff --git a/zenserver/auth/authservice.h b/zenserver/auth/authservice.h index 30b2b5864..64b86e21f 100644 --- a/zenserver/auth/authservice.h +++ b/zenserver/auth/authservice.h @@ -6,16 +6,19 @@ namespace zen { +class AuthMgr; + class HttpAuthService final : public zen::HttpService { public: - HttpAuthService(); + HttpAuthService(AuthMgr& AuthMgr); virtual ~HttpAuthService(); virtual const char* BaseUri() const override; virtual void HandleRequest(zen::HttpServerRequest& Request) override; private: + AuthMgr& m_AuthMgr; HttpRequestRouter m_Router; }; |