Adding logic for client-side authentication #204
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -42,3 +42,6 @@ _deps/ | |
|
|
||
| # Docker artifacts | ||
| *.tar | ||
|
|
||
| # Testing credentials file | ||
| testing_credentials.json | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,193 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| #include "http_client_base.h" | ||
|
|
||
| #include <chrono> | ||
|
|
||
| #include "json_request.h" | ||
|
|
||
| HttpClientBase::HeaderList HttpClientBase::DefaultJsonGetHeaders() { | ||
| HeaderList headers; | ||
| headers.insert({"Accept", kJsonContentType}); | ||
| headers.insert({"User-Agent", kDefaultUserAgent}); | ||
| return headers; | ||
| } | ||
|
|
||
| HttpClientBase::HeaderList HttpClientBase::DefaultJsonPostHeaders() { | ||
| HeaderList headers; | ||
| headers.insert({"Content-Type", kJsonContentType}); | ||
| headers.insert({"Accept", kJsonContentType}); | ||
| headers.insert({"User-Agent", kDefaultUserAgent}); | ||
| return headers; | ||
| } | ||
|
|
||
| HttpClientBase::HttpResponse HttpClientBase::Get(const std::string& endpoint, bool auth_required) { | ||
|
argmarco-tkd marked this conversation as resolved.
|
||
| // Lambda to build the request and make the actual call. | ||
| const auto attempt = [&]() -> HttpResponse { | ||
| auto headers = DefaultJsonGetHeaders(); | ||
| if (auth_required) { | ||
| auto auth_error = AddAuthorizationHeader(headers); | ||
| if (!auth_error.empty()) { | ||
| return HttpResponse(0, "", auth_error); | ||
| } | ||
| } | ||
| return DoGet(endpoint, headers); | ||
| }; | ||
|
|
||
| // First attempt | ||
| auto result = attempt(); | ||
|
|
||
| // If we got 401 Unauthorized and auth was required, invalidate token and retry once | ||
| // This handles cases where the cached token expired between validation and use | ||
| if (auth_required && result.status_code == 401) { | ||
| InvalidateCachedToken(); | ||
| result = attempt(); // Second (final) attempt with fresh token | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| HttpClientBase::HttpResponse HttpClientBase::Post(const std::string& endpoint, | ||
|
argmarco-tkd marked this conversation as resolved.
|
||
| const std::string& json_body, | ||
| bool auth_required) { | ||
| // Lambda to build the request and make the actual call. | ||
| const auto attempt = [&]() -> HttpResponse { | ||
| auto headers = DefaultJsonPostHeaders(); | ||
| if (auth_required) { | ||
| auto auth_error = AddAuthorizationHeader(headers); | ||
| if (!auth_error.empty()) { | ||
| return HttpResponse(0, "", auth_error); | ||
| } | ||
| } | ||
| return DoPost(endpoint, json_body, headers); | ||
| }; | ||
|
|
||
| // First attempt | ||
| auto result = attempt(); | ||
|
|
||
| // If we got 401 Unauthorized and auth was required, invalidate token and retry once | ||
| // This handles cases where the cached token expired between validation and use | ||
| if (auth_required && result.status_code == 401) { | ||
| InvalidateCachedToken(); | ||
| result = attempt(); // Second (final) attempt with fresh token | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| std::string HttpClientBase::AddAuthorizationHeader(HeaderList& headers) { | ||
| // Get the valid token or an error message. | ||
| std::string token_or_error; | ||
| auto token_opt = EnsureValidToken(token_or_error); | ||
| if (!token_opt.has_value()) { | ||
| return token_or_error; | ||
| } | ||
|
|
||
| // Replace any existing Authorization header with: "<token_type> <token>". | ||
| // Return an empty string if successful, otherwise return the error message. | ||
| headers.erase(kAuthorizationHeader); | ||
| std::string auth_value = token_opt->token_type; | ||
| if (auth_value.back() != ' ') { | ||
| auth_value.push_back(' '); | ||
| } | ||
| auth_value += token_opt->token; | ||
| headers.insert({kAuthorizationHeader, auth_value}); | ||
|
argmarco-tkd marked this conversation as resolved.
|
||
| return ""; | ||
| } | ||
|
|
||
| std::optional<HttpClientBase::TokenWithExpiration> HttpClientBase::EnsureValidToken(std::string& error) { | ||
|
|
||
| const auto now_epoch_seconds = []() -> std::int64_t { | ||
| const auto now = std::chrono::system_clock::now(); | ||
| const auto secs = std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()).count(); | ||
| return static_cast<std::int64_t>(secs); | ||
| }; | ||
|
|
||
| // Adds padding to the expiration time to "expire" the token early and prevent going too close to the expiration time. | ||
| const auto is_token_valid_at = [&](std::int64_t now) -> bool { | ||
| return cached_token_.has_value() && | ||
| !cached_token_->token.empty() && | ||
| cached_token_->expires_at > (now + kTokenExpirySkewSeconds); | ||
|
argmarco-tkd marked this conversation as resolved.
|
||
| }; | ||
|
|
||
| error.clear(); | ||
| const auto now = now_epoch_seconds(); | ||
|
|
||
| { | ||
| std::unique_lock<std::mutex> lock(token_mutex_); | ||
| if (is_token_valid_at(now)) { | ||
| return cached_token_; | ||
| } | ||
| while (token_fetch_in_progress_) { | ||
|
Collaborator
There was a problem hiding this comment. I believe we need to set
Collaborator
Author
There was a problem hiding this comment. Ah, no. It's correct as it is. The
Collaborator
There was a problem hiding this comment. got it. gave it another pass at the function, it makes sense. thanks. |
||
| token_cv_.wait(lock); | ||
| if (is_token_valid_at(now_epoch_seconds())) { | ||
| return cached_token_; | ||
| } | ||
| } | ||
| token_fetch_in_progress_ = true; | ||
| } // Release token_mutex_ here | ||
|
|
||
| // Fetch token without holding token_mutex_ | ||
| // - avoids blocking other threads from entering EnsureValidToken() and waiting on token_cv_ | ||
| // - keeps the critical section small (network I/O can be slow) | ||
| // We re-acquire token_mutex_ below to update cached_token_, clear token_fetch_in_progress_, and notify waiters. | ||
|
|
||
| std::optional<TokenWithExpiration> fetched = FetchToken(error); | ||
|
|
||
| { | ||
| std::lock_guard<std::mutex> lock(token_mutex_); | ||
| token_fetch_in_progress_ = false; | ||
| if (fetched.has_value()) { | ||
| cached_token_ = fetched; | ||
| } | ||
| } | ||
| token_cv_.notify_all(); | ||
| return fetched; | ||
| } | ||
|
|
||
| std::optional<HttpClientBase::TokenWithExpiration> HttpClientBase::FetchToken(std::string& error) { | ||
| error.clear(); | ||
| TokenRequest token_req; | ||
| token_req.credential_values_ = credentials_; | ||
|
|
||
| // IMPORTANT: call DoPost directly (authless) to avoid recursion. | ||
| auto http_resp = DoPost("/token", token_req.ToJson(), DefaultJsonPostHeaders()); | ||
| if (!http_resp.error_message.empty() || http_resp.status_code != 200) { | ||
| error = http_resp.error_message + " (status code: " + std::to_string(http_resp.status_code) + ")"; | ||
| return std::nullopt; | ||
| } | ||
|
|
||
| TokenResponse token_resp; | ||
| token_resp.Parse(http_resp.result); | ||
| if (!token_resp.IsValid()) { | ||
| error = token_resp.GetValidationError(); | ||
| if (error.empty()) { | ||
| error = "While reading token response, found an invalid token response: " + http_resp.result; | ||
| } | ||
| return std::nullopt; | ||
| } | ||
|
|
||
| TokenWithExpiration result; | ||
| result.token = token_resp.token_.value(); | ||
| result.token_type = token_resp.token_type_.value(); | ||
| result.expires_at = token_resp.expires_at_.value(); | ||
| return result; | ||
| } | ||
|
|
||
| void HttpClientBase::InvalidateCachedToken() { | ||
| std::lock_guard<std::mutex> lock(token_mutex_); | ||
| cached_token_ = std::nullopt; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.