rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Downgrade URI discord debug assertion to warning. 

Closes #1831.
This commit is contained in:
Sergio Benitez 2022-05-04 09:31:41 -07:00
parent ee4aa81847
commit 1586ef9572
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/lib/src/request/request.rs
View File

@ -973,14 +973,22 @@ impl<'r> Request<'r> {
let method = Method::from_hyp(&hyper.method)
.ok_or(Error::BadMethod(&hyper.method))?;
// In debug, make sure we agree with Hyper. Otherwise, cross our fingers
// and trust that it only gives us valid URIs like it's supposed to.
// TODO: Keep around not just the path/query, but the rest, if there?
let uri = hyper.uri.path_and_query().ok_or(Error::InvalidUri(&hyper.uri))?;
debug_assert!(Origin::parse(uri.as_str()).is_ok());
let uri = Origin::new(uri.path(), uri.query().map(Cow::Borrowed));
// In debug, make sure we agree with Hyper that the URI is valid. If we
// disagree, print a warning but continue anyway seeing as if this is a
// security issue with Hyper, there isn't much we can do.
#[cfg(debug_assertions)]
if Origin::parse(uri.as_str()).is_err() {
warn!("Hyper/Rocket URI validity discord: {:?}", uri.as_str());
info_!("Hyper believes the URI is valid while Rocket disagrees.");
info_!("This is likely a Hyper bug with potential security implications.");
warn_!("Please report this warning to Rocket's GitHub issue tracker.");
}
// Construct the request object.
let uri = Origin::new(uri.path(), uri.query().map(Cow::Borrowed));
let mut request = Request::new(rocket, method, uri);
if let Some(connection) = connection {
request.connection = connection;