Skip to content
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

Jump to bottom

Fix parsing of long host with no scheme #351

Merged
merged 4 commits into from Nov 26, 2019
Merged

Fix parsing of long host with no scheme #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
caea7af
Add failing test for long host with no scheme
avitex Nov 12, 2019
cc9b27a
Fix failing test for long host with no scheme
avitex Nov 12, 2019
d627f3c
Add failing test for long uri with port and no scheme
avitex Nov 13, 2019
d3394b0
Fix failing test for long uri with port and no scheme
avitex Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/uri/scheme.rs
View file
Open in desktop
Expand Up @@ -336,10 +336,6 @@ impl Scheme2<usize> {
for i in 0..s.len() {
let b = s[i];

if i == MAX_SCHEME_LEN {
return Err(ErrorKind::SchemeTooLong.into());
}

match SCHEME_CHARS[b as usize] {
b':' => {
// Not enough data remaining
Expand All @@ -352,6 +348,10 @@ impl Scheme2<usize> {
break;
}

if i > MAX_SCHEME_LEN {
return Err(ErrorKind::SchemeTooLong.into());
}

// Return scheme
return Ok(Scheme2::Other(i));
}
Expand Down
38 changes: 37 additions & 1 deletion src/uri/tests.rs
View file
Open in desktop
Expand Up @@ -231,6 +231,30 @@ test_parse! {
port_part = None,
}

test_parse! {
test_uri_parse_long_host_with_no_scheme,
"thequickbrownfoxjumpedoverthelazydogtofindthelargedangerousdragon.localhost",
[],

scheme_part = None,
authority_part = part!("thequickbrownfoxjumpedoverthelazydogtofindthelargedangerousdragon.localhost"),
path = "",
query = None,
port_part = None,
}

test_parse! {
test_uri_parse_long_host_with_port_and_no_scheme,
"thequickbrownfoxjumpedoverthelazydogtofindthelargedangerousdragon.localhost:1234",
[],

scheme_part = None,
authority_part = part!("thequickbrownfoxjumpedoverthelazydogtofindthelargedangerousdragon.localhost:1234"),
path = "",
query = None,
port_part = Port::from_str("1234").ok(),
}

test_parse! {
test_userinfo1,
"http://a:b@127.0.0.1:1234/",
Expand Down Expand Up @@ -430,7 +454,7 @@ fn test_max_uri_len() {
}

#[test]
fn test_long_scheme() {
fn test_overflowing_scheme() {
let mut uri = vec![];
uri.extend(vec![b'a'; 256]);
uri.extend(b"://localhost/");
Expand All @@ -441,6 +465,18 @@ fn test_long_scheme() {
assert_eq!(res.unwrap_err().0, ErrorKind::SchemeTooLong);
}

#[test]
fn test_max_length_scheme() {
let mut uri = vec![];
uri.extend(vec![b'a'; 64]);
uri.extend(b"://localhost/");

let uri = String::from_utf8(uri).unwrap();
let uri: Uri = uri.parse().unwrap();

assert_eq!(uri.scheme_str().unwrap().len(), 64);
}

#[test]
fn test_uri_to_path_and_query() {
let cases = vec![
Expand Down