Skip to content

fix(uri): update path and query validation to reject DEL character #821

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.

Sign up for GitHub

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
HaiqalAly wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −4
Open

fix(uri): update path and query validation to reject DEL character #821

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/uri/path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ impl PathAndQuery {
0x7E => {}

// potentially utf8, might not, should check
0x7F..=0xFF => {
0x80..=0xFF => {
is_maybe_not_utf8 = true;
}

Expand Down Expand Up @@ -99,7 +99,7 @@ impl PathAndQuery {
0x3D |
0x3F..=0x7E => {}

0x7F..=0xFF => {
0x80..=0xFF => {
is_maybe_not_utf8 = true;
}

Expand Down Expand Up @@ -505,7 +505,7 @@ const fn validate_path_and_query_bytes(bytes: &[u8]) -> Result<u16, PathAndQuery
|| b == b'"'
|| b == b'{'
|| b == b'}'
|| (b >= 0x7F);
|| (b >= 0x80);

if !allowed {
return Err(PathAndQueryError::InvalidPathChar);
Expand All @@ -526,7 +526,7 @@ const fn validate_path_and_query_bytes(bytes: &[u8]) -> Result<u16, PathAndQuery
|| (b >= 0x24 && b <= 0x3B)
|| b == 0x3D
|| (b >= 0x3F && b <= 0x7E)
|| (b >= 0x7F);
|| (b >= 0x80);

if !allowed {
return Err(PathAndQueryError::InvalidQueryChar);
Expand Down Expand Up @@ -652,6 +652,16 @@ mod tests {
assert_eq!(Some("pizza=🍕"), pq("/test?pizza=🍕").query());
}

#[test]
fn rejects_del_in_path() {
PathAndQuery::try_from(&[b'/', 0x7F][..]).expect_err("reject DEL");
}

#[test]
fn rejects_del_in_query() {
PathAndQuery::try_from(&[b'/', b'a', b'?', 0x7F][..]).expect_err("reject DEL");
}

#[test]
fn rejects_invalid_utf8_in_path() {
PathAndQuery::try_from(&[b'/', 0xFF][..]).expect_err("reject invalid utf8");
Expand Down