-
Notifications
You must be signed in to change notification settings - Fork 0
fix(security): outbound HTTP timeouts, streamed body cap, UTF-8-safe truncation (M1/M2/M3) #16
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
Merged
Merged
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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,32 @@ | ||
| //! Shared outbound HTTP client builder with sane timeouts (always compiled). | ||
| //! | ||
| //! Every adapter/provider/token-refresh path should build its `reqwest::Client` | ||
| //! here so a stalled upstream fails by timeout instead of pinning a task forever. | ||
|
|
||
| use std::time::Duration; | ||
|
|
||
| /// Timeout profile. Most upstreams are quick API calls; LLM-provider completions are | ||
| /// legitimately slow, so they get a longer ceiling. | ||
| #[derive(Debug, Clone, Copy)] | ||
| pub enum Profile { | ||
| /// Adapters, OAuth token exchange, token refresh. | ||
| Default, | ||
| /// LLM provider completions (slow, but still bounded). | ||
| Llm, | ||
| } | ||
|
|
||
| /// Build a `reqwest::Client` with connect + total timeouts for the given profile. | ||
| pub fn client(profile: Profile) -> reqwest::Client { | ||
| let (connect_secs, total_secs) = match profile { | ||
| Profile::Default => (5, 30), | ||
| Profile::Llm => (10, 180), | ||
| }; | ||
| reqwest::Client::builder() | ||
| .connect_timeout(Duration::from_secs(connect_secs)) | ||
| .timeout(Duration::from_secs(total_secs)) | ||
| .user_agent("relais/0.1") | ||
| .build() | ||
| // Building only fails on TLS-backend/resolver init, which is fatal config — | ||
| // fail closed at startup rather than silently returning a no-timeout client. | ||
| .expect("failed to build the HTTP client (TLS backend init?)") | ||
| } |
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
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
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.
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.
When an allowed page serves non-UTF-8 HTML (for example
Content-Type: text/html; charset=windows-1252), this now decodes the capped bytes as UTF-8 regardless of the response charset. The previousresp.text().await?path honored the declared charset, so pages with high-bit characters now reach the extractor/LLM as replacement characters or mojibake, which can corrupt extracted user-visible data. Consider retaining the response charset before streaming and decoding the capped buffer with it.Useful? React with 👍 / 👎.