-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: auth token helper methods (#198)
- feat: add connection options for federated authentication - refactor: move auth token methods to a separate helper class
- Loading branch information
Showing
17 changed files
with
438 additions
and
165 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // This program is free software; you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License, version 2.0 | ||
| // (GPLv2), as published by the Free Software Foundation, with the | ||
| // following additional permissions: | ||
| // | ||
| // This program is distributed with certain software that is licensed | ||
| // under separate terms, as designated in a particular file or component | ||
| // or in the license documentation. Without limiting your rights under | ||
| // the GPLv2, the authors of this program hereby grant you an additional | ||
| // permission to link the program and your derivative works with the | ||
| // separately licensed software that they have included with the program. | ||
| // | ||
| // Without limiting the foregoing grant of rights under the GPLv2 and | ||
| // additional permission as to separately licensed software, this | ||
| // program is also subject to the Universal FOSS Exception, version 1.0, | ||
| // a copy of which can be found along with its FAQ at | ||
| // http://oss.oracle.com/licenses/universal-foss-exception. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, but | ||
| // WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| // See the GNU General Public License, version 2.0, for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see | ||
| // http://www.gnu.org/licenses/gpl-2.0.html. | ||
|
|
||
| #include "adfs_proxy.h" | ||
| #include "driver.h" | ||
|
|
||
| ADFS_PROXY::ADFS_PROXY(DBC* dbc, DataSource* ds) : ADFS_PROXY(dbc, ds, nullptr) {}; | ||
|
|
||
| ADFS_PROXY::ADFS_PROXY(DBC* dbc, DataSource* ds, CONNECTION_PROXY* next_proxy) : CONNECTION_PROXY(dbc, ds) { | ||
| this->next_proxy = next_proxy; | ||
| if (ds->opt_AUTH_REGION) { | ||
| this->auth_util = std::make_shared<AUTH_UTIL>((const char*)ds->opt_AUTH_REGION); | ||
| } | ||
| else { | ||
| this->auth_util = std::make_shared<AUTH_UTIL>(); | ||
| } | ||
| } | ||
|
|
||
| #ifdef UNIT_TEST_BUILD | ||
| ADFS_PROXY::ADFS_PROXY(DBC* dbc, DataSource* ds, CONNECTION_PROXY* next_proxy, | ||
| std::shared_ptr<AUTH_UTIL> auth_util) : CONNECTION_PROXY(dbc, ds) { | ||
| this->next_proxy = next_proxy; | ||
| this->auth_util = auth_util; | ||
| } | ||
| #endif | ||
|
|
||
| ADFS_PROXY::~ADFS_PROXY() { this->auth_util.reset(); } | ||
|
|
||
| bool ADFS_PROXY::connect(const char* host, const char* user, const char* password, const char* database, | ||
| unsigned int port, const char* socket, unsigned long flags) { | ||
| return true; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // This program is free software; you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License, version 2.0 | ||
| // (GPLv2), as published by the Free Software Foundation, with the | ||
| // following additional permissions: | ||
| // | ||
| // This program is distributed with certain software that is licensed | ||
| // under separate terms, as designated in a particular file or component | ||
| // or in the license documentation. Without limiting your rights under | ||
| // the GPLv2, the authors of this program hereby grant you an additional | ||
| // permission to link the program and your derivative works with the | ||
| // separately licensed software that they have included with the program. | ||
| // | ||
| // Without limiting the foregoing grant of rights under the GPLv2 and | ||
| // additional permission as to separately licensed software, this | ||
| // program is also subject to the Universal FOSS Exception, version 1.0, | ||
| // a copy of which can be found along with its FAQ at | ||
| // http://oss.oracle.com/licenses/universal-foss-exception. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, but | ||
| // WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| // See the GNU General Public License, version 2.0, for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see | ||
| // http://www.gnu.org/licenses/gpl-2.0.html. | ||
|
|
||
| #ifndef __ADFS_PROXY__ | ||
| #define __ADFS_PROXY__ | ||
|
|
||
| #include <unordered_map> | ||
| #include "auth_util.h" | ||
|
|
||
| class ADFS_PROXY : public CONNECTION_PROXY { | ||
| public: | ||
| ADFS_PROXY() = default; | ||
| ADFS_PROXY(DBC* dbc, DataSource* ds); | ||
| ADFS_PROXY(DBC* dbc, DataSource* ds, CONNECTION_PROXY* next_proxy); | ||
| #ifdef UNIT_TEST_BUILD | ||
| ADFS_PROXY(DBC* dbc, DataSource* ds, CONNECTION_PROXY* next_proxy, std::shared_ptr<AUTH_UTIL> auth_util); | ||
| #endif | ||
| ~ADFS_PROXY() override; | ||
| bool connect( | ||
| const char* host, | ||
| const char* user, | ||
| const char* password, | ||
| const char* database, | ||
| unsigned int port, | ||
| const char* socket, | ||
| unsigned long flags) override; | ||
|
|
||
| protected: | ||
| static std::unordered_map<std::string, TOKEN_INFO> token_cache; | ||
| static std::mutex token_cache_mutex; | ||
| std::shared_ptr<AUTH_UTIL> auth_util; | ||
| bool using_cached_token = false; | ||
|
|
||
| static void clear_token_cache(); | ||
|
|
||
| #ifdef UNIT_TEST_BUILD | ||
| // Allows for testing private/protected methods | ||
| friend class TEST_UTILS; | ||
| #endif | ||
| }; | ||
|
|
||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // This program is free software; you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License, version 2.0 | ||
| // (GPLv2), as published by the Free Software Foundation, with the | ||
| // following additional permissions: | ||
| // | ||
| // This program is distributed with certain software that is licensed | ||
| // under separate terms, as designated in a particular file or component | ||
| // or in the license documentation. Without limiting your rights under | ||
| // the GPLv2, the authors of this program hereby grant you an additional | ||
| // permission to link the program and your derivative works with the | ||
| // separately licensed software that they have included with the program. | ||
| // | ||
| // Without limiting the foregoing grant of rights under the GPLv2 and | ||
| // additional permission as to separately licensed software, this | ||
| // program is also subject to the Universal FOSS Exception, version 1.0, | ||
| // a copy of which can be found along with its FAQ at | ||
| // http://oss.oracle.com/licenses/universal-foss-exception. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, but | ||
| // WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| // See the GNU General Public License, version 2.0, for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see | ||
| // http://www.gnu.org/licenses/gpl-2.0.html. | ||
|
|
||
| #include "auth_util.h" | ||
| #include "aws_sdk_helper.h" | ||
| #include "driver.h" | ||
|
|
||
| namespace { | ||
| AWS_SDK_HELPER SDK_HELPER; | ||
| } | ||
|
|
||
| AUTH_UTIL::AUTH_UTIL(const char* region) { | ||
| ++SDK_HELPER; | ||
|
|
||
| Aws::Auth::DefaultAWSCredentialsProviderChain credentials_provider; | ||
| Aws::Auth::AWSCredentials credentials = credentials_provider.GetAWSCredentials(); | ||
|
|
||
| Aws::RDS::RDSClientConfiguration client_config; | ||
| if (region) { | ||
| client_config.region = region; | ||
| } | ||
|
|
||
| this->rds_client = std::make_shared<Aws::RDS::RDSClient>(credentials, client_config); | ||
| }; | ||
|
|
||
| std::string AUTH_UTIL::get_auth_token(const char* host, const char* region, unsigned int port, const char* user) { | ||
| return this->rds_client->GenerateConnectAuthToken(host, region, port, user); | ||
| } | ||
|
|
||
| std::string AUTH_UTIL::build_cache_key(const char* host, const char* region, unsigned int port, const char* user) { | ||
| // Format should be "<region>:<host>:<port>:<user>" | ||
| return std::string(region).append(":").append(host).append(":").append(std::to_string(port)).append(":").append(user); | ||
| } | ||
|
|
||
| AUTH_UTIL::~AUTH_UTIL() { | ||
| this->rds_client.reset(); | ||
| --SDK_HELPER; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // This program is free software; you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License, version 2.0 | ||
| // (GPLv2), as published by the Free Software Foundation, with the | ||
| // following additional permissions: | ||
| // | ||
| // This program is distributed with certain software that is licensed | ||
| // under separate terms, as designated in a particular file or component | ||
| // or in the license documentation. Without limiting your rights under | ||
| // the GPLv2, the authors of this program hereby grant you an additional | ||
| // permission to link the program and your derivative works with the | ||
| // separately licensed software that they have included with the program. | ||
| // | ||
| // Without limiting the foregoing grant of rights under the GPLv2 and | ||
| // additional permission as to separately licensed software, this | ||
| // program is also subject to the Universal FOSS Exception, version 1.0, | ||
| // a copy of which can be found along with its FAQ at | ||
| // http://oss.oracle.com/licenses/universal-foss-exception. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, but | ||
| // WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| // See the GNU General Public License, version 2.0, for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see | ||
| // http://www.gnu.org/licenses/gpl-2.0.html. | ||
|
|
||
| #ifndef __AUTH_UTIL__ | ||
| #define __AUTH_UTIL__ | ||
|
|
||
| #include <aws/core/auth/AWSCredentialsProviderChain.h> | ||
| #include <aws/rds/RDSClient.h> | ||
|
|
||
| #include "connection_proxy.h" | ||
|
|
||
| constexpr auto DEFAULT_TOKEN_EXPIRATION_SEC = 15 * 60; | ||
|
|
||
| class TOKEN_INFO { | ||
| public: | ||
| TOKEN_INFO() {}; | ||
| TOKEN_INFO(std::string token) : TOKEN_INFO(token, DEFAULT_TOKEN_EXPIRATION_SEC) {}; | ||
| TOKEN_INFO(std::string token, unsigned int seconds_until_expiration) { | ||
| this->token = token; | ||
| this->expiration_time = std::chrono::system_clock::now() + std::chrono::seconds(seconds_until_expiration); | ||
| } | ||
|
|
||
| bool is_expired() { | ||
| std::chrono::system_clock::time_point current_time = std::chrono::system_clock::now(); | ||
| return current_time > this->expiration_time; | ||
| } | ||
|
|
||
| std::string token; | ||
|
|
||
| private: | ||
| std::chrono::system_clock::time_point expiration_time; | ||
| }; | ||
|
|
||
| class AUTH_UTIL { | ||
| public: | ||
| AUTH_UTIL() {}; | ||
| AUTH_UTIL(const char* region); | ||
| ~AUTH_UTIL(); | ||
|
|
||
| virtual std::string get_auth_token(const char* host, const char* region, unsigned int port, const char* user); | ||
| static std::string build_cache_key(const char* host, const char* region, unsigned int port, const char* user); | ||
|
|
||
| private: | ||
| std::shared_ptr<Aws::RDS::RDSClient> rds_client; | ||
|
|
||
| #ifdef UNIT_TEST_BUILD | ||
| // Allows for testing private/protected methods | ||
| friend class TEST_UTILS; | ||
| #endif | ||
| }; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.