-
Notifications
You must be signed in to change notification settings - Fork 4
feat(middleware): add BearerTokenMiddleware for OAuth2 bearer token injection #1288
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.
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
Open
robhughadams
wants to merge
1
commit into
DataDog:master
Choose a base branch
from
robhughadams:feat/bearer-token-middleware
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,41 @@ | ||
| // Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. | ||
| // This product includes software developed at Datadog (https://www.datadoghq.com/). | ||
| // Copyright 2019-Present Datadog, Inc. | ||
|
|
||
| //! Bearer token middleware for OAuth2 authentication. | ||
| //! | ||
| //! Since the generated API structs only support API key auth natively, this | ||
| //! middleware allows injecting an OAuth2 bearer token at the HTTP layer when | ||
| //! using [`with_client_and_config`](crate::datadogV2::api_logs::LogsAPI::with_client_and_config). | ||
|
|
||
| use async_trait::async_trait; | ||
| use reqwest_middleware::{Middleware, Next, Result}; | ||
| use task_local_extensions::Extensions; | ||
|
|
||
| /// Injects `Authorization: Bearer <token>` into every outgoing request. | ||
| /// | ||
| /// Because the DD API client adds `DD-API-KEY` / `DD-APPLICATION-KEY` headers | ||
| /// inside each `_with_http_info` method, this middleware runs *after* those | ||
| /// headers are set. The `Authorization` header is distinct so there is no | ||
| /// conflict — both sets of headers end up on the request. | ||
| pub struct BearerTokenMiddleware { | ||
| pub token: String, | ||
| } | ||
|
|
||
| #[async_trait] | ||
| impl Middleware for BearerTokenMiddleware { | ||
| async fn handle( | ||
| &self, | ||
| mut req: reqwest::Request, | ||
| extensions: &mut Extensions, | ||
| next: Next<'_>, | ||
| ) -> Result<reqwest::Response> { | ||
| req.headers_mut().insert( | ||
| reqwest::header::AUTHORIZATION, | ||
| format!("Bearer {}", self.token) | ||
| .parse() | ||
| .expect("bearer token is valid header value"), | ||
| ); | ||
| next.run(req, extensions).await | ||
| } | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -5,6 +5,9 @@ use std::fmt; | |
| mod configuration; | ||
| pub use configuration::{APIKey, Configuration, DEFAULT_USER_AGENT}; | ||
|
|
||
| pub mod middleware; | ||
| pub use middleware::BearerTokenMiddleware; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Where do we attach this? |
||
|
|
||
| #[derive(Debug, Clone)] | ||
| pub struct ResponseContent<T> { | ||
| pub status: reqwest::StatusCode, | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Although I think you can also just remove this section.