Skip to content

fix oauth filter sds update #16253

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
snowp merged 13 commits into from
May 14, 2021
Merged

fix oauth filter sds update #16253

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5108686
fix oauth filter sds update
Apr 30, 2021
948a0f4
fix format check
Apr 30, 2021
6ee2773
code refactoring
Apr 30, 2021
d4b5c12
add test for oauth dynamic sds
May 2, 2021
f8c5d39
small changes in the test
May 3, 2021
f4b3755
more changes in the tests
May 4, 2021
d166c84
intefration test for the dynamic secret
May 7, 2021
cd71d20
fix secret update race condition
May 7, 2021
e87f907
delete unuse test config
May 7, 2021
4ac587a
set resource_api_version explicitly
May 8, 2021
05cee4f
fix tsan build
May 8, 2021
21e7131
review code fix
May 11, 2021
4da1c5b
add tests for parseSetCookie
May 12, 2021
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
13 changes: 7 additions & 6 deletions source/extensions/filters/http/oauth2/filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@ class SDSSecretReader : public SecretReader {
Secret::GenericSecretConfigProviderSharedPtr token_secret_provider, Api::Api& api)
: api_(api), client_secret_provider_(std::move(client_secret_provider)),
token_secret_provider_(std::move(token_secret_provider)) {
readAndWatchSecret(client_secret_, *client_secret_provider_);
readAndWatchSecret(token_secret_, *token_secret_provider_);
readAndWatchSecret(client_secret_, *client_secret_provider_, update_callback_client_);
readAndWatchSecret(token_secret_, *token_secret_provider_, update_callback_token_);
}

const std::string& clientSecret() const override { return client_secret_; }

const std::string& tokenSecret() const override { return token_secret_; }

private:
void readAndWatchSecret(std::string& value,
Secret::GenericSecretConfigProvider& secret_provider) {
void readAndWatchSecret(std::string& value, Secret::GenericSecretConfigProvider& secret_provider,

@dmitri-d dmitri-d Apr 30, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you return the update_callback from the method instead of using a parameter? I think it would be more readable...

@Inode1 Inode1 Apr 30, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point.

Envoy::Common::CallbackHandlePtr& update_callback) {
const auto* secret = secret_provider.secret();
if (secret != nullptr) {
value = Config::DataSource::read(secret->secret(), true, api_);
}

update_callback_ = secret_provider.addUpdateCallback([&secret_provider, this, &value]() {
update_callback = secret_provider.addUpdateCallback([&secret_provider, this, &value]() {
const auto* secret = secret_provider.secret();
if (secret != nullptr) {
value = Config::DataSource::read(secret->secret(), true, api_);
Expand All @@ -77,7 +77,8 @@ class SDSSecretReader : public SecretReader {
std::string client_secret_;
std::string token_secret_;
Api::Api& api_;
Envoy::Common::CallbackHandlePtr update_callback_;
Envoy::Common::CallbackHandlePtr update_callback_client_;
Envoy::Common::CallbackHandlePtr update_callback_token_;

Secret::GenericSecretConfigProviderSharedPtr client_secret_provider_;
Secret::GenericSecretConfigProviderSharedPtr token_secret_provider_;
Expand Down