-
Notifications
You must be signed in to change notification settings - Fork 8
Fail fast on invalid config regexes and enabled config #461
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
prk-Jr
wants to merge
17
commits into
main
Choose a base branch
from
fix/config-regex-hardening
base: main
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.
+1,373
−456
Open
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
c72f7c8
Wip config regex hardening
prk-Jr 8b67018
Harden config regex failures and close Next.js rewrite gaps
prk-Jr ec89235
Tighten regex hardening
prk-Jr 705fed3
Remove test header
prk-Jr 5a4de00
Merge branch 'main' into fix/config-regex-hardening
aram356 b94deaf
Address PR hardening review feedback
prk-Jr 63cbb72
Replace once_cell::sync::Lazy with std::sync::LazyLock
prk-Jr 660d97a
Merge branch 'main' into fix/config-regex-hardening
prk-Jr 3e1b2dd
Simplify UrlRewriter change detection using string equality
prk-Jr 49cbbf7
Merge branch 'main' into fix/config-regex-hardening
prk-Jr f8bbb69
Do not inject Accept-Encoding when client sent none
prk-Jr da2aade
Remove unused SUPPORTED_ENCODINGS constant
prk-Jr ba16b96
Merge branch 'main' into fix/config-regex-hardening
prk-Jr ae24c6b
Address PR review feedback on config-regex-hardening
prk-Jr ff395ec
Merge branch 'main' into fix/config-regex-hardening
prk-Jr 9ace4f0
Merge branch 'main' into fix/config-regex-hardening
prk-Jr 3f389ee
Merge branch 'main' into fix/config-regex-hardening
aram356 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
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 |
|---|---|---|
|
|
@@ -49,7 +49,13 @@ fn main(req: Request) -> Result<Response, Error> { | |
| log::debug!("Settings {settings:?}"); | ||
|
|
||
| // Build the auction orchestrator once at startup | ||
| let orchestrator = build_orchestrator(&settings); | ||
| let orchestrator = match build_orchestrator(&settings) { | ||
| Ok(orchestrator) => orchestrator, | ||
| Err(e) => { | ||
| log::error!("Failed to build auction orchestrator: {:?}", e); | ||
| return Ok(to_error_response(&e)); | ||
| } | ||
| }; | ||
|
|
||
| let integration_registry = match IntegrationRegistry::new(&settings) { | ||
| Ok(r) => r, | ||
|
|
@@ -81,7 +87,13 @@ async fn route_request( | |
| // Extract geo info before auth check or routing consumes the request | ||
| let geo_info = GeoInfo::from_request(&req); | ||
|
|
||
| if let Some(mut response) = enforce_basic_auth(settings, &req) { | ||
| // `get_settings()` should already have rejected invalid handler regexes. | ||
| // Keep this fallback so manually-constructed or otherwise unprepared | ||
| // settings still become an error response instead of panicking. | ||
| if let Some(mut response) = enforce_basic_auth(settings, &req).unwrap_or_else(|e| { | ||
| log::error!("Failed to evaluate basic auth: {:?}", e); | ||
|
Collaborator
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. 🤔 thinking — if let Some(mut response) = enforce_basic_auth(settings, &req).unwrap_or_else(|e| {
log::error!("Failed to evaluate basic auth: {:?}", e);
Some(to_error_response(&e))
}) {A match enforce_basic_auth(settings, &req) {
Ok(Some(mut response)) => {
finalize_response(settings, geo_info.as_ref(), &mut response);
return Ok(response);
}
Ok(None) => { /* continue */ }
Err(e) => {
log::error!("Failed to evaluate basic auth: {:?}", e);
let mut response = to_error_response(&e);
finalize_response(settings, geo_info.as_ref(), &mut response);
return Ok(response);
}
} |
||
| Some(to_error_response(&e)) | ||
| }) { | ||
| finalize_response(settings, geo_info.as_ref(), &mut response); | ||
| return Ok(response); | ||
| } | ||
|
|
||
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.
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.
🔧 wrench —
once_cellversion relaxed from"1.21"to"1"without justificationThe minimum version was dropped from
1.21to1, which allows any1.xversion. This is unrelated to the PR's purpose.Suggested fix: Restore
once_cell = "1.21"or remove the dependency entirely if all usages have been migrated tostd::sync::LazyLock.