repo
string | pull_number
int64 | instance_id
string | issue_numbers
sequence | base_commit
string | patch
string | test_patch
string | problem_statement
string | hints_text
string | created_at
string | version
string | updated_at
string | environment_setup_commit
string | FAIL_TO_PASS
sequence | PASS_TO_PASS
sequence | FAIL_TO_FAIL
sequence | PASS_TO_FAIL
sequence |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
hyperium/http
| 292
|
hyperium__http-292
|
[
"291"
] |
4644dae042acb15d93017b69ae2ab428eb1925f7
|
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -497,7 +497,8 @@ fn host(auth: &str) -> &str {
if host_port.as_bytes()[0] == b'[' {
let i = host_port.find(']')
.expect("parsing should validate brackets");
- &host_port[1..i]
+ // ..= ranges aren't available in 1.20, our minimum Rust version...
+ &host_port[0 .. i + 1]
} else {
host_port.split(':')
.next()
|
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -298,7 +298,7 @@ test_parse! {
scheme_part = part!("http"),
authority_part = part!("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]"),
- host = Some("2001:0db8:85a3:0000:0000:8a2e:0370:7334"),
+ host = Some("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]"),
path = "/",
query = None,
port_part = None,
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -311,7 +311,7 @@ test_parse! {
scheme_part = part!("http"),
authority_part = part!("[::1]"),
- host = Some("::1"),
+ host = Some("[::1]"),
path = "/",
query = None,
port_part = None,
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -324,7 +324,7 @@ test_parse! {
scheme_part = part!("http"),
authority_part = part!("[::]"),
- host = Some("::"),
+ host = Some("[::]"),
path = "/",
query = None,
port_part = None,
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -337,7 +337,7 @@ test_parse! {
scheme_part = part!("http"),
authority_part = part!("[2001:db8::2:1]"),
- host = Some("2001:db8::2:1"),
+ host = Some("[2001:db8::2:1]"),
path = "/",
query = None,
port_part = None,
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -350,7 +350,7 @@ test_parse! {
scheme_part = part!("http"),
authority_part = part!("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:8008"),
- host = Some("2001:0db8:85a3:0000:0000:8a2e:0370:7334"),
+ host = Some("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]"),
path = "/",
query = None,
port_part = Port::from_str("8008").ok(),
|
Uri::host with an IPv6 returns the IP without brackets
The host part of a URI with an IPv6 authority should include the brackets.
```rust
let uri = "http://[::1]/".parse::<Uri>().unwrap();
```
**Expected**:
```rust
assert_eq!(uri.host(), Some("[::1]"));
```
**Actual**:
```rust
assert_eq!(uri.host(), Some("::1"));
```
|
2019-01-23T03:00:37Z
|
0.1
|
2019-01-22T19:22:19Z
|
4a5b64d22a2db9e2a4de112cef5b93372b8ac5ed
|
[
"uri::tests::test_ipv6",
"uri::tests::test_ipv6_shorthand2",
"uri::tests::test_ipv6_shorthand",
"uri::tests::test_ipv6_shorthand3",
"uri::tests::test_ipv6_with_port"
] |
[
"header::map::test_bounds",
"extensions::test_extensions",
"header::map::skip_duplicates_during_key_iteration",
"header::name::tests::test_bounds",
"header::name::tests::test_eq_hdr_name",
"header::name::tests::test_from_hdr_name",
"header::name::tests::test_from_static_custom_long",
"header::name::tests::test_all_tokens",
"header::name::tests::test_from_static_custom_short",
"header::name::tests::test_from_static_custom_long_uppercase",
"header::name::tests::test_from_static_custom_short_symbol",
"header::name::tests::test_from_static_custom_long_symbol",
"header::name::tests::test_from_static_empty",
"header::name::test_parse_standard_headers",
"header::name::tests::test_from_static_std_symbol",
"header::value::from_i16",
"header::name::tests::test_from_static_custom_single_char",
"header::value::from_i32",
"header::value::from_isize",
"header::value::from_i64",
"header::name::tests::test_from_static_custom_short_uppercase",
"header::value::from_u64",
"header::value::from_u32",
"header::value::from_u16",
"header::name::test_standard_headers_into_bytes",
"header::name::tests::test_from_static_std",
"header::value::from_usize",
"header::name::tests::test_from_static_std_uppercase",
"header::value::from_header_name_tests::it_can_insert_header_name_as_header_value",
"header::value::test_try_from",
"header::value::try_from_header_name_tests::it_converts_using_try_from",
"header::value::test_debug",
"method::test_method_eq",
"method::test_invalid_method",
"request::tests::it_can_map_a_body_from_one_type_to_another",
"response::tests::it_can_map_a_body_from_one_type_to_another",
"uri::authority::tests::allows_percent_in_userinfo",
"uri::authority::tests::compares_to_self",
"uri::authority::tests::compares_with_a_str",
"uri::authority::tests::equal_to_self_of_same_authority",
"uri::authority::tests::compares_with_a_string",
"uri::authority::tests::equates_with_a_str",
"uri::authority::tests::equates_with_a_string",
"uri::authority::tests::equates_with_a_string_of_a_different_authority",
"uri::authority::tests::not_equal_to_self_of_different_authority",
"uri::authority::tests::not_equal_with_a_str_of_a_different_authority",
"uri::authority::tests::parse_empty_string_is_error",
"header::name::tests::test_parse_invalid_headers",
"uri::authority::tests::rejects_percent_in_hostname",
"uri::path::tests::compares_to_self",
"uri::path::tests::compares_with_a_str",
"uri::path::tests::compares_with_a_string",
"uri::path::tests::equal_to_self_of_same_path",
"uri::path::tests::equates_with_a_str",
"uri::path::tests::equates_with_a_string",
"uri::path::tests::ignores_invalid_percent_encodings",
"uri::path::tests::ignores_valid_percent_encodings",
"uri::path::tests::not_equal_to_self_of_different_path",
"uri::path::tests::not_equal_with_a_str_of_a_different_path",
"uri::path::tests::not_equal_with_a_string_of_a_different_path",
"uri::port::tests::partialeq_port",
"uri::port::tests::partialeq_port_different_reprs",
"uri::port::tests::partialeq_u16",
"uri::port::tests::u16_from_port",
"uri::tests::test_authority_uri_parts_round_trip",
"uri::tests::test_char_table",
"uri::tests::test_long_scheme",
"uri::tests::test_partial_eq_path_with_terminating_questionmark",
"uri::tests::test_percentage_encoded_path",
"uri::tests::test_query_permissive",
"uri::tests::test_uri_authority_only_one_character_issue_197",
"uri::tests::test_uri_parse_absolute_form",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_slash",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_questionmark",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_nonempty_query",
"uri::tests::test_uri_parse_absolute_form_without_path",
"uri::tests::test_uri_parse_absolute_with_default_port_http",
"uri::tests::test_max_uri_len",
"uri::tests::test_uri_parse_absolute_with_default_port_https",
"uri::tests::test_uri_parse_asterisk_form",
"uri::tests::test_uri_parse_authority_form",
"uri::tests::test_uri_parse_authority_no_port",
"uri::tests::test_uri_parse_error",
"uri::tests::test_uri_parse_fragment_questionmark",
"uri::tests::test_uri_parse_path_and_query",
"uri::tests::test_uri_parse_path_with_terminating_questionmark",
"uri::tests::test_uri_to_path_and_query",
"uri::tests::test_userinfo1",
"uri::tests::test_userinfo2",
"uri::tests::test_userinfo3",
"uri::tests::test_userinfo_pass_with_port",
"uri::tests::test_userinfo_with_port",
"append_multiple_values",
"as_header_name",
"drain_entry",
"eq",
"drain",
"get_invalid",
"insert_invalid",
"value_htab",
"into_header_name",
"smoke",
"insert_all_std_headers",
"insert_79_custom_std_headers",
"header_map_fuzz",
"from_bytes",
"equates_with_u16",
"roundtrip",
"src/request.rs - request (line 12)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1626)",
"src/lib.rs - (line 57)",
"src/request.rs - request (line 37)",
"src/header/value.rs - header::value::HeaderValue::set_sensitive (line 283)",
"src/lib.rs - (line 33)",
"src/header/value.rs - header::value::HeaderValue::is_sensitive (line 309)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 147)",
"src/header/value.rs - header::value::HeaderValue::is_empty (line 252)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 101)",
"src/lib.rs - (line 129)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1612)",
"src/request.rs - request::Builder::body (line 993)",
"src/header/name.rs - header::name::HeaderName::from_lowercase (line 1568)",
"src/lib.rs - (line 101)",
"src/header/value.rs - header::value::HeaderValue::from_static (line 61)",
"src/header/value.rs - header::value::HeaderValue::len (line 238)",
"src/lib.rs - (line 110)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 93)",
"src/header/value.rs - header::value::HeaderValue::to_str (line 215)",
"src/header/name.rs - header::name::str::eq (line 1845)",
"src/method.rs - method (line 10)",
"src/header/name.rs - header::name::HeaderName::eq (line 1825)",
"src/method.rs - method::Method (line 37)",
"src/header/value.rs - header::value::HeaderValue::from_name (line 117)",
"src/lib.rs - (line 149)",
"src/header/map.rs - header::map::HeaderMap::new (line 418)",
"src/lib.rs - (line 120)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 139)",
"src/header/value.rs - header::value::HeaderValue::as_bytes (line 269)",
"src/extensions.rs - extensions::Extensions::clear (line 154)",
"src/header/map.rs - header::map::HeaderMap<T>::with_capacity (line 442)",
"src/request.rs - request::Request (line 74)",
"src/extensions.rs - extensions::Extensions::get (line 84)",
"src/request.rs - request::Request (line 99)",
"src/extensions.rs - extensions::Extensions::insert (line 59)",
"src/extensions.rs - extensions::Extensions::remove (line 129)",
"src/extensions.rs - extensions::Extensions::get_mut (line 105)",
"src/request.rs - request::Builder::new (line 732)",
"src/header/map.rs - header::map::Entry<'a, T>::key (line 2192)",
"src/request.rs - request::Builder::version (line 865)",
"src/header/map.rs - header::map::HeaderMap<T>::is_empty (line 533)",
"src/request.rs - request::Request (line 139)",
"src/header/map.rs - header::map::HeaderMap<T>::capacity (line 580)",
"src/header/map.rs - header::map::HeaderMap<T>::iter (line 759)",
"src/request.rs - request::Request (line 119)",
"src/request.rs - request::Request<()>::delete (line 287)",
"src/header/map.rs - header::map::HeaderMap<T>::clear (line 553)",
"src/request.rs - request::Request<()>::get (line 224)",
"src/header/map.rs - header::map::HeaderMap<T>::reserve (line 609)",
"src/header/map.rs - header::map::HeaderMap<T>::contains_key (line 736)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::key (line 2215)",
"src/request.rs - request::Builder::method (line 754)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::into_key (line 2229)",
"src/header/map.rs - header::map::HeaderMap (line 21)",
"src/request.rs - request::Request<()>::head (line 330)",
"src/header/map.rs - header::map::HeaderMap<T>::insert (line 1058)",
"src/header/map.rs - header::map::HeaderMap<T>::remove (line 1267)",
"src/header/map.rs - header::map::HeaderMap<T>::keys (line 821)",
"src/header/map.rs - header::map::HeaderMap<T>::values (line 845)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert_with (line 2154)",
"src/request.rs - request::Builder::uri (line 811)",
"src/request.rs - request::Request<()>::connect (line 351)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1658)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert_with (line 2166)",
"src/request.rs - request::Request<T>::body_mut (line 617)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert (line 2114)",
"src/request.rs - request::Request<T>::from_parts (line 435)",
"src/request.rs - request::Request<T>::headers (line 542)",
"src/request.rs - request::Request<T>::body (line 603)",
"src/request.rs - request::Request<T>::extensions (line 573)",
"src/header/map.rs - header::map::HeaderMap<T>::drain (line 892)",
"src/header/map.rs - header::map::HeaderMap<T>::len (line 482)",
"src/request.rs - request::Builder::method_ref (line 781)",
"src/request.rs - request::Request<()>::trace (line 393)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::insert (line 2248)",
"src/header/map.rs - header::map::HeaderMap<T>::append (line 1147)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::get (line 2611)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::get_mut (line 2638)",
"src/header/map.rs - header::map::HeaderMap<T>::get (line 644)",
"src/request.rs - request::Request<()>::post (line 266)",
"src/request.rs - request::Builder::uri_ref (line 836)",
"src/header/map.rs - header::map::HeaderMap<T>::entry (line 981)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::insert_entry (line 2277)",
"src/request.rs - request::Request<()>::patch (line 372)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::insert_mult (line 2709)",
"src/header/map.rs - header::map::HeaderMap<T>::get_mut (line 677)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1673)",
"src/header/map.rs - header::map::GetAll<'a, T>::iter (line 2315)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::into_mut (line 2663)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::iter (line 2830)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::remove (line 2762)",
"src/request.rs - request::Builder::extension (line 947)",
"src/response.rs - response::Response (line 117)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::insert (line 2686)",
"src/header/map.rs - header::map::HeaderMap<T>::get_all (line 708)",
"src/request.rs - request::Request<()>::put (line 245)",
"src/header/map.rs - header::map::HeaderMap<T>::values_mut (line 869)",
"src/response.rs - response (line 12)",
"src/response.rs - response (line 42)",
"src/request.rs - request::Request<()>::options (line 308)",
"src/request.rs - request::Builder::header (line 888)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::remove_entry (line 2786)",
"src/header/map.rs - header::map::HeaderMap<T>::keys_len (line 509)",
"src/response.rs - response (line 30)",
"src/header/map.rs - header::map::HeaderMap<T>::iter_mut (line 791)",
"src/request.rs - request::Request<T>::method_mut (line 469)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::append (line 2735)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::key (line 2588)",
"src/response.rs - response::Response (line 87)",
"src/request.rs - request::Request<T>::uri (line 484)",
"src/response.rs - response::Builder::body (line 683)",
"src/header/map.rs - header::map::HeaderMap<T>::extend (line 1727)",
"src/request.rs - request::Request<()>::builder (line 202)",
"src/response.rs - response::Response (line 105)",
"src/response.rs - response::Response<T>::body_mut (line 417)",
"src/response.rs - response::Response (line 161)",
"src/response.rs - response::Response (line 141)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::iter_mut (line 2854)",
"src/request.rs - request::Request<T>::new (line 416)",
"src/response.rs - response::Builder::new (line 530)",
"src/response.rs - response::Response<T>::body (line 403)",
"src/request.rs - request::Request<T>::version_mut (line 527)",
"src/response.rs - response::Builder::version (line 581)",
"src/response.rs - response::Response<T>::headers (line 343)",
"src/request.rs - request::Request<T>::version (line 513)",
"src/response.rs - response::Builder::status (line 552)",
"src/request.rs - request::Request<T>::into_body (line 633)",
"src/response.rs - response::Response<T>::into_parts (line 447)",
"src/response.rs - response::Response<T>::version (line 314)",
"src/response.rs - response::Response<T>::from_parts (line 262)",
"src/request.rs - request::Request<T>::into_parts (line 648)",
"src/status.rs - status::StatusCode::canonical_reason (line 147)",
"src/uri/authority.rs - uri::authority::Authority (line 339)",
"src/status.rs - status (line 9)",
"src/response.rs - response::Response<T>::extensions (line 373)",
"src/status.rs - status::StatusCode (line 35)",
"src/uri/authority.rs - uri::authority::Authority::port_part (line 235)",
"src/uri/builder.rs - uri::builder::Builder::build (line 115)",
"src/status.rs - status::StatusCode::as_u16 (line 109)",
"src/status.rs - status::StatusCode::from_u16 (line 62)",
"src/request.rs - request::Request<T>::method (line 455)",
"src/uri/mod.rs - uri::Uri::host (line 577)",
"src/uri/authority.rs - uri::authority::Authority (line 293)",
"src/uri/builder.rs - uri::builder::Builder::path_and_query (line 80)",
"src/request.rs - request::Request<T>::uri_mut (line 498)",
"src/uri/mod.rs - uri::Uri::port_part (line 622)",
"src/uri/authority.rs - uri::authority::Authority::port_u16 (line 252)",
"src/request.rs - request::Request<T>::map (line 664)",
"src/response.rs - response::Response<T>::into_body (line 432)",
"src/response.rs - response::Response<T>::version_mut (line 328)",
"src/status.rs - status::StatusCode (line 197)",
"src/response.rs - response::Response<T>::map (line 463)",
"src/uri/mod.rs - uri::Uri::path (line 406)",
"src/uri/mod.rs - uri::Uri::authority_part (line 524)",
"src/uri/builder.rs - uri::builder::Builder::authority (line 58)",
"src/response.rs - response::Response<T>::status_mut (line 299)",
"src/status.rs - status::StatusCode::as_str (line 125)",
"src/response.rs - response::Response<T>::new (line 243)",
"src/uri/authority.rs - uri::authority::Authority::host (line 189)",
"src/request.rs - request::Builder::headers_ref (line 921)",
"src/uri/authority.rs - uri::authority::Authority::from_static (line 70)",
"src/uri/builder.rs - uri::builder::Builder::new (line 19)",
"src/response.rs - response::Response<T>::status (line 285)",
"src/uri/authority.rs - uri::authority::Authority::from_shared (line 32)",
"src/uri/authority.rs - uri::authority::Authority::port_part (line 224)",
"src/uri/builder.rs - uri::builder::Builder::scheme (line 38)",
"src/uri/mod.rs - uri::Uri::into_parts (line 352)",
"src/uri/mod.rs - uri::Uri::from_static (line 328)",
"src/uri/mod.rs - uri::Parts (line 770)",
"src/uri/mod.rs - uri::Uri::port_part (line 631)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 439)",
"src/uri/authority.rs - uri::authority::Authority (line 405)",
"src/uri/mod.rs - uri::Uri::query (line 685)",
"src/uri/mod.rs - uri::Uri::port_part (line 612)",
"src/request.rs - request::Request<T>::extensions_mut (line 587)",
"src/uri/mod.rs - uri::Uri::host (line 567)",
"src/uri/mod.rs - uri::Uri::authority_part (line 514)",
"src/uri/mod.rs - uri::Parts (line 785)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 450)",
"src/uri/mod.rs - uri::Uri::builder (line 191)",
"src/uri/mod.rs - uri::Uri::from_shared (line 250)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 223)",
"src/response.rs - response::Response<()>::builder (line 221)",
"src/uri/mod.rs - uri::Uri::path (line 396)",
"src/request.rs - request::Request<T>::headers_mut (line 556)",
"src/uri/mod.rs - uri::Uri::port_u16 (line 647)",
"src/version.rs - version (line 12)",
"src/uri/mod.rs - uri::Uri::query (line 676)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 201)",
"src/uri/mod.rs - uri::Uri::query (line 694)",
"src/uri/mod.rs - uri (line 11)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 232)",
"src/uri/mod.rs - uri::Uri (line 85)",
"src/uri/path.rs - uri::path::PathAndQuery::from_static (line 100)",
"src/response.rs - response::Builder::extension (line 637)",
"src/uri/port.rs - uri::port::Port<T>::as_u16 (line 18)",
"src/response.rs - response::Response<T>::headers_mut (line 357)",
"src/uri/scheme.rs - uri::scheme::Scheme::as_str (line 88)",
"src/uri/port.rs - uri::port::Port<T>::as_str (line 56)",
"src/uri/scheme.rs - uri::scheme::Scheme (line 211)",
"src/uri/mod.rs - uri::Uri::scheme_str (line 476)",
"src/uri/path.rs - uri::path::PathAndQuery::path (line 151)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 192)",
"src/uri/path.rs - uri::path::PathAndQuery::from_shared (line 27)",
"src/uri/scheme.rs - uri::scheme::Scheme::from_shared (line 51)",
"src/response.rs - response::Builder::header (line 604)",
"src/response.rs - response::Response<T>::extensions_mut (line 387)"
] |
[] |
[] |
|
hyperium/http
| 262
|
hyperium__http-262
|
[
"260"
] |
f8b369330550006d7fdeac35def76038e8da5cd3
|
diff --git a/src/method.rs b/src/method.rs
--- a/src/method.rs
+++ b/src/method.rs
@@ -143,6 +143,9 @@ impl Method {
/// Converts a slice of bytes to an HTTP method.
pub fn from_bytes(src: &[u8]) -> Result<Method, InvalidMethod> {
match src.len() {
+ 0 => {
+ Err(InvalidMethod::new())
+ }
3 => {
match src {
b"GET" => Ok(Method(Get)),
|
diff --git a/src/method.rs b/src/method.rs
--- a/src/method.rs
+++ b/src/method.rs
@@ -411,3 +414,9 @@ fn test_method_eq() {
assert_eq!(&Method::GET, Method::GET);
assert_eq!(Method::GET, &Method::GET);
}
+
+#[test]
+fn test_invalid_method() {
+ assert!(Method::from_str("").is_err());
+ assert!(Method::from_bytes(b"").is_err());
+}
|
Empty Method from string is allowed
Hello,
After some tests it seems that `Method::from_str("")` returns `Ok`. Shouldn't it be an error of type `InvalidMethod`?
The following test fail :
```
#[test]
fn it_should_return_an_invalid_method_error() {
assert!(Method::from_str("").is_err());
}
```
|
This does not seem correct! Would you mind providing a PR to fix this 👍
Yes, I will take a look 👍
|
2018-10-18T22:54:29Z
|
0.1
|
2018-10-18T17:42:33Z
|
4a5b64d22a2db9e2a4de112cef5b93372b8ac5ed
|
[
"method::test_invalid_method"
] |
[
"extensions::test_extensions",
"header::map::test_bounds",
"header::name::tests::test_bounds",
"header::name::tests::test_from_hdr_name",
"header::name::tests::test_eq_hdr_name",
"header::name::tests::test_from_static_custom_long",
"header::map::skip_duplicates_during_key_iteration",
"header::name::tests::test_from_static_custom_long_symbol",
"header::name::tests::test_from_static_custom_long_uppercase",
"header::name::tests::test_from_static_custom_short_symbol",
"header::name::tests::test_from_static_custom_single_char",
"header::name::tests::test_from_static_custom_short",
"header::name::test_parse_standard_headers",
"header::value::from_i32",
"header::name::test_standard_headers_into_bytes",
"header::value::from_i64",
"header::value::from_isize",
"header::value::from_i16",
"header::name::tests::test_from_static_empty",
"header::value::from_u16",
"header::name::tests::test_from_static_std_symbol",
"header::value::from_header_name_tests::it_can_insert_header_name_as_header_value",
"header::value::test_try_from",
"header::value::test_debug",
"header::value::from_u32",
"header::name::tests::test_from_static_std",
"header::name::tests::test_from_static_std_uppercase",
"header::value::from_usize",
"header::name::tests::test_from_static_custom_short_uppercase",
"request::tests::it_can_map_a_body_from_one_type_to_another",
"header::value::from_u64",
"header::value::try_from_header_name_tests::it_converts_using_try_from",
"uri::authority::tests::equates_with_a_str",
"response::tests::it_can_map_a_body_from_one_type_to_another",
"uri::authority::tests::equates_with_a_string_of_a_different_authority",
"uri::authority::tests::compares_to_self",
"uri::authority::tests::not_equal_to_self_of_different_authority",
"header::name::tests::test_parse_invalid_headers",
"uri::authority::tests::compares_with_a_string",
"uri::authority::tests::equates_with_a_string",
"uri::authority::tests::equal_to_self_of_same_authority",
"uri::authority::tests::parse_empty_string_is_error",
"uri::authority::tests::compares_with_a_str",
"method::test_method_eq",
"uri::path::tests::compares_with_a_str",
"uri::path::tests::compares_with_a_string",
"uri::authority::tests::not_equal_with_a_str_of_a_different_authority",
"uri::path::tests::equal_to_self_of_same_path",
"uri::path::tests::equates_with_a_str",
"uri::path::tests::compares_to_self",
"uri::path::tests::ignores_invalid_percent_encodings",
"uri::path::tests::ignores_valid_percent_encodings",
"uri::path::tests::not_equal_to_self_of_different_path",
"uri::path::tests::equates_with_a_string",
"uri::path::tests::not_equal_with_a_string_of_a_different_path",
"uri::path::tests::not_equal_with_a_str_of_a_different_path",
"uri::port::tests::partialeq_port",
"uri::port::tests::partialeq_u16",
"uri::port::tests::u16_from_port",
"uri::tests::test_authority_uri_parts_round_trip",
"uri::tests::test_char_table",
"uri::tests::test_ipv6_shorthand",
"uri::tests::test_ipv6",
"uri::tests::test_ipv6_shorthand3",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_slash",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_nonempty_query",
"uri::tests::test_percentage_encoded_path",
"uri::tests::test_query_permissive",
"uri::tests::test_uri_authority_only_one_character_issue_197",
"uri::tests::test_ipv6_shorthand2",
"uri::tests::test_long_scheme",
"uri::tests::test_ipv6_with_port",
"uri::tests::test_uri_parse_absolute_form",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_questionmark",
"uri::tests::test_uri_parse_absolute_with_default_port_http",
"uri::tests::test_uri_parse_absolute_form_without_path",
"uri::tests::test_uri_parse_asterisk_form",
"uri::tests::test_uri_parse_absolute_with_default_port_https",
"uri::tests::test_uri_parse_authority_no_port",
"uri::tests::test_uri_parse_authority_form",
"uri::tests::test_uri_parse_error",
"uri::tests::test_uri_parse_fragment_questionmark",
"uri::tests::test_max_uri_len",
"uri::tests::test_uri_parse_path_and_query",
"uri::tests::test_uri_parse_path_with_terminating_questionmark",
"uri::tests::test_uri_to_path_and_query",
"uri::tests::test_userinfo1",
"uri::tests::test_userinfo2",
"uri::tests::test_userinfo3",
"uri::tests::test_userinfo_pass_with_port",
"uri::tests::test_userinfo_with_port",
"as_header_name",
"append_multiple_values",
"get_invalid",
"drain_entry",
"drain",
"value_htab",
"eq",
"smoke",
"into_header_name",
"insert_invalid",
"insert_all_std_headers",
"insert_79_custom_std_headers",
"header_map_fuzz",
"equates_with_u16",
"from_bytes",
"roundtrip",
"src/header/name.rs - header::name::HeaderName::from_static (line 1622)",
"src/lib.rs - (line 57)",
"src/request.rs - request (line 12)",
"src/lib.rs - (line 33)",
"src/request.rs - request (line 37)",
"src/header/value.rs - header::value::HeaderValue::set_sensitive (line 272)",
"src/header/value.rs - header::value::HeaderValue::is_sensitive (line 298)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 147)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 101)",
"src/header/value.rs - header::value::HeaderValue::is_empty (line 241)",
"src/request.rs - request::Builder::body (line 913)",
"src/header/name.rs - header::name::HeaderName::from_lowercase (line 1564)",
"src/lib.rs - (line 101)",
"src/header/value.rs - header::value::HeaderValue::to_str (line 204)",
"src/lib.rs - (line 129)",
"src/lib.rs - (line 110)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1608)",
"src/header/value.rs - header::value::HeaderValue::len (line 227)",
"src/header/value.rs - header::value::HeaderValue::from_static (line 61)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 139)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 93)",
"src/header/name.rs - header::name::str::eq (line 1841)",
"src/header/value.rs - header::value::HeaderValue::from_name (line 117)",
"src/method.rs - method (line 10)",
"src/method.rs - method::Method (line 37)",
"src/header/name.rs - header::name::HeaderName::eq (line 1821)",
"src/lib.rs - (line 120)",
"src/header/value.rs - header::value::HeaderValue::as_bytes (line 258)",
"src/header/map.rs - header::map::HeaderMap::new (line 418)",
"src/lib.rs - (line 149)",
"src/request.rs - request::Request (line 74)",
"src/request.rs - request::Request (line 119)",
"src/request.rs - request::Request (line 139)",
"src/request.rs - request::Request (line 99)",
"src/extensions.rs - extensions::Extensions::insert (line 59)",
"src/header/map.rs - header::map::HeaderMap<T>::with_capacity (line 442)",
"src/request.rs - request::Builder::new (line 732)",
"src/extensions.rs - extensions::Extensions::get (line 84)",
"src/request.rs - request::Builder::method (line 754)",
"src/request.rs - request::Builder::uri (line 783)",
"src/extensions.rs - extensions::Extensions::clear (line 154)",
"src/request.rs - request::Builder::version (line 812)",
"src/extensions.rs - extensions::Extensions::get_mut (line 105)",
"src/extensions.rs - extensions::Extensions::remove (line 129)",
"src/request.rs - request::Request<T>::body (line 603)",
"src/header/map.rs - header::map::Entry<'a, T>::key (line 2192)",
"src/request.rs - request::Request<T>::body_mut (line 617)",
"src/request.rs - request::Request<()>::put (line 245)",
"src/request.rs - request::Request<()>::post (line 266)",
"src/request.rs - request::Request<()>::delete (line 287)",
"src/request.rs - request::Request<()>::patch (line 372)",
"src/request.rs - request::Request<T>::from_parts (line 435)",
"src/header/map.rs - header::map::HeaderMap<T>::clear (line 553)",
"src/header/map.rs - header::map::HeaderMap<T>::contains_key (line 736)",
"src/request.rs - request::Request<()>::get (line 224)",
"src/request.rs - request::Request<()>::head (line 330)",
"src/header/map.rs - header::map::HeaderMap<T>::values (line 845)",
"src/header/map.rs - header::map::HeaderMap<T>::reserve (line 609)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::key (line 2215)",
"src/request.rs - request::Request<()>::connect (line 351)",
"src/header/map.rs - header::map::HeaderMap (line 21)",
"src/request.rs - request::Request<T>::headers (line 542)",
"src/request.rs - request::Request<()>::trace (line 393)",
"src/request.rs - request::Request<T>::extensions (line 573)",
"src/header/map.rs - header::map::HeaderMap<T>::insert (line 1058)",
"src/header/map.rs - header::map::GetAll<'a, T>::iter (line 2315)",
"src/header/map.rs - header::map::HeaderMap<T>::iter (line 759)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::insert_entry (line 2277)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert_with (line 2166)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert_with (line 2154)",
"src/header/map.rs - header::map::HeaderMap<T>::remove (line 1267)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::insert (line 2248)",
"src/header/map.rs - header::map::HeaderMap<T>::get_all (line 708)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1673)",
"src/header/map.rs - header::map::HeaderMap<T>::is_empty (line 533)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1658)",
"src/header/map.rs - header::map::HeaderMap<T>::keys (line 821)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::into_key (line 2229)",
"src/request.rs - request::Request<()>::options (line 308)",
"src/response.rs - response (line 30)",
"src/response.rs - response (line 42)",
"src/header/map.rs - header::map::HeaderMap<T>::get (line 644)",
"src/header/map.rs - header::map::HeaderMap<T>::iter_mut (line 791)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert (line 2114)",
"src/response.rs - response (line 12)",
"src/header/map.rs - header::map::HeaderMap<T>::append (line 1147)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::get_mut (line 2638)",
"src/header/map.rs - header::map::HeaderMap<T>::len (line 482)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::append (line 2735)",
"src/header/map.rs - header::map::HeaderMap<T>::drain (line 892)",
"src/response.rs - response::Response (line 105)",
"src/request.rs - request::Builder::extension (line 867)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::get (line 2611)",
"src/response.rs - response::Response (line 117)",
"src/header/map.rs - header::map::HeaderMap<T>::values_mut (line 869)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::insert (line 2686)",
"src/header/map.rs - header::map::HeaderMap<T>::capacity (line 580)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::remove (line 2762)",
"src/request.rs - request::Builder::header (line 835)",
"src/response.rs - response::Response (line 87)",
"src/header/map.rs - header::map::HeaderMap<T>::entry (line 981)",
"src/header/map.rs - header::map::HeaderMap<T>::keys_len (line 509)",
"src/response.rs - response::Response<T>::body (line 403)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::remove_entry (line 2786)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::insert_mult (line 2709)",
"src/request.rs - request::Request<T>::version (line 513)",
"src/response.rs - response::Response<T>::headers (line 343)",
"src/request.rs - request::Request<T>::into_parts (line 648)",
"src/request.rs - request::Request<T>::into_body (line 633)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::iter (line 2830)",
"src/header/map.rs - header::map::HeaderMap<T>::get_mut (line 677)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::key (line 2588)",
"src/response.rs - response::Response (line 161)",
"src/response.rs - response::Response<T>::body_mut (line 417)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::into_mut (line 2663)",
"src/response.rs - response::Builder::status (line 552)",
"src/request.rs - request::Request<T>::uri (line 484)",
"src/request.rs - request::Request<T>::version_mut (line 527)",
"src/response.rs - response::Response (line 141)",
"src/response.rs - response::Builder::version (line 581)",
"src/response.rs - response::Builder::body (line 683)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::iter_mut (line 2854)",
"src/request.rs - request::Request<T>::method (line 455)",
"src/response.rs - response::Response<T>::new (line 243)",
"src/header/map.rs - header::map::HeaderMap<T>::extend (line 1727)",
"src/request.rs - request::Request<T>::method_mut (line 469)",
"src/request.rs - request::Request<T>::new (line 416)",
"src/request.rs - request::Request<()>::builder (line 202)",
"src/response.rs - response::Response<T>::into_parts (line 447)",
"src/response.rs - response::Response<T>::map (line 463)",
"src/request.rs - request::Request<T>::uri_mut (line 498)",
"src/request.rs - request::Request<T>::map (line 664)",
"src/response.rs - response::Response<T>::into_body (line 432)",
"src/response.rs - response::Builder::new (line 530)",
"src/response.rs - response::Response<T>::version (line 314)",
"src/status.rs - status::StatusCode::as_str (line 125)",
"src/status.rs - status::StatusCode (line 35)",
"src/response.rs - response::Response<T>::status (line 285)",
"src/response.rs - response::Response<T>::extensions (line 373)",
"src/status.rs - status::StatusCode (line 197)",
"src/request.rs - request::Request<T>::extensions_mut (line 587)",
"src/status.rs - status (line 9)",
"src/uri/builder.rs - uri::builder::Builder::scheme (line 38)",
"src/response.rs - response::Response<T>::from_parts (line 262)",
"src/uri/authority.rs - uri::authority::Authority::port_part (line 208)",
"src/status.rs - status::StatusCode::canonical_reason (line 147)",
"src/response.rs - response::Response<T>::status_mut (line 299)",
"src/status.rs - status::StatusCode::as_u16 (line 109)",
"src/status.rs - status::StatusCode::from_u16 (line 62)",
"src/uri/mod.rs - uri::Uri::port_part (line 614)",
"src/uri/mod.rs - uri::Uri::port_part (line 605)",
"src/uri/authority.rs - uri::authority::Authority::port_part (line 218)",
"src/uri/builder.rs - uri::builder::Builder::new (line 19)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 448)",
"src/uri/authority.rs - uri::authority::Authority::host (line 173)",
"src/uri/builder.rs - uri::builder::Builder::build (line 115)",
"src/uri/authority.rs - uri::authority::Authority (line 308)",
"src/uri/authority.rs - uri::authority::Authority (line 262)",
"src/uri/mod.rs - uri::Uri::host (line 560)",
"src/uri/mod.rs - uri::Uri::authority_part (line 507)",
"src/uri/authority.rs - uri::authority::Authority (line 374)",
"src/response.rs - response::Response<T>::version_mut (line 328)",
"src/uri/authority.rs - uri::authority::Authority::from_shared (line 32)",
"src/uri/mod.rs - uri::Uri::path (line 395)",
"src/uri/mod.rs - uri::Uri::query (line 662)",
"src/uri/builder.rs - uri::builder::Builder::authority (line 58)",
"src/uri/mod.rs - uri::Uri::port_part (line 595)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 201)",
"src/uri/mod.rs - uri::Uri::path (line 405)",
"src/uri/authority.rs - uri::authority::Authority::from_static (line 70)",
"src/uri/port.rs - uri::port::Port<'a>::as_str (line 42)",
"src/uri/scheme.rs - uri::scheme::Scheme (line 211)",
"src/uri/port.rs - uri::port::Port<'a>::as_u16 (line 25)",
"src/uri/mod.rs - uri::Uri::query (line 644)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 232)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 438)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 223)",
"src/uri/mod.rs - uri::Uri::host (line 550)",
"src/uri/mod.rs - uri::Parts (line 753)",
"src/uri/builder.rs - uri::builder::Builder::path_and_query (line 80)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 192)",
"src/uri/scheme.rs - uri::scheme::Scheme::as_str (line 88)",
"src/uri/mod.rs - uri::Uri::builder (line 190)",
"src/version.rs - version (line 12)",
"src/uri/path.rs - uri::path::PathAndQuery::path (line 151)",
"src/uri/mod.rs - uri::Uri::into_parts (line 351)",
"src/uri/path.rs - uri::path::PathAndQuery::from_shared (line 27)",
"src/uri/scheme.rs - uri::scheme::Scheme::from_shared (line 51)",
"src/uri/mod.rs - uri::Uri (line 85)",
"src/uri/mod.rs - uri::Uri::authority_part (line 497)",
"src/uri/path.rs - uri::path::PathAndQuery::from_static (line 100)",
"src/request.rs - request::Request<T>::headers_mut (line 556)",
"src/uri/mod.rs - uri::Uri::query (line 653)",
"src/uri/mod.rs - uri::Uri::from_shared (line 249)",
"src/response.rs - response::Response<()>::builder (line 221)",
"src/uri/mod.rs - uri::Uri::from_static (line 327)",
"src/uri/mod.rs - uri::Parts (line 738)",
"src/response.rs - response::Response<T>::headers_mut (line 357)",
"src/uri/mod.rs - uri (line 11)",
"src/response.rs - response::Builder::extension (line 637)",
"src/response.rs - response::Builder::header (line 604)",
"src/response.rs - response::Response<T>::extensions_mut (line 387)"
] |
[] |
[] |
hyperium/http
| 248
|
hyperium__http-248
|
[
"243"
] |
abefa3c8e7ea4995427b880bd4abe0342f4f285a
|
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -91,6 +91,7 @@ impl Authority {
let mut start_bracket = false;
let mut end_bracket = false;
let mut end = s.len();
+ let mut at_sign_pos = None;
for (i, &b) in s.iter().enumerate() {
match URI_CHARS[b as usize] {
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -111,9 +112,12 @@ impl Authority {
colon_cnt = 0;
}
b'@' => {
+ at_sign_pos = Some(i);
+
// Those weren't a port colon, but part of the
// userinfo, so it needs to be forgotten.
colon_cnt = 0;
+
}
0 => {
return Err(ErrorKind::InvalidUriChar.into());
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -131,6 +135,11 @@ impl Authority {
return Err(ErrorKind::InvalidAuthority.into());
}
+ if end > 0 && at_sign_pos == Some(end - 1) {
+ // If there's nothing after an `@`, this is bonkers.
+ return Err(ErrorKind::InvalidAuthority.into());
+ }
+
Ok(end)
}
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -418,6 +427,7 @@ fn host(auth: &str) -> &str {
let host_port = auth.rsplitn(2, '@')
.next()
.expect("split always has at least 1 item");
+
if host_port.as_bytes()[0] == b'[' {
let i = host_port.find(']')
.expect("parsing should validate brackets");
|
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -394,6 +394,8 @@ fn test_uri_parse_error() {
err("http://[::1");
err("http://::1]");
err("localhost:8080:3030");
+ err("@");
+ err("http://username:password@/wut");
// illegal queries
err("/?foo\rbar");
|
Getting the host from an URI may panic, which is not stated in the documentation
Getting the host from an URI may lead to a panic on some ill-formed URIs. This is not stated in the documentation, so I am guessing it is not intended.
For example, this code panics:
```
extern crate http;
use std::str::FromStr;
fn main() {
let uri=http::uri::Uri::from_str("@").unwrap();
let _host=uri.host();
}
```
|
Calling `host()` should never panic, so that's a bug. I don't know yet whether that is separate, but parsing just `@` probably should return an error...
|
2018-09-12T03:05:35Z
|
0.1
|
2018-09-11T19:31:04Z
|
4a5b64d22a2db9e2a4de112cef5b93372b8ac5ed
|
[
"uri::tests::test_uri_parse_error"
] |
[
"header::map::test_bounds",
"extensions::test_extensions",
"header::map::skip_duplicates_during_key_iteration",
"header::name::tests::test_eq_hdr_name",
"header::name::tests::test_bounds",
"header::name::tests::test_from_hdr_name",
"header::name::tests::test_from_static_custom_long",
"header::name::tests::test_from_static_custom_short",
"header::name::tests::test_from_static_custom_short_uppercase",
"header::name::tests::test_from_static_custom_long_symbol",
"header::name::tests::test_from_static_custom_long_uppercase",
"header::value::from_i32",
"header::name::test_parse_standard_headers",
"header::name::tests::test_from_static_custom_short_symbol",
"header::value::from_i64",
"header::name::tests::test_from_static_custom_single_char",
"header::name::tests::test_from_static_std",
"header::value::from_u16",
"header::value::from_isize",
"header::value::from_u32",
"header::value::from_i16",
"header::value::from_u64",
"header::name::test_standard_headers_into_bytes",
"header::name::tests::test_from_static_empty",
"header::value::test_try_from",
"header::value::test_debug",
"header::name::tests::test_from_static_std_uppercase",
"header::value::from_usize",
"method::test_method_eq",
"header::value::from_header_name_tests::it_can_insert_header_name_as_header_value",
"uri::authority::tests::compares_to_self",
"header::name::tests::test_from_static_std_symbol",
"header::value::try_from_header_name_tests::it_converts_using_try_from",
"request::tests::it_can_map_a_body_from_one_type_to_another",
"uri::authority::tests::compares_with_a_str",
"uri::authority::tests::equal_to_self_of_same_authority",
"uri::authority::tests::compares_with_a_string",
"uri::authority::tests::equates_with_a_str",
"uri::authority::tests::not_equal_to_self_of_different_authority",
"uri::path::tests::compares_to_self",
"uri::path::tests::compares_with_a_str",
"uri::authority::tests::not_equal_with_a_str_of_a_different_authority",
"uri::authority::tests::equates_with_a_string_of_a_different_authority",
"uri::path::tests::double_percent_path",
"response::tests::it_can_map_a_body_from_one_type_to_another",
"uri::path::tests::not_equal_with_a_str_of_a_different_path",
"uri::path::tests::equates_with_a_string",
"uri::path::tests::equates_with_a_str",
"uri::authority::tests::parse_empty_string_is_error",
"uri::path::tests::not_equal_with_a_string_of_a_different_path",
"header::name::tests::test_parse_invalid_headers",
"uri::authority::tests::equates_with_a_string",
"uri::path::tests::equal_to_self_of_same_path",
"uri::path::tests::compares_with_a_string",
"uri::path::tests::path_ends_with_fragment_percent",
"uri::tests::test_ipv6_shorthand",
"uri::path::tests::path_ends_with_question_mark",
"uri::tests::test_ipv6",
"uri::tests::test_authority_uri_parts_round_trip",
"uri::tests::test_char_table",
"uri::tests::test_long_scheme",
"uri::tests::test_ipv6_with_port",
"uri::tests::test_percentage_encoded_path",
"uri::tests::test_query_permissive",
"uri::path::tests::not_equal_to_self_of_different_path",
"uri::tests::test_ipv6_shorthand3",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_slash",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_nonempty_query",
"uri::tests::test_uri_parse_absolute_form_without_path",
"uri::tests::test_uri_authority_only_one_character_issue_197",
"uri::tests::test_ipv6_shorthand2",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_questionmark",
"uri::tests::test_uri_parse_absolute_form",
"uri::tests::test_uri_parse_absolute_with_default_port_http",
"uri::tests::test_uri_parse_absolute_with_default_port_https",
"uri::tests::test_uri_parse_authority_form",
"uri::tests::test_uri_parse_asterisk_form",
"uri::tests::test_uri_parse_authority_no_port",
"uri::tests::test_uri_parse_fragment_questionmark",
"uri::tests::test_uri_parse_path_and_query",
"uri::tests::test_uri_parse_path_with_terminating_questionmark",
"uri::tests::test_max_uri_len",
"uri::tests::test_uri_to_path_and_query",
"uri::tests::test_userinfo1",
"uri::tests::test_userinfo3",
"uri::tests::test_userinfo2",
"uri::tests::test_userinfo_pass_with_port",
"uri::tests::test_userinfo_with_port",
"append_multiple_values",
"drain_entry",
"drain",
"as_header_name",
"value_htab",
"smoke",
"get_invalid",
"eq",
"insert_invalid",
"into_header_name",
"insert_all_std_headers",
"insert_79_custom_std_headers",
"header_map_fuzz",
"equates_with_u16",
"from_bytes",
"roundtrip",
"src/request.rs - request (line 12)",
"src/lib.rs - (line 57)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 101)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1622)",
"src/request.rs - request (line 37)",
"src/lib.rs - (line 33)",
"src/header/value.rs - header::value::HeaderValue::set_sensitive (line 272)",
"src/header/value.rs - header::value::HeaderValue::is_empty (line 241)",
"src/header/value.rs - header::value::HeaderValue::is_sensitive (line 298)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 147)",
"src/lib.rs - (line 129)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 139)",
"src/lib.rs - (line 101)",
"src/lib.rs - (line 110)",
"src/method.rs - method (line 10)",
"src/header/name.rs - header::name::HeaderName::from_lowercase (line 1564)",
"src/header/value.rs - header::value::HeaderValue::len (line 227)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1608)",
"src/request.rs - request::Builder::body (line 914)",
"src/header/value.rs - header::value::HeaderValue::from_static (line 61)",
"src/header/name.rs - header::name::HeaderName::eq (line 1815)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 93)",
"src/header/value.rs - header::value::HeaderValue::to_str (line 204)",
"src/header/name.rs - header::name::str::eq (line 1835)",
"src/method.rs - method::Method (line 37)",
"src/header/value.rs - header::value::HeaderValue::from_name (line 117)",
"src/header/map.rs - header::map::HeaderMap::new (line 418)",
"src/lib.rs - (line 149)",
"src/header/value.rs - header::value::HeaderValue::as_bytes (line 258)",
"src/lib.rs - (line 120)",
"src/request.rs - request::Request (line 74)",
"src/header/map.rs - header::map::HeaderMap<T>::with_capacity (line 442)",
"src/request.rs - request::Request (line 119)",
"src/request.rs - request::Request (line 99)",
"src/request.rs - request::Request (line 139)",
"src/request.rs - request::Builder::version (line 813)",
"src/extensions.rs - extensions::Extensions::get (line 84)",
"src/extensions.rs - extensions::Extensions::remove (line 129)",
"src/extensions.rs - extensions::Extensions::get_mut (line 105)",
"src/extensions.rs - extensions::Extensions::clear (line 154)",
"src/request.rs - request::Request<()>::connect (line 351)",
"src/request.rs - request::Builder::new (line 733)",
"src/request.rs - request::Request<T>::body (line 603)",
"src/request.rs - request::Request<T>::body_mut (line 617)",
"src/extensions.rs - extensions::Extensions::insert (line 59)",
"src/request.rs - request::Builder::uri (line 784)",
"src/request.rs - request::Builder::method (line 755)",
"src/request.rs - request::Request<T>::from_parts (line 435)",
"src/request.rs - request::Request<()>::post (line 266)",
"src/request.rs - request::Request<()>::put (line 245)",
"src/request.rs - request::Request<()>::head (line 330)",
"src/request.rs - request::Request<T>::headers (line 542)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert_with (line 2154)",
"src/header/map.rs - header::map::HeaderMap<T>::clear (line 553)",
"src/request.rs - request::Request<()>::trace (line 393)",
"src/request.rs - request::Request<()>::get (line 224)",
"src/request.rs - request::Request<()>::patch (line 372)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::insert (line 2248)",
"src/request.rs - request::Request<T>::extensions (line 573)",
"src/request.rs - request::Request<()>::options (line 308)",
"src/request.rs - request::Request<()>::delete (line 287)",
"src/header/map.rs - header::map::HeaderMap<T>::insert (line 1058)",
"src/header/map.rs - header::map::HeaderMap<T>::len (line 482)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::insert_entry (line 2277)",
"src/header/map.rs - header::map::HeaderMap<T>::contains_key (line 736)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::into_key (line 2229)",
"src/header/map.rs - header::map::HeaderMap<T>::reserve (line 609)",
"src/header/map.rs - header::map::HeaderMap<T>::is_empty (line 533)",
"src/header/map.rs - header::map::HeaderMap<T>::iter (line 759)",
"src/response.rs - response (line 42)",
"src/response.rs - response (line 12)",
"src/header/map.rs - header::map::HeaderMap<T>::keys (line 821)",
"src/header/map.rs - header::map::HeaderMap (line 21)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1673)",
"src/header/map.rs - header::map::HeaderMap<T>::values (line 845)",
"src/header/map.rs - header::map::GetAll<'a, T>::iter (line 2315)",
"src/response.rs - response (line 30)",
"src/header/map.rs - header::map::HeaderMap<T>::append (line 1147)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::key (line 2215)",
"src/header/map.rs - header::map::Entry<'a, T>::key (line 2192)",
"src/header/map.rs - header::map::HeaderMap<T>::remove (line 1267)",
"src/header/map.rs - header::map::HeaderMap<T>::iter_mut (line 791)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1658)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::insert_mult (line 2709)",
"src/header/map.rs - header::map::HeaderMap<T>::capacity (line 580)",
"src/request.rs - request::Builder::extension (line 868)",
"src/response.rs - response::Response (line 105)",
"src/response.rs - response::Response (line 87)",
"src/response.rs - response::Response (line 117)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::key (line 2588)",
"src/header/map.rs - header::map::HeaderMap<T>::drain (line 892)",
"src/header/map.rs - header::map::HeaderMap<T>::values_mut (line 869)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert_with (line 2166)",
"src/header/map.rs - header::map::HeaderMap<T>::get_mut (line 677)",
"src/response.rs - response::Builder::body (line 683)",
"src/header/map.rs - header::map::HeaderMap<T>::entry (line 981)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::insert (line 2686)",
"src/request.rs - request::Request<T>::into_parts (line 648)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert (line 2114)",
"src/request.rs - request::Request<T>::uri_mut (line 498)",
"src/request.rs - request::Request<T>::version (line 513)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::remove (line 2762)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::iter (line 2830)",
"src/response.rs - response::Builder::version (line 581)",
"src/request.rs - request::Request<T>::version_mut (line 527)",
"src/header/map.rs - header::map::HeaderMap<T>::get (line 644)",
"src/request.rs - request::Request<T>::method (line 455)",
"src/response.rs - response::Response (line 161)",
"src/header/map.rs - header::map::HeaderMap<T>::get_all (line 708)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::get_mut (line 2638)",
"src/header/map.rs - header::map::HeaderMap<T>::keys_len (line 509)",
"src/response.rs - response::Response<T>::headers (line 343)",
"src/response.rs - response::Response<T>::body_mut (line 417)",
"src/request.rs - request::Request<T>::method_mut (line 469)",
"src/response.rs - response::Builder::new (line 530)",
"src/response.rs - response::Response (line 141)",
"src/response.rs - response::Response<T>::body (line 403)",
"src/request.rs - request::Request<T>::uri (line 484)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::append (line 2735)",
"src/request.rs - request::Request<T>::into_body (line 633)",
"src/response.rs - response::Builder::status (line 552)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::get (line 2611)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::remove_entry (line 2786)",
"src/request.rs - request::Request<()>::builder (line 202)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::into_mut (line 2663)",
"src/request.rs - request::Builder::header (line 836)",
"src/request.rs - request::Request<T>::new (line 416)",
"src/request.rs - request::Request<T>::map (line 664)",
"src/request.rs - request::Request<T>::extensions_mut (line 587)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::iter_mut (line 2854)",
"src/response.rs - response::Response<T>::from_parts (line 262)",
"src/response.rs - response::Response<T>::version (line 314)",
"src/response.rs - response::Response<T>::status (line 285)",
"src/response.rs - response::Response<T>::extensions (line 373)",
"src/status.rs - status (line 9)",
"src/response.rs - response::Response<T>::into_parts (line 447)",
"src/status.rs - status::StatusCode::from_u16 (line 62)",
"src/response.rs - response::Response<T>::version_mut (line 328)",
"src/header/map.rs - header::map::HeaderMap<T>::extend (line 1727)",
"src/uri/mod.rs - uri::Uri::port (line 582)",
"src/status.rs - status::StatusCode::canonical_reason (line 147)",
"src/response.rs - response::Response<T>::new (line 243)",
"src/status.rs - status::StatusCode (line 35)",
"src/uri/mod.rs - uri::Uri::host (line 535)",
"src/request.rs - request::Request<T>::headers_mut (line 556)",
"src/response.rs - response::Response<T>::status_mut (line 299)",
"src/response.rs - response::Response<T>::map (line 463)",
"src/status.rs - status::StatusCode (line 197)",
"src/uri/mod.rs - uri::Uri::authority_part (line 482)",
"src/uri/mod.rs - uri::Uri::host (line 525)",
"src/uri/authority.rs - uri::authority::Authority::port (line 201)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 423)",
"src/uri/mod.rs - uri::Uri::port (line 573)",
"src/status.rs - status::StatusCode::as_str (line 125)",
"src/uri/mod.rs - uri::Uri::path (line 380)",
"src/status.rs - status::StatusCode::as_u16 (line 109)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 252)",
"src/uri/scheme.rs - uri::scheme::Scheme (line 183)",
"src/version.rs - version (line 12)",
"src/uri/mod.rs - uri::Uri::query (line 621)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 243)",
"src/uri/authority.rs - uri::authority::Authority::from_static (line 69)",
"src/uri/mod.rs - uri::Uri::query (line 630)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 221)",
"src/uri/mod.rs - uri::Uri::into_parts (line 326)",
"src/uri/authority.rs - uri::authority::Authority::from_shared (line 31)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 413)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 212)",
"src/response.rs - response::Response<T>::into_body (line 432)",
"src/uri/path.rs - uri::path::PathAndQuery::path (line 171)",
"src/response.rs - response::Response<T>::extensions_mut (line 387)",
"src/uri/scheme.rs - uri::scheme::Scheme::as_str (line 87)",
"src/uri/mod.rs - uri::Uri::port (line 564)",
"src/uri/mod.rs - uri::Uri::from_shared (line 224)",
"src/uri/mod.rs - uri::Uri (line 81)",
"src/uri/scheme.rs - uri::scheme::Scheme::from_shared (line 50)",
"src/uri/mod.rs - uri::Uri::authority_part (line 472)",
"src/uri/path.rs - uri::path::PathAndQuery::from_static (line 120)",
"src/uri/mod.rs - uri::Uri::path (line 370)",
"src/uri/mod.rs - uri::Parts (line 706)",
"src/uri/mod.rs - uri::Uri::from_static (line 302)",
"src/uri/path.rs - uri::path::PathAndQuery::from_shared (line 26)",
"src/uri/mod.rs - uri::Parts (line 721)",
"src/uri/mod.rs - uri::Uri::query (line 612)",
"src/uri/mod.rs - uri (line 11)",
"src/response.rs - response::Builder::extension (line 637)",
"src/response.rs - response::Builder::header (line 604)",
"src/response.rs - response::Response<()>::builder (line 221)",
"src/response.rs - response::Response<T>::headers_mut (line 357)"
] |
[] |
[] |
hyperium/http
| 220
|
hyperium__http-220
|
[
"197"
] |
a7f3dfc5b7958c35e77a68dd2ba7461251578efa
|
diff --git a/src/uri/mod.rs b/src/uri/mod.rs
--- a/src/uri/mod.rs
+++ b/src/uri/mod.rs
@@ -269,8 +269,7 @@ impl Uri {
return Ok(Uri {
scheme: Scheme::empty(),
authority: authority,
- // TODO: Should this be empty instead?
- path_and_query: PathAndQuery::slash(),
+ path_and_query: PathAndQuery::empty(),
});
}
}
|
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -26,12 +26,17 @@ macro_rules! test_parse {
) => (
#[test]
fn $test_name() {
- let uri = Uri::from_str($str).unwrap();
+ let orig_str = $str;
+ let uri = Uri::from_str(orig_str).unwrap();
$(
- assert_eq!(uri.$method(), $value, stringify!($method));
+ assert_eq!(uri.$method(), $value, "{}: uri = {:?}", stringify!($method), uri);
)+
- assert_eq!(uri, *$str);
- assert_eq!(uri, uri.clone());
+ assert_eq!(uri, orig_str, "partial eq to original str");
+ assert_eq!(uri, uri.clone(), "clones are equal");
+
+ let new_str = uri.to_string();
+ let new_uri = Uri::from_str(&new_str).expect("to_string output parses again as a Uri");
+ assert_eq!(new_uri, orig_str, "round trip still equals original str");
const ALT: &'static [&'static str] = &$alt;
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -107,6 +112,19 @@ test_parse! {
host = Some("localhost"),
}
+test_parse! {
+ test_uri_authority_only_one_character_issue_197,
+ "S",
+ [],
+
+ scheme_part = None,
+ authority_part = part!("S"),
+ path = "",
+ query = None,
+ port = None,
+ host = Some("S"),
+}
+
test_parse! {
test_uri_parse_authority_form,
"localhost:3000",
|
Panic in Uri::from_str(&Uri::from_str(x).to_string()) found by fuzzer
In <https://github.com/rust-fuzz/targets/pull/113>, I added some simple fuzzers for parts of this crate. To test `Uri::from_str`, I added this code:
```rust
pub fn fuzz_http_uri(data: &[u8]) {
use std::str;
use std::str::FromStr;
if let Ok(text) = str::from_utf8(data) {
if let Ok(uri) = http::uri::Uri::from_str(text) {
http::uri::Uri::from_str(&uri.to_string()).unwrap();
}
}
}
```
- Is this a correct assertion to make?
- This panics with `b"S"` as an input
|
This probably a correct assertion, since it's just check that a new `Uri` can be parsed from `uri.to_string()`, which should likely be the case.
I *bet* the error is that an incorrect insertion of a path, meaning it went `"S"` -> `"S/"`, and then the second parse fails. That's because the first time, it just saw the 1 letter, and parsed as an authority-form. But then when it saw the path, without a scheme in the beginning, that isn't any of the 4 valid forms.
|
2018-06-23T09:08:58Z
|
0.1
|
2018-06-23T01:20:01Z
|
4a5b64d22a2db9e2a4de112cef5b93372b8ac5ed
|
[
"uri::tests::test_uri_authority_only_one_character_issue_197"
] |
[
"header::map::test_bounds",
"extensions::test_extensions",
"header::map::skip_duplicates_during_key_iteration",
"header::name::tests::test_eq_hdr_name",
"header::name::tests::test_bounds",
"header::name::tests::test_from_hdr_name",
"header::name::tests::test_from_static_custom_single_char",
"header::name::tests::test_from_static_custom_long",
"header::name::tests::test_from_static_custom_long_uppercase",
"header::name::tests::test_from_static_custom_short",
"header::name::tests::test_from_static_custom_long_symbol",
"header::name::tests::test_from_static_custom_short_symbol",
"header::value::from_i16",
"header::name::test_standard_headers_into_bytes",
"header::name::test_parse_standard_headers",
"header::name::tests::test_from_static_empty",
"header::value::from_isize",
"header::value::from_i32",
"header::value::from_i64",
"header::value::from_usize",
"header::value::from_u16",
"header::name::tests::test_from_static_std",
"header::value::from_u32",
"header::value::from_u64",
"header::value::from_header_name_tests::it_can_insert_header_name_as_header_value",
"header::value::try_from_header_name_tests::it_converts_using_try_from",
"header::name::tests::test_from_static_std_uppercase",
"header::name::tests::test_from_static_custom_short_uppercase",
"header::name::tests::test_from_static_std_symbol",
"header::value::test_try_from",
"uri::authority::tests::compares_to_self",
"header::value::test_debug",
"request::tests::it_can_map_a_body_from_one_type_to_another",
"uri::authority::tests::compares_with_a_str",
"uri::authority::tests::compares_with_a_string",
"uri::path::tests::compares_to_self",
"uri::authority::tests::equal_to_self_of_same_authority",
"uri::path::tests::equal_to_self_of_same_path",
"uri::path::tests::compares_with_a_str",
"uri::authority::tests::not_equal_with_a_str_of_a_different_authority",
"uri::authority::tests::equates_with_a_string",
"uri::path::tests::compares_with_a_string",
"uri::authority::tests::not_equal_to_self_of_different_authority",
"response::tests::it_can_map_a_body_from_one_type_to_another",
"uri::path::tests::equates_with_a_str",
"uri::authority::tests::parse_empty_string_is_error",
"uri::authority::tests::equates_with_a_str",
"uri::authority::tests::equates_with_a_string_of_a_different_authority",
"uri::path::tests::equates_with_a_string",
"uri::path::tests::not_equal_with_a_str_of_a_different_path",
"uri::path::tests::not_equal_with_a_string_of_a_different_path",
"uri::path::tests::not_equal_to_self_of_different_path",
"uri::tests::test_authority_uri_parts_round_trip",
"uri::tests::test_char_table",
"header::name::tests::test_parse_invalid_headers",
"uri::tests::test_ipv6_shorthand2",
"uri::tests::test_ipv6_shorthand",
"uri::tests::test_ipv6_shorthand3",
"uri::tests::test_ipv6",
"uri::tests::test_long_scheme",
"uri::tests::test_ipv6_with_port",
"uri::tests::test_percentage_encoded_path",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_questionmark",
"uri::tests::test_uri_parse_absolute_form",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_slash",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_nonempty_query",
"uri::tests::test_max_uri_len",
"uri::tests::test_uri_parse_absolute_form_without_path",
"uri::tests::test_uri_parse_absolute_with_default_port_https",
"uri::tests::test_uri_parse_asterisk_form",
"uri::tests::test_uri_parse_absolute_with_default_port_http",
"uri::tests::test_uri_parse_authority_form",
"uri::tests::test_uri_parse_error",
"uri::tests::test_uri_parse_fragment_questionmark",
"uri::tests::test_uri_parse_authority_no_port",
"uri::tests::test_uri_parse_path_and_query",
"uri::tests::test_uri_parse_path_with_terminating_questionmark",
"uri::tests::test_uri_to_path_and_query",
"uri::tests::test_userinfo1",
"uri::tests::test_userinfo2",
"uri::tests::test_userinfo3",
"uri::tests::test_userinfo_pass_with_port",
"uri::tests::test_userinfo_with_port",
"append_multiple_values",
"as_header_name",
"drain",
"get_invalid",
"eq",
"drain_entry",
"insert_invalid",
"into_header_name",
"smoke",
"insert_all_std_headers",
"insert_79_custom_std_headers",
"header_map_fuzz",
"equates_with_u16",
"from_bytes",
"roundtrip",
"src/request.rs - request (line 12)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1622)",
"src/lib.rs - (line 57)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 101)",
"src/request.rs - request (line 37)",
"src/lib.rs - (line 33)",
"src/header/value.rs - header::value::HeaderValue::set_sensitive (line 272)",
"src/header/value.rs - header::value::HeaderValue::is_sensitive (line 298)",
"src/header/value.rs - header::value::HeaderValue::to_str (line 204)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 147)",
"src/request.rs - request::Builder::body (line 914)",
"src/header/map.rs - header::map::HeaderMap::new (line 423)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1608)",
"src/header/value.rs - header::value::HeaderValue::is_empty (line 241)",
"src/header/value.rs - header::value::HeaderValue::len (line 227)",
"src/lib.rs - (line 129)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 93)",
"src/lib.rs - (line 110)",
"src/lib.rs - (line 101)",
"src/header/name.rs - header::name::HeaderName::from_lowercase (line 1564)",
"src/header/value.rs - header::value::HeaderValue::from_static (line 61)",
"src/method.rs - method::Method (line 37)",
"src/header/name.rs - header::name::str::eq (line 1826)",
"src/method.rs - method (line 10)",
"src/lib.rs - (line 149)",
"src/header/value.rs - header::value::HeaderValue::from_name (line 117)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 139)",
"src/header/name.rs - header::name::HeaderName::eq (line 1806)",
"src/lib.rs - (line 120)",
"src/extensions.rs - extensions::Extensions::insert (line 35)",
"src/header/value.rs - header::value::HeaderValue::as_bytes (line 258)",
"src/request.rs - request::Request (line 74)",
"src/header/map.rs - header::map::HeaderMap<T>::with_capacity (line 447)",
"src/extensions.rs - extensions::Extensions::get (line 57)",
"src/request.rs - request::Request (line 99)",
"src/request.rs - request::Request (line 119)",
"src/header/map.rs - header::map::HeaderMap<T>::clear (line 565)",
"src/extensions.rs - extensions::Extensions::clear (line 118)",
"src/request.rs - request::Request (line 139)",
"src/extensions.rs - extensions::Extensions::remove (line 96)",
"src/extensions.rs - extensions::Extensions::get_mut (line 75)",
"src/request.rs - request::Builder::method (line 755)",
"src/request.rs - request::Request<()>::head (line 330)",
"src/request.rs - request::Request<()>::delete (line 287)",
"src/request.rs - request::Builder::version (line 813)",
"src/request.rs - request::Request<T>::from_parts (line 435)",
"src/request.rs - request::Request<()>::connect (line 351)",
"src/request.rs - request::Builder::new (line 733)",
"src/request.rs - request::Request<()>::get (line 224)",
"src/header/map.rs - header::map::Entry<'a, T>::key (line 2169)",
"src/request.rs - request::Request<()>::patch (line 372)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::into_key (line 2206)",
"src/header/map.rs - header::map::HeaderMap<T>::reserve (line 621)",
"src/request.rs - request::Builder::uri (line 784)",
"src/request.rs - request::Request<T>::body_mut (line 617)",
"src/request.rs - request::Request<T>::headers (line 542)",
"src/request.rs - request::Request<T>::body (line 603)",
"src/header/map.rs - header::map::HeaderMap<T>::is_empty (line 545)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1672)",
"src/request.rs - request::Request<()>::trace (line 393)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::key (line 2192)",
"src/header/map.rs - header::map::HeaderMap<T>::remove (line 1281)",
"src/request.rs - request::Request<T>::extensions (line 573)",
"src/header/map.rs - header::map::HeaderMap<T>::keys (line 833)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::insert (line 2225)",
"src/request.rs - request::Request<()>::options (line 308)",
"src/request.rs - request::Request<()>::put (line 245)",
"src/header/map.rs - header::map::HeaderMap<T>::insert (line 1070)",
"src/response.rs - response (line 12)",
"src/header/map.rs - header::map::HeaderMap (line 21)",
"src/header/map.rs - header::map::HeaderMap<T>::keys_len (line 521)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert_with (line 2131)",
"src/response.rs - response (line 30)",
"src/response.rs - response (line 42)",
"src/request.rs - request::Request<()>::post (line 266)",
"src/header/map.rs - header::map::HeaderMap<T>::iter (line 771)",
"src/header/map.rs - header::map::HeaderMap<T>::entry (line 993)",
"src/header/map.rs - header::map::HeaderMap<T>::iter_mut (line 803)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1687)",
"src/header/map.rs - header::map::HeaderMap<T>::values_mut (line 881)",
"src/header/map.rs - header::map::HeaderMap<T>::append (line 1159)",
"src/request.rs - request::Request<T>::version (line 513)",
"src/header/map.rs - header::map::HeaderMap<T>::get (line 656)",
"src/request.rs - request::Builder::extension (line 868)",
"src/header/map.rs - header::map::HeaderMap<T>::values (line 857)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert (line 2091)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::insert (line 2644)",
"src/header/map.rs - header::map::VacantEntry<'a, T>::insert_entry (line 2254)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::key (line 2546)",
"src/request.rs - request::Request<T>::into_body (line 633)",
"src/header/map.rs - header::map::Entry<'a, T>::or_insert_with (line 2143)",
"src/response.rs - response::Response (line 105)",
"src/header/map.rs - header::map::HeaderMap<T>::contains_key (line 748)",
"src/request.rs - request::Request<T>::map (line 664)",
"src/header/map.rs - header::map::HeaderMap<T>::get_all (line 720)",
"src/header/map.rs - header::map::GetAll<'a, T>::iter (line 2292)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::insert_mult (line 2667)",
"src/header/map.rs - header::map::HeaderMap<T>::get_mut (line 689)",
"src/response.rs - response::Response<T>::headers (line 343)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::remove (line 2720)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::iter (line 2788)",
"src/response.rs - response::Response (line 117)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::get (line 2569)",
"src/response.rs - response::Builder::version (line 581)",
"src/header/map.rs - header::map::HeaderMap<T>::capacity (line 592)",
"src/header/map.rs - header::map::HeaderMap<T>::len (line 494)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::into_mut (line 2621)",
"src/header/map.rs - header::map::HeaderMap<T>::drain (line 904)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::remove_entry (line 2744)",
"src/response.rs - response::Response<T>::body (line 403)",
"src/response.rs - response::Response (line 87)",
"src/request.rs - request::Request<T>::into_parts (line 648)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::get_mut (line 2596)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::append (line 2693)",
"src/request.rs - request::Request<T>::method (line 455)",
"src/request.rs - request::Request<T>::uri (line 484)",
"src/response.rs - response::Response (line 161)",
"src/response.rs - response::Response (line 141)",
"src/request.rs - request::Request<T>::version_mut (line 527)",
"src/response.rs - response::Response<T>::body_mut (line 417)",
"src/header/map.rs - header::map::OccupiedEntry<'a, T>::iter_mut (line 2812)",
"src/response.rs - response::Response<T>::from_parts (line 262)",
"src/request.rs - request::Request<()>::builder (line 202)",
"src/response.rs - response::Response<T>::status (line 285)",
"src/response.rs - response::Response<T>::extensions (line 373)",
"src/response.rs - response::Builder::body (line 683)",
"src/request.rs - request::Request<T>::method_mut (line 469)",
"src/response.rs - response::Response<T>::version_mut (line 328)",
"src/status.rs - status::StatusCode::as_u16 (line 109)",
"src/response.rs - response::Builder::new (line 530)",
"src/request.rs - request::Request<T>::new (line 416)",
"src/response.rs - response::Response<T>::status_mut (line 299)",
"src/response.rs - response::Builder::status (line 552)",
"src/request.rs - request::Request<T>::uri_mut (line 498)",
"src/header/map.rs - header::map::HeaderMap<T>::extend (line 1741)",
"src/response.rs - response::Response<T>::into_body (line 432)",
"src/uri/authority.rs - uri::authority::Authority (line 291)",
"src/request.rs - request::Request<T>::extensions_mut (line 587)",
"src/status.rs - status::StatusCode::canonical_reason (line 147)",
"src/uri/authority.rs - uri::authority::Authority::from_static (line 69)",
"src/response.rs - response::Response<T>::into_parts (line 447)",
"src/request.rs - request::Builder::header (line 836)",
"src/uri/authority.rs - uri::authority::Authority::from_shared (line 31)",
"src/status.rs - status (line 9)",
"src/uri/authority.rs - uri::authority::Authority::port (line 192)",
"src/response.rs - response::Response<T>::map (line 463)",
"src/status.rs - status::StatusCode::from_u16 (line 62)",
"src/uri/authority.rs - uri::authority::Authority::port (line 201)",
"src/uri/authority.rs - uri::authority::Authority::host (line 163)",
"src/response.rs - response::Response<T>::version (line 314)",
"src/response.rs - response::Response<T>::new (line 243)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 225)",
"src/uri/mod.rs - uri::Uri::from_shared (line 224)",
"src/response.rs - response::Builder::extension (line 637)",
"src/status.rs - status::StatusCode (line 197)",
"src/uri/authority.rs - uri::authority::Authority (line 245)",
"src/status.rs - status::StatusCode (line 35)",
"src/status.rs - status::StatusCode::as_str (line 125)",
"src/version.rs - version (line 12)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 203)",
"src/request.rs - request::Request<T>::headers_mut (line 556)",
"src/uri/mod.rs - uri (line 11)",
"src/uri/scheme.rs - uri::scheme::Scheme (line 183)",
"src/uri/scheme.rs - uri::scheme::Scheme::from_shared (line 50)",
"src/uri/scheme.rs - uri::scheme::Scheme::as_str (line 87)",
"src/uri/authority.rs - uri::authority::Authority (line 357)",
"src/uri/mod.rs - uri::Uri (line 81)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 194)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 234)",
"src/response.rs - response::Response<T>::headers_mut (line 357)",
"src/uri/path.rs - uri::path::PathAndQuery::path (line 153)",
"src/uri/path.rs - uri::path::PathAndQuery::from_static (line 102)",
"src/uri/path.rs - uri::path::PathAndQuery::from_shared (line 26)",
"src/response.rs - response::Builder::header (line 604)",
"src/response.rs - response::Response<()>::builder (line 221)",
"src/response.rs - response::Response<T>::extensions_mut (line 387)"
] |
[] |
[] |
hyperium/http
| 445
|
hyperium__http-445
|
[
"435"
] |
b00473c3ec942c03de55e47af1070b16a9dd23d8
|
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -50,7 +50,6 @@ impl Authority {
.expect("static str is not valid authority")
}
-
/// Attempt to convert a `Bytes` buffer to a `Authority`.
///
/// This will try to prevent a copy if the type passed is the type used
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -91,13 +90,16 @@ impl Authority {
colon_cnt += 1;
}
b'[' => {
- start_bracket = true;
- if has_percent {
+ if has_percent || start_bracket {
// Something other than the userinfo has a `%`, so reject it.
return Err(ErrorKind::InvalidAuthority.into());
}
+ start_bracket = true;
}
b']' => {
+ if end_bracket {
+ return Err(ErrorKind::InvalidAuthority.into());
+ }
end_bracket = true;
// Those were part of an IPv6 hostname, so forget them...
|
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -642,4 +644,10 @@ mod tests {
.unwrap_err();
assert_eq!(err.0, ErrorKind::InvalidUriChar);
}
+
+ #[test]
+ fn rejects_invalid_use_of_brackets() {
+ let err = Authority::parse_non_empty(b"[]@[").unwrap_err();
+ assert_eq!(err.0, ErrorKind::InvalidAuthority);
+ }
}
|
Unexpected panic for malformed URI with brackets
Doing some fuzzing I encountered this:
```
let uri = "http://[]@[";
let uri = uri.parse::<http::Uri>().unwrap(); // is ok
uri.host(); // panics
```
The panic is `parsing should validate brackets` and come from here: https://github.com/hyperium/http/blob/v0.2.1/src/uri/authority.rs#L486
I expect this to surface as an `Err` and panic on `.unwrap()`.
|
Yep, this looks wrong. Thanks for reporting!
|
2020-11-22T20:06:37Z
|
0.2
|
2020-12-09T21:17:55Z
|
b00473c3ec942c03de55e47af1070b16a9dd23d8
|
[
"uri::authority::tests::rejects_invalid_use_of_brackets"
] |
[
"error::tests::inner_error_is_invalid_status_code",
"header::map::test_bounds",
"extensions::test_extensions",
"header::map::skip_duplicates_during_key_iteration",
"header::name::tests::test_bounds",
"header::name::tests::test_all_tokens",
"header::name::tests::test_eq_hdr_name",
"header::name::test_parse_standard_headers",
"header::name::tests::test_from_hdr_name",
"header::name::tests::test_from_static_custom_long",
"header::name::test_standard_headers_into_bytes",
"header::name::tests::test_from_static_custom_short",
"header::name::tests::test_from_static_custom_long_symbol",
"header::name::tests::test_from_static_custom_long_uppercase",
"header::name::tests::test_from_static_custom_short_uppercase",
"header::name::tests::test_from_static_custom_single_char",
"header::name::tests::test_from_static_std",
"header::name::tests::test_from_static_custom_short_symbol",
"header::name::tests::test_from_static_std_symbol",
"header::name::tests::test_from_static_empty",
"header::name::tests::test_from_static_std_uppercase",
"header::value::from_header_name_tests::it_can_insert_header_name_as_header_value",
"header::value::from_i16",
"header::value::from_i32",
"header::value::from_i64",
"header::value::from_u16",
"header::value::from_u32",
"header::value::from_u64",
"header::value::from_usize",
"header::value::test_debug",
"header::value::test_try_from",
"header::value::try_from_header_name_tests::it_converts_using_try_from",
"method::test::test_extention_method",
"method::test::test_invalid_method",
"header::name::tests::test_parse_invalid_headers",
"method::test::test_is_idempotent",
"method::test::test_method_eq",
"request::tests::it_can_map_a_body_from_one_type_to_another",
"response::tests::it_can_map_a_body_from_one_type_to_another",
"uri::authority::tests::allows_percent_in_ipv6_address",
"uri::authority::tests::allows_percent_in_userinfo",
"uri::authority::tests::compares_to_self",
"uri::authority::tests::compares_with_a_str",
"uri::authority::tests::compares_with_a_string",
"uri::authority::tests::equal_to_self_of_same_authority",
"uri::authority::tests::equates_with_a_str",
"uri::authority::tests::equates_with_a_string",
"uri::authority::tests::equates_with_a_string_of_a_different_authority",
"uri::authority::tests::from_static_equates_with_a_str",
"uri::authority::tests::not_equal_to_self_of_different_authority",
"uri::authority::tests::not_equal_with_a_str_of_a_different_authority",
"uri::authority::tests::parse_empty_string_is_error",
"uri::authority::tests::rejects_invalid_utf8",
"header::value::from_isize",
"uri::authority::tests::rejects_percent_in_hostname",
"uri::authority::tests::rejects_percent_outside_ipv6_address",
"uri::path::tests::compares_to_self",
"uri::path::tests::compares_with_a_str",
"uri::path::tests::compares_with_a_string",
"uri::path::tests::equal_to_self_of_same_path",
"uri::path::tests::equates_with_a_str",
"uri::path::tests::equates_with_a_string",
"uri::path::tests::ignores_invalid_percent_encodings",
"uri::path::tests::ignores_valid_percent_encodings",
"uri::path::tests::not_equal_to_self_of_different_path",
"uri::path::tests::not_equal_with_a_string_of_a_different_path",
"uri::port::tests::partialeq_port",
"uri::port::tests::partialeq_port_different_reprs",
"uri::port::tests::partialeq_u16",
"uri::port::tests::u16_from_port",
"uri::scheme::test::invalid_scheme_is_error",
"uri::scheme::test::scheme_eq_to_str",
"uri::tests::test_authority_uri_parts_round_trip",
"uri::tests::test_char_table",
"uri::tests::test_ipv6_shorthand",
"uri::tests::test_ipv6",
"uri::tests::test_ipv6_shorthand2",
"uri::path::tests::not_equal_with_a_str_of_a_different_path",
"uri::tests::test_ipv6_shorthand3",
"uri::tests::test_max_length_scheme",
"uri::tests::test_ipv6_with_port",
"uri::tests::test_partial_eq_path_with_terminating_questionmark",
"uri::tests::test_overflowing_scheme",
"uri::tests::test_path_permissive",
"uri::tests::test_percentage_encoded_path",
"uri::tests::test_query_permissive",
"uri::tests::test_uri_authority_only_one_character_issue_197",
"uri::tests::test_uri_parse_absolute_form",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_questionmark",
"uri::tests::test_max_uri_len",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_nonempty_query",
"uri::tests::test_uri_parse_absolute_form_without_path",
"uri::tests::test_uri_parse_absolute_with_default_port_http",
"uri::tests::test_uri_parse_absolute_with_default_port_https",
"uri::tests::test_uri_parse_asterisk_form",
"uri::tests::test_uri_parse_authority_form",
"uri::tests::test_uri_parse_authority_no_port",
"uri::tests::test_uri_parse_error",
"uri::tests::test_uri_parse_fragment_questionmark",
"uri::tests::test_uri_parse_path_and_query",
"uri::tests::test_uri_parse_long_host_with_no_scheme",
"uri::tests::test_uri_parse_long_host_with_port_and_no_scheme",
"uri::tests::test_uri_parse_path_with_terminating_questionmark",
"uri::tests::test_uri_to_path_and_query",
"uri::tests::test_userinfo1",
"uri::tests::test_userinfo2",
"uri::tests::test_userinfo3",
"uri::tests::test_userinfo_pass_with_port",
"uri::tests::test_userinfo_with_port",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_slash",
"header::name::tests::test_invalid_name_lengths",
"append_multiple_values",
"as_header_name",
"drain_drop_immediately",
"drain",
"drain_entry",
"drain_forget",
"get_invalid",
"eq",
"into_header_name",
"insert_invalid",
"reserve_overflow",
"reserve_over_capacity",
"smoke",
"value_htab",
"with_capacity_overflow",
"with_capacity_max",
"insert_all_std_headers",
"insert_79_custom_std_headers",
"header_map_fuzz",
"equates_with_u16",
"from_bytes",
"roundtrip",
"src/request.rs - request (line 12)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 94)",
"src/header/value.rs - header::value::HeaderValue::from_name (line 110)",
"src/header/value.rs - header::value::HeaderValue::to_str (line 221)",
"src/header/value.rs - header::value::HeaderValue::from_static (line 54)",
"src/lib.rs - (line 129)",
"src/header/name.rs - header::name::HeaderName::eq (line 1941)",
"src/method.rs - method (line 10)",
"src/method.rs - method::Method (line 38)",
"src/header/map.rs - header::map::HeaderMap<T>::with_capacity (line 460)",
"src/lib.rs - (line 110)",
"src/header/name.rs - header::name::HeaderName::from_lowercase (line 1693)",
"src/header/map.rs - header::map::HeaderMap<T>::keys (line 853)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 140)",
"src/header/map.rs - header::map::Entry::or_insert (line 2241)",
"src/header/map.rs - header::map::HeaderMap<T>::is_empty (line 550)",
"src/header/value.rs - header::value::HeaderValue::is_empty (line 258)",
"src/extensions.rs - extensions::Extensions::get_mut (line 97)",
"src/header/map.rs - header::map::HeaderMap<T>::entry (line 1027)",
"src/header/map.rs - header::map::OccupiedEntry::iter (line 2958)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 132)",
"src/header/value.rs - header::value::HeaderValue::is_sensitive (line 320)",
"src/header/map.rs - header::map::HeaderMap<T>::append (line 1219)",
"src/lib.rs - (line 57)",
"src/request.rs - request (line 37)",
"src/header/map.rs - header::map::HeaderMap::new (line 436)",
"src/lib.rs - (line 120)",
"src/lib.rs - (line 149)",
"src/request.rs - request::Request (line 75)",
"src/header/map.rs - header::map::VacantEntry::insert_entry (line 2399)",
"src/header/map.rs - header::map::HeaderMap<T>::iter (line 791)",
"src/header/value.rs - header::value::HeaderValue::set_sensitive (line 289)",
"src/header/map.rs - header::map::HeaderMap<T>::clear (line 570)",
"src/header/value.rs - header::value::HeaderValue::as_bytes (line 275)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1753)",
"src/lib.rs - (line 33)",
"src/extensions.rs - extensions::Extensions::insert (line 55)",
"src/request.rs - request::Builder::body (line 1027)",
"src/header/map.rs - header::map::VacantEntry::key (line 2340)",
"src/header/map.rs - header::map::HeaderMap<T>::len (line 499)",
"src/extensions.rs - extensions::Extensions::remove (line 118)",
"src/extensions.rs - extensions::Extensions::get (line 78)",
"src/header/map.rs - header::map::GetAll::iter (line 2433)",
"src/header/map.rs - header::map::HeaderMap<T>::contains_key (line 767)",
"src/header/map.rs - header::map::HeaderMap<T>::insert (line 1123)",
"src/header/map.rs - header::map::HeaderMap<T>::reserve (line 626)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1739)",
"src/header/map.rs - header::map::OccupiedEntry::iter_mut (line 2982)",
"src/header/map.rs - header::map::VacantEntry::into_key (line 2354)",
"src/header/map.rs - header::map::HeaderMap<T>::get_mut (line 706)",
"src/header/value.rs - header::value::HeaderValue::len (line 244)",
"src/header/map.rs - header::map::Entry::key (line 2317)",
"src/extensions.rs - extensions::Extensions::clear (line 141)",
"src/request.rs - request::Request (line 120)",
"src/lib.rs - (line 101)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 86)",
"src/header/name.rs - header::name::str::eq (line 1960)",
"src/header/map.rs - header::map::OccupiedEntry::remove (line 2887)",
"src/header/map.rs - header::map::HeaderMap<T>::drain (line 932)",
"src/header/map.rs - header::map::OccupiedEntry::get_mut (line 2763)",
"src/response.rs - response (line 42)",
"src/request.rs - request::Request (line 140)",
"src/header/map.rs - header::map::OccupiedEntry::into_mut (line 2788)",
"src/header/map.rs - header::map::VacantEntry::insert (line 2373)",
"src/header/map.rs - header::map::HeaderMap (line 27)",
"src/header/map.rs - header::map::HeaderMap<T>::keys_len (line 526)",
"src/request.rs - request::Request (line 100)",
"src/request.rs - request::Builder::extension (line 958)",
"src/response.rs - response::Response (line 118)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1755)",
"src/header/map.rs - header::map::HeaderMap<T>::remove (line 1341)",
"src/header/map.rs - header::map::OccupiedEntry::insert_mult (line 2834)",
"src/header/map.rs - header::map::OccupiedEntry::get (line 2736)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1740)",
"src/header/map.rs - header::map::OccupiedEntry::insert (line 2811)",
"src/header/map.rs - header::map::Entry::or_insert_with (line 2280)",
"src/header/map.rs - header::map::HeaderMap<T>::get (line 665)",
"src/header/map.rs - header::map::OccupiedEntry::remove_entry (line 2911)",
"src/header/map.rs - header::map::OccupiedEntry::append (line 2860)",
"src/header/map.rs - header::map::HeaderMap<T>::get_all (line 738)",
"src/request.rs - request::Builder::method_ref (line 797)",
"src/request.rs - request::Request<()>::connect (line 362)",
"src/header/map.rs - header::map::HeaderMap<T>::values_mut (line 903)",
"src/request.rs - request::Builder::uri_ref (line 844)",
"src/request.rs - request::Builder::new (line 749)",
"src/header/map.rs - header::map::HeaderMap<T> (line 1801)",
"src/header/map.rs - header::map::HeaderMap<T>::capacity (line 597)",
"src/header/map.rs - header::map::HeaderMap<T>::iter_mut (line 823)",
"src/request.rs - request::Request<T>::body (line 617)",
"src/request.rs - request::Builder::method (line 771)",
"src/header/map.rs - header::map::HeaderMap<T>::extend (line 1845)",
"src/response.rs - response (line 12)",
"src/header/map.rs - header::map::OccupiedEntry::key (line 2713)",
"src/request.rs - request::Builder::version (line 866)",
"src/request.rs - request::Request<()>::patch (line 385)",
"src/request.rs - request::Request<T>::body_mut (line 631)",
"src/request.rs - request::Request<T>::headers (line 557)",
"src/response.rs - response (line 30)",
"src/request.rs - request::Request<()>::trace (line 407)",
"src/request.rs - request::Request<()>::put (line 246)",
"src/request.rs - request::Request<()>::head (line 339)",
"src/request.rs - request::Request<T>::uri (line 499)",
"src/header/map.rs - header::map::HeaderMap<T>::values (line 879)",
"src/request.rs - request::Request<T>::extensions (line 587)",
"src/header/map.rs - header::map::Entry::or_insert_with (line 2292)",
"src/request.rs - request::Request<()>::options (line 315)",
"src/request.rs - request::Request<T>::into_parts (line 661)",
"src/request.rs - request::Request<T>::new (line 431)",
"src/request.rs - request::Request<()>::get (line 223)",
"src/request.rs - request::Request<()>::delete (line 292)",
"src/request.rs - request::Builder::headers_mut (line 938)",
"src/request.rs - request::Builder::extensions_ref (line 985)",
"src/request.rs - request::Builder::extensions_mut (line 1002)",
"src/request.rs - request::Request<T>::version (line 528)",
"src/request.rs - request::Builder::uri (line 819)",
"src/request.rs - request::Request<()>::post (line 269)",
"src/request.rs - request::Request<T>::extensions_mut (line 601)",
"src/request.rs - request::Request<T>::method_mut (line 484)",
"src/request.rs - request::Request<T>::method (line 470)",
"src/request.rs - request::Request<()>::builder (line 202)",
"src/response.rs - response::Response (line 162)",
"src/response.rs - response::Response (line 88)",
"src/response.rs - response::Response (line 106)",
"src/request.rs - request::Builder::header (line 889)",
"src/response.rs - response::Builder::version (line 584)",
"src/request.rs - request::Request<T>::from_parts (line 450)",
"src/response.rs - response::Builder::body (line 749)",
"src/request.rs - request::Request<T>::into_body (line 646)",
"src/request.rs - request::Builder::headers_ref (line 919)",
"src/request.rs - request::Request<T>::headers_mut (line 571)",
"src/request.rs - request::Request<T>::map (line 677)",
"src/response.rs - response::Builder::extensions_mut (line 724)",
"src/response.rs - response::Response (line 142)",
"src/response.rs - response::Builder::header (line 607)",
"src/response.rs - response::Builder::headers_ref (line 639)",
"src/response.rs - response::Response<T>::from_parts (line 262)",
"src/request.rs - request::Request<T>::uri_mut (line 513)",
"src/response.rs - response::Response<T>::body (line 403)",
"src/response.rs - response::Response<T>::into_parts (line 447)",
"src/request.rs - request::Request<T>::version_mut (line 542)",
"src/response.rs - response::Builder::status (line 556)",
"src/response.rs - response::Response<T>::version (line 314)",
"src/response.rs - response::Response<T>::status (line 285)",
"src/response.rs - response::Builder::extension (line 680)",
"src/response.rs - response::Builder::new (line 534)",
"src/status.rs - status (line 9)",
"src/status.rs - status::StatusCode::as_u16 (line 107)",
"src/response.rs - response::Builder::extensions_ref (line 707)",
"src/response.rs - response::Response<T>::version_mut (line 328)",
"src/response.rs - response::Response<T>::into_body (line 432)",
"src/response.rs - response::Response<T>::extensions (line 373)",
"src/response.rs - response::Response<T>::map (line 463)",
"src/status.rs - status::StatusCode (line 195)",
"src/response.rs - response::Response<T>::body_mut (line 417)",
"src/status.rs - status::StatusCode::as_str (line 123)",
"src/response.rs - response::Response<T>::new (line 243)",
"src/response.rs - response::Response<T>::extensions_mut (line 387)",
"src/status.rs - status::StatusCode::from_u16 (line 60)",
"src/status.rs - status::StatusCode (line 34)",
"src/uri/builder.rs - uri::builder::Builder::build (line 122)",
"src/uri/builder.rs - uri::builder::Builder::scheme (line 39)",
"src/status.rs - status::StatusCode::canonical_reason (line 146)",
"src/uri/authority.rs - uri::authority::Authority::from_static (line 43)",
"src/response.rs - response::Response<T>::headers (line 343)",
"src/uri/builder.rs - uri::builder::Builder::authority (line 61)",
"src/uri/mod.rs - uri::Parts (line 738)",
"src/response.rs - response::Response<T>::status_mut (line 299)",
"src/response.rs - response::Builder::headers_mut (line 658)",
"src/uri/mod.rs - uri::Uri::into_parts (line 345)",
"src/response.rs - response::Response<T>::headers_mut (line 357)",
"src/uri/mod.rs - uri::Uri (line 82)",
"src/uri/builder.rs - uri::builder::Builder::new (line 20)",
"src/uri/mod.rs - uri::Uri::port (line 581)",
"src/uri/mod.rs - uri::Uri::authority (line 510)",
"src/uri/port.rs - uri::port::Port<T>::as_str (line 51)",
"src/uri/mod.rs - uri::Parts (line 753)",
"src/uri/mod.rs - uri::Uri::path (line 399)",
"src/response.rs - response::Response<()>::builder (line 221)",
"src/uri/mod.rs - uri::Uri::builder (line 190)",
"src/uri/mod.rs - uri::Uri::host (line 552)",
"src/uri/mod.rs - uri::Uri::host (line 542)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 250)",
"src/version.rs - version (line 12)",
"src/uri/mod.rs - uri::Uri::from_static (line 321)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 210)",
"src/uri/builder.rs - uri::builder::Builder::path_and_query (line 85)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 219)",
"src/uri/mod.rs - uri::Uri::scheme (line 432)",
"src/uri/mod.rs - uri (line 11)",
"src/uri/path.rs - uri::path::PathAndQuery::path (line 169)",
"src/uri/mod.rs - uri::Uri::path (line 389)",
"src/uri/mod.rs - uri::Uri::scheme (line 443)",
"src/uri/mod.rs - uri::Uri::scheme_str (line 462)",
"src/uri/mod.rs - uri::Uri::port (line 600)",
"src/uri/scheme.rs - uri::scheme::Scheme (line 148)",
"src/uri/mod.rs - uri::Uri::port_u16 (line 615)",
"src/uri/mod.rs - uri::Uri::authority (line 500)",
"src/uri/mod.rs - uri::Uri::query (line 653)",
"src/uri/mod.rs - uri::Uri::query (line 644)",
"src/uri/path.rs - uri::path::PathAndQuery::from_static (line 104)",
"src/uri/port.rs - uri::port::Port<T>::as_u16 (line 18)",
"src/uri/mod.rs - uri::Uri::query (line 662)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 241)",
"src/uri/scheme.rs - uri::scheme::Scheme::as_str (line 51)",
"src/uri/mod.rs - uri::Uri::port (line 591)"
] |
[] |
[] |
hyperium/http
| 360
|
hyperium__http-360
|
[
"352"
] |
32f1ae19f1d26c815cc935b742a94996f5a8a9bd
|
diff --git a/src/header/map.rs b/src/header/map.rs
--- a/src/header/map.rs
+++ b/src/header/map.rs
@@ -638,6 +638,8 @@ impl<T> HeaderMap<T> {
if cap > self.indices.len() {
let cap = cap.next_power_of_two();
+ assert!(cap < MAX_SIZE, "header map reserve over max capacity");
+ assert!(cap != 0, "header map reserve overflowed");
if self.entries.len() == 0 {
self.mask = cap - 1;
|
diff --git a/tests/header_map.rs b/tests/header_map.rs
--- a/tests/header_map.rs
+++ b/tests/header_map.rs
@@ -37,6 +37,22 @@ fn smoke() {
}
}
+#[test]
+#[should_panic]
+fn reserve_over_capacity() {
+ // See https://github.com/hyperium/http/issues/352
+ let mut headers = HeaderMap::<u32>::with_capacity(32);
+ headers.reserve(50_000); // over MAX_SIZE
+}
+
+#[test]
+#[should_panic]
+fn reserve_overflow() {
+ // See https://github.com/hyperium/http/issues/352
+ let mut headers = HeaderMap::<u32>::with_capacity(0);
+ headers.reserve(std::usize::MAX); // next_power_of_two overflows
+}
+
#[test]
fn drain() {
let mut headers = HeaderMap::new();
|
Size issue in `HeaderMap::reserve()`
https://github.com/hyperium/http/blob/9c05e391e00474abaa8c14a86bcb0fc5eff1120e/src/header/map.rs#L622-L640
[`usize::next_power_of_two()`](https://doc.rust-lang.org/std/primitive.usize.html#method.next_power_of_two) method silently overflows to 0 in release mode. This makes it possible to shrink the size of the map to 0 with `HeaderMap::reserve()`.
- If the map doesn't contain any entry, it sets the mask value to `usize::MAX` which is inconsistent but doesn't create any immediate harm.
- If the map contains any entry, the code will call `self.grow(0)` and start infinite probing in [this line](https://github.com/hyperium/http/blob/9c05e391e00474abaa8c14a86bcb0fc5eff1120e/src/header/map.rs#L1623).
Another problem is that the assertion for `MAX_SIZE` doesn't exist here, so it is possible to grow the map larger than `MAX_SIZE`.
[Demonstration](https://play.rust-lang.org/?version=stable&mode=release&edition=2018&gist=4c45d68c59cf71191983b691d44e4595)
|
@Qwaz Am I correct that the potential vulnerability this presents is that an attacker could cause a denial of service by sending a request which causes this overflow?
@hawkw An attacker can trigger a DoS if they can call `HeaderMap::reserve()` to non-empty `HeaderMap` with a controlled parameter. I believe this scenario is unlikely in practice, but yes, it's theoretically possible.
|
2019-11-26T07:54:31Z
|
0.1
|
2019-11-26T00:30:19Z
|
4a5b64d22a2db9e2a4de112cef5b93372b8ac5ed
|
[
"reserve_over_capacity"
] |
[
"error::tests::inner_error_is_invalid_status_code",
"header::map::test_bounds",
"extensions::test_extensions",
"header::map::skip_duplicates_during_key_iteration",
"header::name::tests::test_bounds",
"header::name::tests::test_eq_hdr_name",
"header::name::tests::test_all_tokens",
"header::name::tests::test_from_hdr_name",
"header::name::tests::test_from_static_custom_short",
"header::name::tests::test_from_static_custom_long",
"header::name::tests::test_from_static_custom_long_uppercase",
"header::name::tests::test_from_static_custom_long_symbol",
"header::name::tests::test_from_static_custom_short_uppercase",
"header::name::tests::test_from_static_custom_single_char",
"header::name::tests::test_from_static_std",
"header::name::tests::test_from_static_std_symbol",
"header::name::tests::test_from_static_custom_short_symbol",
"header::name::tests::test_from_static_empty",
"header::value::from_i32",
"header::value::from_i64",
"header::value::from_i16",
"header::name::tests::test_from_static_std_uppercase",
"header::value::from_header_name_tests::it_can_insert_header_name_as_header_value",
"header::value::from_u16",
"header::value::from_isize",
"header::name::test_parse_standard_headers",
"header::name::test_standard_headers_into_bytes",
"header::value::from_usize",
"header::value::from_u32",
"header::value::test_debug",
"header::value::from_u64",
"header::value::try_from_header_name_tests::it_converts_using_try_from",
"header::value::test_try_from",
"method::test_method_eq",
"method::test_invalid_method",
"request::tests::it_can_map_a_body_from_one_type_to_another",
"response::tests::it_can_map_a_body_from_one_type_to_another",
"uri::authority::tests::allows_percent_in_ipv6_address",
"uri::authority::tests::allows_percent_in_userinfo",
"uri::authority::tests::compares_to_self",
"uri::authority::tests::compares_with_a_str",
"uri::authority::tests::compares_with_a_string",
"uri::authority::tests::equal_to_self_of_same_authority",
"uri::authority::tests::equates_with_a_str",
"uri::authority::tests::equates_with_a_string",
"uri::authority::tests::equates_with_a_string_of_a_different_authority",
"uri::authority::tests::not_equal_to_self_of_different_authority",
"uri::authority::tests::not_equal_with_a_str_of_a_different_authority",
"uri::authority::tests::parse_empty_string_is_error",
"uri::authority::tests::rejects_percent_in_hostname",
"uri::authority::tests::rejects_percent_outside_ipv6_address",
"header::name::tests::test_parse_invalid_headers",
"uri::path::tests::compares_to_self",
"uri::path::tests::compares_with_a_str",
"uri::path::tests::compares_with_a_string",
"uri::path::tests::equal_to_self_of_same_path",
"uri::path::tests::equates_with_a_str",
"uri::path::tests::equates_with_a_string",
"uri::path::tests::ignores_valid_percent_encodings",
"uri::path::tests::ignores_invalid_percent_encodings",
"uri::path::tests::not_equal_to_self_of_different_path",
"uri::path::tests::not_equal_with_a_str_of_a_different_path",
"uri::path::tests::not_equal_with_a_string_of_a_different_path",
"uri::port::tests::partialeq_port",
"uri::port::tests::partialeq_port_different_reprs",
"uri::port::tests::partialeq_u16",
"uri::port::tests::u16_from_port",
"uri::tests::test_authority_uri_parts_round_trip",
"uri::tests::test_char_table",
"uri::tests::test_ipv6_shorthand",
"uri::tests::test_ipv6",
"uri::tests::test_ipv6_shorthand2",
"uri::tests::test_ipv6_shorthand3",
"uri::tests::test_long_scheme",
"uri::tests::test_ipv6_with_port",
"uri::tests::test_partial_eq_path_with_terminating_questionmark",
"uri::tests::test_path_permissive",
"uri::tests::test_percentage_encoded_path",
"uri::tests::test_query_permissive",
"uri::tests::test_uri_authority_only_one_character_issue_197",
"uri::tests::test_uri_parse_absolute_form",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_questionmark",
"uri::tests::test_max_uri_len",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_slash",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_nonempty_query",
"uri::tests::test_uri_parse_absolute_form_without_path",
"uri::tests::test_uri_parse_absolute_with_default_port_http",
"uri::tests::test_uri_parse_asterisk_form",
"uri::tests::test_uri_parse_absolute_with_default_port_https",
"uri::tests::test_uri_parse_authority_form",
"uri::tests::test_uri_parse_authority_no_port",
"uri::tests::test_uri_parse_error",
"uri::tests::test_uri_parse_fragment_questionmark",
"uri::tests::test_uri_parse_path_and_query",
"uri::tests::test_uri_parse_path_with_terminating_questionmark",
"uri::tests::test_uri_to_path_and_query",
"uri::tests::test_userinfo1",
"uri::tests::test_userinfo2",
"uri::tests::test_userinfo3",
"uri::tests::test_userinfo_pass_with_port",
"uri::tests::test_userinfo_with_port",
"append_multiple_values",
"as_header_name",
"drain",
"drain_drop_immediately",
"drain_forget",
"get_invalid",
"drain_entry",
"eq",
"into_header_name",
"reserve_overflow",
"value_htab",
"insert_invalid",
"smoke",
"insert_all_std_headers",
"insert_79_custom_std_headers",
"header_map_fuzz",
"equates_with_u16",
"from_bytes",
"roundtrip",
"src/request.rs - request (line 12)",
"src/request.rs - request (line 37)",
"src/lib.rs - (line 57)",
"src/lib.rs - (line 33)",
"src/method.rs - method::Method (line 37)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 100)",
"src/header/value.rs - header::value::HeaderValue::len (line 237)",
"src/header/value.rs - header::value::HeaderValue::from_name (line 116)",
"src/method.rs - method (line 10)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 146)",
"src/header/map.rs - header::map::HeaderMap::new (line 434)",
"src/header/name.rs - header::name::HeaderName::from_lowercase (line 1698)",
"src/header/value.rs - header::value::HeaderValue::is_sensitive (line 308)",
"src/header/value.rs - header::value::HeaderValue::is_empty (line 251)",
"src/lib.rs - (line 129)",
"src/header/map.rs - header::map::HeaderMap<T>::with_capacity (line 458)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1757)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 138)",
"src/header/value.rs - header::value::HeaderValue::set_sensitive (line 282)",
"src/header/value.rs - header::value::HeaderValue::from_static (line 60)",
"src/lib.rs - (line 101)",
"src/header/name.rs - header::name::str::eq (line 1985)",
"src/header/name.rs - header::name::HeaderName::eq (line 1965)",
"src/lib.rs - (line 149)",
"src/header/value.rs - header::value::HeaderValue::to_str (line 214)",
"src/lib.rs - (line 110)",
"src/lib.rs - (line 120)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1743)",
"src/request.rs - request::Request (line 74)",
"src/header/value.rs - header::value::HeaderValue::as_bytes (line 268)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 92)",
"src/extensions.rs - extensions::Extensions::get_mut (line 113)",
"src/extensions.rs - extensions::Extensions::remove (line 141)",
"src/header/map.rs - header::map::HeaderMap<T>::len (line 498)",
"src/extensions.rs - extensions::Extensions::get (line 88)",
"src/header/map.rs - header::map::HeaderMap (line 27)",
"src/extensions.rs - extensions::Extensions::insert (line 61)",
"src/extensions.rs - extensions::Extensions::clear (line 168)",
"src/request.rs - request::Request (line 119)",
"src/header/map.rs - header::map::HeaderMap<T>::keys_len (line 525)",
"src/request.rs - request::Builder::body (line 1022)",
"src/header/map.rs - header::map::HeaderMap<T>::capacity (line 596)",
"src/request.rs - request::Request (line 139)",
"src/header/map.rs - header::map::HeaderMap<T>::reserve (line 625)",
"src/header/map.rs - header::map::HeaderMap<T>::is_empty (line 549)",
"src/header/map.rs - header::map::HeaderMap<T>::clear (line 569)",
"src/request.rs - request::Request (line 99)",
"src/response.rs - response (line 42)",
"src/response.rs - response::Response (line 117)",
"src/request.rs - request::Builder::method (line 753)",
"src/request.rs - request::Builder::uri (line 810)",
"src/request.rs - request::Builder::method_ref (line 780)",
"src/request.rs - request::Builder::version (line 864)",
"src/request.rs - request::Builder::uri_ref (line 835)",
"src/request.rs - request::Builder::new (line 731)",
"src/request.rs - request::Builder::extension (line 976)",
"src/request.rs - request::Request<T>::body (line 602)",
"src/response.rs - response (line 30)",
"src/request.rs - request::Request<T>::body_mut (line 616)",
"src/response.rs - response (line 12)",
"src/request.rs - request::Request<()>::trace (line 393)",
"src/request.rs - request::Request<()>::patch (line 372)",
"src/request.rs - request::Request<T>::headers (line 542)",
"src/request.rs - request::Request<()>::head (line 330)",
"src/request.rs - request::Request<()>::delete (line 287)",
"src/request.rs - request::Request<T>::extensions (line 572)",
"src/request.rs - request::Request<T>::from_parts (line 435)",
"src/request.rs - request::Request<()>::get (line 224)",
"src/request.rs - request::Request<()>::connect (line 351)",
"src/request.rs - request::Request<T>::into_parts (line 647)",
"src/request.rs - request::Request<()>::options (line 308)",
"src/response.rs - response::Response (line 105)",
"src/request.rs - request::Request<()>::post (line 266)",
"src/request.rs - request::Builder::headers_mut (line 947)",
"src/request.rs - request::Builder::headers_ref (line 920)",
"src/response.rs - response::Response (line 161)",
"src/response.rs - response::Response (line 141)",
"src/request.rs - request::Request<T>::method_mut (line 469)",
"src/response.rs - response::Response (line 87)",
"src/request.rs - request::Request<T>::method (line 455)",
"src/request.rs - request::Request<T>::into_body (line 632)",
"src/request.rs - request::Builder::header (line 887)",
"src/request.rs - request::Request<T>::version_mut (line 527)",
"src/request.rs - request::Request<T>::uri (line 484)",
"src/request.rs - request::Request<T>::new (line 416)",
"src/request.rs - request::Request<T>::map (line 663)",
"src/request.rs - request::Request<()>::builder (line 202)",
"src/request.rs - request::Request<T>::uri_mut (line 498)",
"src/request.rs - request::Request<()>::put (line 245)",
"src/request.rs - request::Request<T>::headers_mut (line 556)",
"src/response.rs - response::Builder::status (line 552)",
"src/response.rs - response::Builder::body (line 740)",
"src/response.rs - response::Response<T>::body (line 403)",
"src/request.rs - request::Request<T>::extensions_mut (line 586)",
"src/response.rs - response::Response<T>::headers (line 343)",
"src/response.rs - response::Builder::new (line 530)",
"src/response.rs - response::Builder::version (line 581)",
"src/response.rs - response::Response<T>::into_body (line 432)",
"src/status.rs - status::StatusCode (line 35)",
"src/response.rs - response::Response<T>::version (line 314)",
"src/response.rs - response::Response<T>::into_parts (line 447)",
"src/response.rs - response::Response<T>::body_mut (line 417)",
"src/response.rs - response::Response<T>::extensions (line 373)",
"src/response.rs - response::Response<T>::from_parts (line 262)",
"src/status.rs - status (line 9)",
"src/status.rs - status::StatusCode::canonical_reason (line 146)",
"src/status.rs - status::StatusCode::as_str (line 124)",
"src/response.rs - response::Response<T>::map (line 463)",
"src/response.rs - response::Response<T>::version_mut (line 328)",
"src/response.rs - response::Response<T>::status (line 285)",
"src/request.rs - request::Request<T>::version (line 513)",
"src/response.rs - response::Response<T>::new (line 243)",
"src/uri/authority.rs - uri::authority::Authority::host (line 197)",
"src/uri/authority.rs - uri::authority::Authority (line 301)",
"src/response.rs - response::Response<T>::status_mut (line 299)",
"src/uri/authority.rs - uri::authority::Authority::from_static (line 70)",
"src/status.rs - status::StatusCode::as_u16 (line 108)",
"src/uri/authority.rs - uri::authority::Authority (line 347)",
"src/status.rs - status::StatusCode (line 196)",
"src/uri/builder.rs - uri::builder::Builder::build (line 115)",
"src/response.rs - response::Builder::extension (line 694)",
"src/response.rs - response::Builder::header (line 604)",
"src/uri/authority.rs - uri::authority::Authority (line 413)",
"src/status.rs - status::StatusCode::from_u16 (line 61)",
"src/uri/authority.rs - uri::authority::Authority::from_shared (line 32)",
"src/uri/authority.rs - uri::authority::Authority::port_u16 (line 260)",
"src/uri/authority.rs - uri::authority::Authority::port_part (line 243)",
"src/response.rs - response::Response<T>::extensions_mut (line 387)",
"src/response.rs - response::Response<T>::headers_mut (line 357)",
"src/response.rs - response::Response<()>::builder (line 221)",
"src/uri/builder.rs - uri::builder::Builder::scheme (line 38)",
"src/uri/authority.rs - uri::authority::Authority::port_part (line 232)",
"src/uri/mod.rs - uri::Parts (line 770)",
"src/response.rs - response::Builder::headers_mut (line 665)",
"src/uri/builder.rs - uri::builder::Builder::authority (line 58)",
"src/uri/builder.rs - uri::builder::Builder::path_and_query (line 80)",
"src/uri/builder.rs - uri::builder::Builder::new (line 19)",
"src/uri/mod.rs - uri::Parts (line 785)",
"src/uri/mod.rs - uri::Uri (line 85)",
"src/uri/mod.rs - uri::Uri::authority_part (line 524)",
"src/uri/mod.rs - uri (line 11)",
"src/uri/mod.rs - uri::Uri::authority_part (line 514)",
"src/response.rs - response::Builder::headers_ref (line 638)",
"src/uri/mod.rs - uri::Uri::path (line 396)",
"src/uri/mod.rs - uri::Uri::host (line 577)",
"src/uri/mod.rs - uri::Uri::builder (line 191)",
"src/uri/mod.rs - uri::Uri::host (line 567)",
"src/version.rs - version (line 12)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 265)",
"src/uri/mod.rs - uri::Uri::port_part (line 631)",
"src/uri/mod.rs - uri::Uri::query (line 685)",
"src/uri/mod.rs - uri::Uri::port_part (line 612)",
"src/uri/path.rs - uri::path::PathAndQuery::from_static (line 133)",
"src/uri/mod.rs - uri::Uri::into_parts (line 352)",
"src/uri/mod.rs - uri::Uri::from_shared (line 250)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 450)",
"src/uri/mod.rs - uri::Uri::path (line 406)",
"src/uri/scheme.rs - uri::scheme::Scheme::as_str (line 88)",
"src/uri/mod.rs - uri::Uri::port_part (line 622)",
"src/uri/path.rs - uri::path::PathAndQuery::from_shared (line 27)",
"src/uri/mod.rs - uri::Uri::from_static (line 328)",
"src/uri/mod.rs - uri::Uri::scheme_str (line 476)",
"src/uri/port.rs - uri::port::Port<T>::as_u16 (line 18)",
"src/uri/port.rs - uri::port::Port<T>::as_str (line 56)",
"src/uri/mod.rs - uri::Uri::query (line 694)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 256)",
"src/uri/path.rs - uri::path::PathAndQuery::path (line 184)",
"src/uri/scheme.rs - uri::scheme::Scheme (line 211)",
"src/uri/mod.rs - uri::Uri::query (line 676)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 439)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 225)",
"src/uri/mod.rs - uri::Uri::port_u16 (line 647)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 234)",
"src/uri/scheme.rs - uri::scheme::Scheme::from_shared (line 51)"
] |
[] |
[] |
hyperium/http
| 343
|
hyperium__http-343
|
[
"322"
] |
78058fdd94f209304660f17c067bf30f253df298
|
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -103,15 +103,20 @@ impl Authority {
}
b':' => {
colon_cnt += 1;
- },
+ }
b'[' => {
start_bracket = true;
+ if has_percent {
+ // Something other than the userinfo has a `%`, so reject it.
+ return Err(ErrorKind::InvalidAuthority.into());
+ }
}
b']' => {
end_bracket = true;
// Those were part of an IPv6 hostname, so forget them...
colon_cnt = 0;
+ has_percent = false;
}
b'@' => {
at_sign_pos = Some(i);
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -127,8 +132,11 @@ impl Authority {
// the userinfo can have a percent-encoded username and password,
// so record that a `%` was found. If this turns out to be
// part of the userinfo, this flag will be cleared.
+ // Also per https://tools.ietf.org/html/rfc6874, percent-encoding can
+ // be used to indicate a zone identifier.
// If the flag hasn't been cleared at the end, that means this
- // was part of the hostname, and will fail with an error.
+ // was part of the hostname (and not part of an IPv6 address), and
+ // will fail with an error.
has_percent = true;
}
0 => {
|
diff --git a/src/uri/authority.rs b/src/uri/authority.rs
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -612,4 +620,20 @@ mod tests {
let err = Authority::parse_non_empty(b"a%2f:b%2f@example%2f.com").unwrap_err();
assert_eq!(err.0, ErrorKind::InvalidAuthority);
}
+
+ #[test]
+ fn allows_percent_in_ipv6_address() {
+ let authority_str = "[fe80::1:2:3:4%25eth0]";
+ let result: Authority = authority_str.parse().unwrap();
+ assert_eq!(result, authority_str);
+ }
+
+ #[test]
+ fn rejects_percent_outside_ipv6_address() {
+ let err = Authority::parse_non_empty(b"1234%20[fe80::1:2:3:4]").unwrap_err();
+ assert_eq!(err.0, ErrorKind::InvalidAuthority);
+
+ let err = Authority::parse_non_empty(b"[fe80::1:2:3:4]%20").unwrap_err();
+ assert_eq!(err.0, ErrorKind::InvalidAuthority);
+ }
}
|
Zones in link-local IPv6 addresses seems to be not supported.
```rust
extern crate http;
fn main() {
use http::uri::Uri;
use std::str::FromStr;
Uri::from_str("http://[fe80::1%25eth0]:8080/").unwrap();
}
```
`InvalidUri(InvalidAuthority)`.
It parses if I omit the zone index (`%25eth0`), but such URI is expected to be unconnectable by itself.
Should `http` crate support [RFC6874](https://tools.ietf.org/html/rfc6874) and allow link-local IPv6 in URLs?
|
For what it's worth, `SocketAddr::parse` does not handle this address either: https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=ac423a008035b1e29562123d416fa551
Yet there is `scope_id` in `SockAddrV6`, an `u32` field.
Filling it in from `parse` requires querying network interfaces information in a platform-specific way although.
P.S. For `SocketAddr::parse` it shouldn't be URL-encoded: `[fe80::1%eth0]:80`.
If we prepared a patch to introduce this feature would it be accepted?
If it is valid in the http spec and doesn’t break anything (both which sound correct) then yes!
|
2019-09-12T04:14:14Z
|
0.1
|
2019-10-07T20:04:52Z
|
4a5b64d22a2db9e2a4de112cef5b93372b8ac5ed
|
[
"uri::authority::tests::allows_percent_in_ipv6_address"
] |
[
"error::tests::inner_error_is_invalid_status_code",
"extensions::test_extensions",
"header::map::test_bounds",
"header::map::skip_duplicates_during_key_iteration",
"header::name::tests::test_bounds",
"header::name::tests::test_eq_hdr_name",
"header::name::tests::test_all_tokens",
"header::name::tests::test_from_hdr_name",
"header::name::tests::test_from_static_custom_long",
"header::name::tests::test_from_static_custom_long_symbol",
"header::name::tests::test_from_static_custom_long_uppercase",
"header::name::tests::test_from_static_custom_short",
"header::name::tests::test_from_static_custom_short_symbol",
"header::name::tests::test_from_static_custom_short_uppercase",
"header::name::test_parse_standard_headers",
"header::name::test_standard_headers_into_bytes",
"header::name::tests::test_from_static_custom_single_char",
"header::name::tests::test_from_static_std",
"header::name::tests::test_from_static_empty",
"header::value::from_i16",
"header::name::tests::test_from_static_std_uppercase",
"header::value::from_i32",
"header::value::from_header_name_tests::it_can_insert_header_name_as_header_value",
"header::name::tests::test_from_static_std_symbol",
"header::value::from_i64",
"header::value::from_u16",
"header::value::from_isize",
"header::value::from_u64",
"header::value::from_u32",
"header::value::test_try_from",
"method::test_method_eq",
"header::value::from_usize",
"header::value::try_from_header_name_tests::it_converts_using_try_from",
"header::value::test_debug",
"request::tests::it_can_map_a_body_from_one_type_to_another",
"method::test_invalid_method",
"response::tests::it_can_map_a_body_from_one_type_to_another",
"uri::authority::tests::allows_percent_in_userinfo",
"uri::authority::tests::compares_to_self",
"uri::authority::tests::compares_with_a_str",
"uri::authority::tests::compares_with_a_string",
"uri::authority::tests::equal_to_self_of_same_authority",
"header::name::tests::test_parse_invalid_headers",
"uri::authority::tests::equates_with_a_str",
"uri::authority::tests::equates_with_a_string",
"uri::authority::tests::equates_with_a_string_of_a_different_authority",
"uri::authority::tests::not_equal_to_self_of_different_authority",
"uri::authority::tests::not_equal_with_a_str_of_a_different_authority",
"uri::authority::tests::parse_empty_string_is_error",
"uri::authority::tests::rejects_percent_in_hostname",
"uri::authority::tests::rejects_percent_outside_ipv6_address",
"uri::path::tests::compares_to_self",
"uri::path::tests::compares_with_a_str",
"uri::path::tests::compares_with_a_string",
"uri::path::tests::equal_to_self_of_same_path",
"uri::path::tests::equates_with_a_str",
"uri::path::tests::equates_with_a_string",
"uri::path::tests::ignores_invalid_percent_encodings",
"uri::path::tests::ignores_valid_percent_encodings",
"uri::path::tests::not_equal_to_self_of_different_path",
"uri::path::tests::not_equal_with_a_str_of_a_different_path",
"uri::path::tests::not_equal_with_a_string_of_a_different_path",
"uri::port::tests::partialeq_port",
"uri::port::tests::partialeq_port_different_reprs",
"uri::port::tests::partialeq_u16",
"uri::port::tests::u16_from_port",
"uri::tests::test_authority_uri_parts_round_trip",
"uri::tests::test_char_table",
"uri::tests::test_ipv6_shorthand",
"uri::tests::test_ipv6_shorthand2",
"uri::tests::test_ipv6",
"uri::tests::test_ipv6_shorthand3",
"uri::tests::test_long_scheme",
"uri::tests::test_ipv6_with_port",
"uri::tests::test_partial_eq_path_with_terminating_questionmark",
"uri::tests::test_path_permissive",
"uri::tests::test_percentage_encoded_path",
"uri::tests::test_query_permissive",
"uri::tests::test_uri_authority_only_one_character_issue_197",
"uri::tests::test_uri_parse_absolute_form",
"uri::tests::test_max_uri_len",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_questionmark",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_fragment_with_slash",
"uri::tests::test_uri_parse_absolute_form_with_empty_path_and_nonempty_query",
"uri::tests::test_uri_parse_absolute_form_without_path",
"uri::tests::test_uri_parse_absolute_with_default_port_http",
"uri::tests::test_uri_parse_asterisk_form",
"uri::tests::test_uri_parse_absolute_with_default_port_https",
"uri::tests::test_uri_parse_authority_form",
"uri::tests::test_uri_parse_authority_no_port",
"uri::tests::test_uri_parse_error",
"uri::tests::test_uri_parse_fragment_questionmark",
"uri::tests::test_uri_parse_path_and_query",
"uri::tests::test_uri_parse_path_with_terminating_questionmark",
"uri::tests::test_uri_to_path_and_query",
"uri::tests::test_userinfo1",
"uri::tests::test_userinfo2",
"uri::tests::test_userinfo3",
"uri::tests::test_userinfo_pass_with_port",
"uri::tests::test_userinfo_with_port",
"append_multiple_values",
"as_header_name",
"drain",
"drain_entry",
"get_invalid",
"eq",
"into_header_name",
"value_htab",
"smoke",
"insert_invalid",
"insert_all_std_headers",
"insert_79_custom_std_headers",
"header_map_fuzz",
"equates_with_u16",
"from_bytes",
"roundtrip",
"src/header/name.rs - header::name::HeaderName::from_static (line 1758)",
"src/lib.rs - (line 57)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 147)",
"src/request.rs - request (line 37)",
"src/lib.rs - (line 33)",
"src/request.rs - request (line 12)",
"src/header/value.rs - header::value::HeaderValue::set_sensitive (line 283)",
"src/header/value.rs - header::value::HeaderValue::from_static (line 61)",
"src/header/value.rs - header::value::HeaderValue::is_empty (line 252)",
"src/header/value.rs - header::value::HeaderValue::is_sensitive (line 309)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 101)",
"src/header/name.rs - header::name::HeaderName::from_lowercase (line 1699)",
"src/header/name.rs - header::name::HeaderName::eq (line 1966)",
"src/header/map.rs - header::map::HeaderMap::new (line 424)",
"src/header/name.rs - header::name::HeaderName::from_static (line 1744)",
"src/header/value.rs - header::value::HeaderValue::as_bytes (line 269)",
"src/header/value.rs - header::value::HeaderValue::from_bytes (line 139)",
"src/header/value.rs - header::value::HeaderValue::from_name (line 117)",
"src/lib.rs - (line 110)",
"src/method.rs - method::Method (line 37)",
"src/header/value.rs - header::value::HeaderValue::from_str (line 93)",
"src/header/value.rs - header::value::HeaderValue::len (line 238)",
"src/header/value.rs - header::value::HeaderValue::to_str (line 215)",
"src/lib.rs - (line 101)",
"src/lib.rs - (line 129)",
"src/lib.rs - (line 120)",
"src/method.rs - method (line 10)",
"src/header/name.rs - header::name::str::eq (line 1986)",
"src/header/map.rs - header::map::HeaderMap<T>::with_capacity (line 448)",
"src/lib.rs - (line 149)",
"src/request.rs - request::Request (line 74)",
"src/request.rs - request::Builder::body (line 1022)",
"src/header/map.rs - header::map::Entry::or_insert_with (line 2202)",
"src/header/map.rs - header::map::VacantEntry::key (line 2263)",
"src/header/map.rs - header::map::Entry::or_insert_with (line 2214)",
"src/extensions.rs - extensions::Extensions::get (line 88)",
"src/extensions.rs - extensions::Extensions::insert (line 61)",
"src/header/map.rs - header::map::Entry::key (line 2240)",
"src/header/map.rs - header::map::HeaderMap (line 27)",
"src/extensions.rs - extensions::Extensions::remove (line 141)",
"src/extensions.rs - extensions::Extensions::clear (line 168)",
"src/header/map.rs - header::map::HeaderMap<T>::insert (line 1070)",
"src/header/map.rs - header::map::HeaderMap<T>::reserve (line 615)",
"src/header/map.rs - header::map::HeaderMap<T>::keys (line 833)",
"src/header/map.rs - header::map::HeaderMap<T>::get_all (line 720)",
"src/header/map.rs - header::map::HeaderMap<T>::values_mut (line 881)",
"src/header/map.rs - header::map::Entry::or_insert (line 2162)",
"src/header/map.rs - header::map::GetAll::iter (line 2363)",
"src/header/map.rs - header::map::HeaderMap<T>::iter (line 771)",
"src/header/map.rs - header::map::HeaderMap<T>::capacity (line 586)",
"src/extensions.rs - extensions::Extensions::get_mut (line 113)",
"src/header/map.rs - header::map::VacantEntry::into_key (line 2277)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1685)",
"src/header/map.rs - header::map::HeaderMap<T>::append (line 1159)",
"src/header/map.rs - header::map::HeaderMap<T>::entry (line 993)",
"src/header/map.rs - header::map::HeaderMap<T>::clear (line 559)",
"src/header/map.rs - header::map::OccupiedEntry::get_mut (line 2686)",
"src/header/map.rs - header::map::HeaderMap<T>::contains_key (line 748)",
"src/header/map.rs - header::map::HeaderMap<T>::keys_len (line 515)",
"src/header/map.rs - header::map::HeaderMap<T>::is_empty (line 539)",
"src/header/map.rs - header::map::HeaderMap<T>::remove (line 1279)",
"src/header/map.rs - header::map::HeaderMap<T>::len (line 488)",
"src/header/map.rs - header::map::HeaderMap<T>::values (line 857)",
"src/header/map.rs - header::map::OccupiedEntry::insert (line 2734)",
"src/header/map.rs - header::map::HeaderMap<T>::into_iter (line 1670)",
"src/header/map.rs - header::map::HeaderMap<T>::get_mut (line 689)",
"src/header/map.rs - header::map::HeaderMap<T>::drain (line 904)",
"src/header/map.rs - header::map::OccupiedEntry::append (line 2783)",
"src/header/map.rs - header::map::HeaderMap<T>::iter_mut (line 803)",
"src/header/map.rs - header::map::HeaderMap<T>::get (line 650)",
"src/header/map.rs - header::map::HeaderMap<T>::extend (line 1772)",
"src/header/map.rs - header::map::OccupiedEntry::insert_mult (line 2757)",
"src/header/map.rs - header::map::OccupiedEntry::key (line 2636)",
"src/header/map.rs - header::map::OccupiedEntry::remove_entry (line 2834)",
"src/header/map.rs - header::map::OccupiedEntry::iter (line 2878)",
"src/header/map.rs - header::map::OccupiedEntry::remove (line 2810)",
"src/header/map.rs - header::map::VacantEntry::insert (line 2296)",
"src/header/map.rs - header::map::OccupiedEntry::into_mut (line 2711)",
"src/header/map.rs - header::map::OccupiedEntry::get (line 2659)",
"src/request.rs - request::Request (line 119)",
"src/request.rs - request::Request (line 139)",
"src/request.rs - request::Request (line 99)",
"src/header/map.rs - header::map::OccupiedEntry::iter_mut (line 2902)",
"src/request.rs - request::Builder::new (line 731)",
"src/response.rs - response::Response (line 117)",
"src/response.rs - response (line 42)",
"src/request.rs - request::Request<()>::get (line 224)",
"src/header/map.rs - header::map::VacantEntry::insert_entry (line 2325)",
"src/request.rs - request::Request<()>::connect (line 351)",
"src/request.rs - request::Builder::method_ref (line 780)",
"src/request.rs - request::Builder::uri (line 810)",
"src/request.rs - request::Request<()>::delete (line 287)",
"src/request.rs - request::Builder::method (line 753)",
"src/request.rs - request::Request<T>::body_mut (line 616)",
"src/request.rs - request::Request<()>::post (line 266)",
"src/request.rs - request::Request<()>::put (line 245)",
"src/request.rs - request::Request<()>::head (line 330)",
"src/request.rs - request::Builder::version (line 864)",
"src/response.rs - response (line 30)",
"src/request.rs - request::Request<()>::patch (line 372)",
"src/header/map.rs - header::map::HeaderMap<T> (line 1731)",
"src/response.rs - response (line 12)",
"src/request.rs - request::Request<T>::body (line 602)",
"src/request.rs - request::Builder::uri_ref (line 835)",
"src/response.rs - response::Response (line 105)",
"src/request.rs - request::Request<()>::trace (line 393)",
"src/response.rs - response::Response (line 87)",
"src/response.rs - response::Response (line 141)",
"src/response.rs - response::Response<T>::body (line 403)",
"src/request.rs - request::Request<T>::headers (line 542)",
"src/response.rs - response::Builder::body (line 740)",
"src/response.rs - response::Builder::version (line 581)",
"src/response.rs - response::Builder::new (line 530)",
"src/request.rs - request::Request<T>::from_parts (line 435)",
"src/response.rs - response::Builder::status (line 552)",
"src/request.rs - request::Builder::header (line 887)",
"src/request.rs - request::Request<T>::method (line 455)",
"src/request.rs - request::Request<T>::version (line 513)",
"src/request.rs - request::Request<()>::options (line 308)",
"src/request.rs - request::Request<T>::version_mut (line 527)",
"src/request.rs - request::Request<T>::new (line 416)",
"src/response.rs - response::Response<T>::version_mut (line 328)",
"src/response.rs - response::Response<T>::status_mut (line 299)",
"src/request.rs - request::Request<T>::method_mut (line 469)",
"src/request.rs - request::Request<T>::into_body (line 632)",
"src/request.rs - request::Request<T>::uri (line 484)",
"src/response.rs - response::Response<T>::headers (line 343)",
"src/response.rs - response::Response<T>::version (line 314)",
"src/request.rs - request::Request<T>::into_parts (line 647)",
"src/request.rs - request::Request<T>::uri_mut (line 498)",
"src/request.rs - request::Request<T>::map (line 663)",
"src/response.rs - response::Response<T>::status (line 285)",
"src/response.rs - response::Response<T>::extensions (line 373)",
"src/status.rs - status::StatusCode (line 197)",
"src/request.rs - request::Builder::extension (line 976)",
"src/response.rs - response::Response<T>::body_mut (line 417)",
"src/response.rs - response::Response (line 161)",
"src/request.rs - request::Request<T>::extensions (line 572)",
"src/status.rs - status::StatusCode::as_str (line 125)",
"src/response.rs - response::Response<T>::into_body (line 432)",
"src/uri/builder.rs - uri::builder::Builder::authority (line 58)",
"src/response.rs - response::Response<T>::from_parts (line 262)",
"src/response.rs - response::Response<T>::into_parts (line 447)",
"src/response.rs - response::Response<T>::map (line 463)",
"src/response.rs - response::Response<T>::new (line 243)",
"src/uri/builder.rs - uri::builder::Builder::path_and_query (line 80)",
"src/status.rs - status::StatusCode::as_u16 (line 109)",
"src/status.rs - status (line 9)",
"src/uri/authority.rs - uri::authority::Authority::from_static (line 70)",
"src/response.rs - response::Response<()>::builder (line 221)",
"src/status.rs - status::StatusCode::from_u16 (line 62)",
"src/status.rs - status::StatusCode::canonical_reason (line 147)",
"src/uri/authority.rs - uri::authority::Authority::from_shared (line 32)",
"src/uri/builder.rs - uri::builder::Builder::new (line 19)",
"src/uri/builder.rs - uri::builder::Builder::scheme (line 38)",
"src/response.rs - response::Builder::extension (line 694)",
"src/status.rs - status::StatusCode (line 35)",
"src/response.rs - response::Builder::header (line 604)",
"src/response.rs - response::Response<T>::extensions_mut (line 387)",
"src/uri/mod.rs - uri::Uri::host (line 577)",
"src/request.rs - request::Request<T>::headers_mut (line 556)",
"src/uri/mod.rs - uri::Parts (line 770)",
"src/uri/mod.rs - uri::Parts (line 785)",
"src/uri/builder.rs - uri::builder::Builder::build (line 115)",
"src/uri/mod.rs - uri::Uri::from_static (line 328)",
"src/response.rs - response::Builder::headers_ref (line 638)",
"src/uri/mod.rs - uri::Uri::port_part (line 622)",
"src/uri/mod.rs - uri::Uri::authority_part (line 524)",
"src/version.rs - version (line 12)",
"src/request.rs - request::Builder::headers_ref (line 920)",
"src/uri/scheme.rs - uri::scheme::Scheme::as_str (line 88)",
"src/request.rs - request::Request<()>::builder (line 202)",
"src/uri/mod.rs - uri::Uri::query (line 694)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 256)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 439)",
"src/response.rs - response::Builder::headers_mut (line 665)",
"src/uri/mod.rs - uri::Uri::port_part (line 631)",
"src/uri/path.rs - uri::path::PathAndQuery::path (line 184)",
"src/uri/scheme.rs - uri::scheme::Scheme (line 211)",
"src/uri/path.rs - uri::path::PathAndQuery::as_str (line 265)",
"src/uri/mod.rs - uri::Uri::query (line 685)",
"src/uri/mod.rs - uri::Uri::port_u16 (line 647)",
"src/uri/mod.rs - uri::Uri::scheme_part (line 450)",
"src/uri/mod.rs - uri::Uri::query (line 676)",
"src/uri/mod.rs - uri::Uri::port_part (line 612)",
"src/uri/port.rs - uri::port::Port<T>::as_str (line 56)",
"src/uri/path.rs - uri::path::PathAndQuery::from_static (line 133)",
"src/uri/port.rs - uri::port::Port<T>::as_u16 (line 18)",
"src/uri/mod.rs - uri::Uri::path (line 396)",
"src/uri/mod.rs - uri::Uri::authority_part (line 514)",
"src/request.rs - request::Request<T>::extensions_mut (line 586)",
"src/uri/mod.rs - uri::Uri::host (line 567)",
"src/uri/mod.rs - uri::Uri::path (line 406)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 234)",
"src/uri/mod.rs - uri::Uri::builder (line 191)",
"src/uri/mod.rs - uri (line 11)",
"src/uri/mod.rs - uri::Uri::into_parts (line 352)",
"src/uri/scheme.rs - uri::scheme::Scheme::from_shared (line 51)",
"src/uri/mod.rs - uri::Uri::from_shared (line 250)",
"src/request.rs - request::Builder::headers_mut (line 947)",
"src/uri/mod.rs - uri::Uri (line 85)",
"src/uri/mod.rs - uri::Uri::scheme_str (line 476)",
"src/uri/path.rs - uri::path::PathAndQuery::query (line 225)",
"src/uri/path.rs - uri::path::PathAndQuery::from_shared (line 27)",
"src/response.rs - response::Response<T>::headers_mut (line 357)"
] |
[] |
[] |
unicode-org/icu4x
| 3,874
|
unicode-org__icu4x-3874
|
[
"4409"
] |
aadc9be000b46edfca903560b546104498d5483b
|
diff --git a/components/locid_transform/src/expander.rs b/components/locid_transform/src/expander.rs
--- a/components/locid_transform/src/expander.rs
+++ b/components/locid_transform/src/expander.rs
@@ -353,6 +353,9 @@ impl LocaleExpander {
/// returns [`TransformResult::Unmodified`] and the locale argument is
/// unchanged.
///
+ /// This function does not guarantee that any particular set of subtags
+ /// will be present in the resulting locale.
+ ///
/// # Examples
///
/// ```
diff --git a/components/locid_transform/src/expander.rs b/components/locid_transform/src/expander.rs
--- a/components/locid_transform/src/expander.rs
+++ b/components/locid_transform/src/expander.rs
@@ -369,6 +372,33 @@ impl LocaleExpander {
/// assert_eq!(lc.maximize(&mut locale), TransformResult::Unmodified);
/// assert_eq!(locale, locale!("zh-Hant-TW"));
/// ```
+ ///
+ /// If there is no data for a particular language, the result is not
+ /// modified. Note that [`LocaleExpander::new_extended`] supports
+ /// more languages.
+ ///
+ /// ```
+ /// use icu_locid::locale;
+ /// use icu_locid_transform::{LocaleExpander, TransformResult};
+ ///
+ /// let lc = LocaleExpander::new();
+ ///
+ /// // No subtags data for ccp in the default set:
+ /// let mut locale = locale!("ccp");
+ /// assert_eq!(lc.maximize(&mut locale), TransformResult::Unmodified);
+ /// assert_eq!(locale, locale!("ccp"));
+ ///
+ /// // The extended set supports it:
+ /// let lc = LocaleExpander::new_extended();
+ /// let mut locale = locale!("ccp");
+ /// assert_eq!(lc.maximize(&mut locale), TransformResult::Modified);
+ /// assert_eq!(locale, locale!("ccp-Cakm-BD"));
+ ///
+ /// // But even the extended set does not support all language subtags:
+ /// let mut locale = locale!("mul");
+ /// assert_eq!(lc.maximize(&mut locale), TransformResult::Unmodified);
+ /// assert_eq!(locale, locale!("mul"));
+ /// ```
pub fn maximize<T: AsMut<LanguageIdentifier>>(&self, mut langid: T) -> TransformResult {
let langid = langid.as_mut();
let data = self.as_borrowed();
diff --git a/components/locid_transform/src/expander.rs b/components/locid_transform/src/expander.rs
--- a/components/locid_transform/src/expander.rs
+++ b/components/locid_transform/src/expander.rs
@@ -391,6 +421,8 @@ impl LocaleExpander {
if let Some((script, region)) = data.get_l(langid.language) {
return update_langid(Language::UND, Some(script), Some(region), langid);
}
+ // Language not found: return unmodified.
+ return TransformResult::Unmodified;
}
if let Some(script) = langid.script {
if let Some(region) = langid.region {
diff --git a/components/locid_transform/src/expander.rs b/components/locid_transform/src/expander.rs
--- a/components/locid_transform/src/expander.rs
+++ b/components/locid_transform/src/expander.rs
@@ -408,6 +440,9 @@ impl LocaleExpander {
}
}
+ // We failed to find anything in the und-SR, und-S, or und-R tables,
+ // to fall back to bare "und"
+ debug_assert!(langid.language.is_empty());
update_langid(
data.get_und().0,
Some(data.get_und().1),
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -8,13 +8,16 @@ use crate::source::SerdeCache;
use crate::CoverageLevel;
use icu_calendar::provider::EraStartDate;
use icu_locid::LanguageIdentifier;
-use icu_locid_transform::provider::LikelySubtagsForLanguageV1Marker;
-use icu_locid_transform::provider::LikelySubtagsForScriptRegionV1Marker;
+use icu_locid_transform::provider::{
+ LikelySubtagsExtendedV1Marker, LikelySubtagsForLanguageV1Marker,
+ LikelySubtagsForScriptRegionV1Marker,
+};
use icu_locid_transform::LocaleExpander;
use icu_provider::prelude::*;
use icu_provider::DataError;
use icu_provider_adapters::any_payload::AnyPayloadProvider;
use icu_provider_adapters::fork::ForkByKeyProvider;
+use icu_provider_adapters::make_forking_provider;
use once_cell::sync::OnceCell;
use std::collections::BTreeSet;
use std::collections::HashSet;
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -25,7 +28,7 @@ use std::str::FromStr;
pub(crate) struct CldrCache {
pub(super) serde_cache: SerdeCache,
dir_suffix: OnceCell<&'static str>,
- locale_expander: OnceCell<LocaleExpander>,
+ extended_locale_expander: OnceCell<LocaleExpander>,
modern_japanese_eras: OnceCell<BTreeSet<String>>,
#[cfg(feature = "icu_transliterate")]
// used by transforms/mod.rs
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -37,7 +40,7 @@ impl CldrCache {
CldrCache {
serde_cache,
dir_suffix: Default::default(),
- locale_expander: Default::default(),
+ extended_locale_expander: Default::default(),
modern_japanese_eras: Default::default(),
#[cfg(feature = "icu_transliterate")]
transforms: Default::default(),
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -106,17 +109,28 @@ impl CldrCache {
.copied()
}
- fn locale_expander(&self) -> Result<&LocaleExpander, DataError> {
+ fn extended_locale_expander(&self) -> Result<&LocaleExpander, DataError> {
use super::locale_canonicalizer::likely_subtags::*;
- self.locale_expander.get_or_try_init(|| {
- let data = transform(LikelySubtagsResources::try_from_cldr_cache(self)?.get_common());
- let provider = ForkByKeyProvider::new(
- AnyPayloadProvider::from_owned::<LikelySubtagsForLanguageV1Marker>(
- data.clone().into(),
- ),
- AnyPayloadProvider::from_owned::<LikelySubtagsForScriptRegionV1Marker>(data.into()),
+ self.extended_locale_expander.get_or_try_init(|| {
+ let common_data =
+ transform(LikelySubtagsResources::try_from_cldr_cache(self)?.get_common());
+ let extended_data =
+ transform(LikelySubtagsResources::try_from_cldr_cache(self)?.get_extended());
+ let provider = make_forking_provider!(
+ ForkByKeyProvider::new,
+ [
+ AnyPayloadProvider::from_owned::<LikelySubtagsForLanguageV1Marker>(
+ common_data.clone().into(),
+ ),
+ AnyPayloadProvider::from_owned::<LikelySubtagsForScriptRegionV1Marker>(
+ common_data.into(),
+ ),
+ AnyPayloadProvider::from_owned::<LikelySubtagsExtendedV1Marker>(
+ extended_data.into()
+ ),
+ ]
);
- LocaleExpander::try_new_with_any_provider(&provider).map_err(|e| {
+ LocaleExpander::try_new_extended_unstable(&provider.as_downcasting()).map_err(|e| {
DataError::custom("creating LocaleExpander in CldrCache").with_display_context(&e)
})
})
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -155,7 +169,7 @@ impl CldrCache {
/// CLDR sometimes stores locales with default scripts.
/// Add in the likely script here to make that data reachable.
- fn add_script(
+ fn add_script_extended(
&self,
langid: &LanguageIdentifier,
) -> Result<Option<LanguageIdentifier>, DataError> {
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -163,8 +177,11 @@ impl CldrCache {
return Ok(None);
}
let mut new_langid = langid.clone();
- self.locale_expander()?.maximize(&mut new_langid);
- debug_assert!(new_langid.script.is_some());
+ self.extended_locale_expander()?.maximize(&mut new_langid);
+ debug_assert!(
+ new_langid.script.is_some(),
+ "Script not found for: {new_langid:?}"
+ );
if langid.region.is_none() {
new_langid.region = None;
}
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -174,7 +191,7 @@ impl CldrCache {
/// ICU4X does not store locales with their script
/// if the script is the default for the language.
/// Perform that normalization mapping here.
- fn remove_script(
+ fn remove_script_extended(
&self,
langid: &LanguageIdentifier,
) -> Result<Option<LanguageIdentifier>, DataError> {
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -183,7 +200,7 @@ impl CldrCache {
}
let region = langid.region;
let mut langid = langid.clone();
- self.locale_expander()?.minimize(&mut langid);
+ self.extended_locale_expander()?.minimize(&mut langid);
if langid.script.is_some() || (region.is_none() && langid.region.is_some()) {
// Wasn't able to minimize the script, or had to add a region
return Ok(None);
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -222,7 +239,7 @@ impl<'a> CldrDirLang<'a> {
let path = format!("{}-{dir_suffix}/main/{lang}/{file_name}", self.1);
if self.0.serde_cache.file_exists(&path)? {
self.0.serde_cache.read_and_parse_json(&path)
- } else if let Some(new_langid) = self.0.add_script(lang)? {
+ } else if let Some(new_langid) = self.0.add_script_extended(lang)? {
self.read_and_parse(&new_langid, file_name)
} else {
Err(DataErrorKind::Io(std::io::ErrorKind::NotFound)
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -240,7 +257,7 @@ impl<'a> CldrDirLang<'a> {
.list(&path)?
.map(|path| -> Result<LanguageIdentifier, DataError> {
let langid = LanguageIdentifier::from_str(&path).unwrap();
- Ok(self.0.remove_script(&langid)?.unwrap_or(langid))
+ Ok(self.0.remove_script_extended(&langid)?.unwrap_or(langid))
})
.collect::<Result<Vec<_>, _>>()?
.into_iter())
diff --git a/provider/datagen/src/transform/cldr/source.rs b/provider/datagen/src/transform/cldr/source.rs
--- a/provider/datagen/src/transform/cldr/source.rs
+++ b/provider/datagen/src/transform/cldr/source.rs
@@ -255,7 +272,7 @@ impl<'a> CldrDirLang<'a> {
let path = format!("{}-{dir_suffix}/main/{lang}/{file_name}", self.1);
if self.0.serde_cache.file_exists(&path)? {
Ok(true)
- } else if let Some(new_langid) = self.0.add_script(lang)? {
+ } else if let Some(new_langid) = self.0.add_script_extended(lang)? {
self.file_exists(&new_langid, file_name)
} else {
Ok(false)
|
diff --git a/components/locid_transform/tests/fixtures/maximize.json b/components/locid_transform/tests/fixtures/maximize.json
--- a/components/locid_transform/tests/fixtures/maximize.json
+++ b/components/locid_transform/tests/fixtures/maximize.json
@@ -175,8 +175,40 @@
"input": "zh-hant-u-nu-Chinese-hc-h24",
"output": "zh-Hant-TW-u-hc-h24-nu-chinese"
},
+ {
+ "input": "und-001",
+ "output": "en-Latn-001"
+ },
+ {
+ "input": "und-150",
+ "output": "en-Latn-150"
+ },
+ {
+ "input": "und-419",
+ "output": "es-Latn-419"
+ },
{
"input": "und-latn-AQ",
"output": "en-Latn-AQ"
+ },
+ {
+ "input": "und-Arab-AF",
+ "output": "fa-Arab-AF"
+ },
+ {
+ "input": "qaa",
+ "output": "qaa"
+ },
+ {
+ "input": "qaa-CH",
+ "output": "qaa-CH"
+ },
+ {
+ "input": "qaa-Cyrl",
+ "output": "qaa-Cyrl"
+ },
+ {
+ "input": "qaa-Cyrl-CH",
+ "output": "qaa-Cyrl-CH"
}
]
diff --git a/components/locid_transform/tests/fixtures/mod.rs b/components/locid_transform/tests/fixtures/mod.rs
--- a/components/locid_transform/tests/fixtures/mod.rs
+++ b/components/locid_transform/tests/fixtures/mod.rs
@@ -4,7 +4,7 @@
use serde::Deserialize;
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
pub struct CanonicalizationTest {
pub input: String,
pub output: String,
diff --git a/components/locid_transform/tests/locale_canonicalizer.rs b/components/locid_transform/tests/locale_canonicalizer.rs
--- a/components/locid_transform/tests/locale_canonicalizer.rs
+++ b/components/locid_transform/tests/locale_canonicalizer.rs
@@ -24,11 +24,11 @@ fn test_maximize() {
let mut locale: Locale = case.input.parse().unwrap();
let unmodified = locale.clone();
let result = lc.maximize(&mut locale);
- assert_writeable_eq!(locale, case.output);
+ assert_writeable_eq!(locale, case.output, "{:?}", case);
if result == TransformResult::Modified {
- assert_ne!(locale, unmodified);
+ assert_ne!(locale, unmodified, "{:?}", case);
} else {
- assert_eq!(locale, unmodified);
+ assert_eq!(locale, unmodified, "{:?}", case);
}
}
}
diff --git a/components/locid_transform/tests/locale_canonicalizer.rs b/components/locid_transform/tests/locale_canonicalizer.rs
--- a/components/locid_transform/tests/locale_canonicalizer.rs
+++ b/components/locid_transform/tests/locale_canonicalizer.rs
@@ -48,11 +48,11 @@ fn test_minimize() {
let mut locale: Locale = case.input.parse().unwrap();
let unmodified = locale.clone();
let result = lc.minimize(&mut locale);
- assert_writeable_eq!(locale, case.output);
+ assert_writeable_eq!(locale, case.output, "{:?}", case);
if result == TransformResult::Modified {
- assert_ne!(locale, unmodified);
+ assert_ne!(locale, unmodified, "{:?}", case);
} else {
- assert_eq!(locale, unmodified);
+ assert_eq!(locale, unmodified, "{:?}", case);
}
}
}
diff --git a/components/locid_transform/tests/locale_canonicalizer.rs b/components/locid_transform/tests/locale_canonicalizer.rs
--- a/components/locid_transform/tests/locale_canonicalizer.rs
+++ b/components/locid_transform/tests/locale_canonicalizer.rs
@@ -72,11 +72,11 @@ fn test_canonicalize() {
let mut locale: Locale = case.input.parse().expect("Unable to parse input");
let unmodified = locale.clone();
let result = lc.canonicalize(&mut locale);
- assert_writeable_eq!(locale, case.output);
+ assert_writeable_eq!(locale, case.output, "{:?}", case);
if result == TransformResult::Modified {
- assert_ne!(locale, unmodified);
+ assert_ne!(locale, unmodified, "{:?}", case);
} else {
- assert_eq!(locale, unmodified);
+ assert_eq!(locale, unmodified, "{:?}", case);
}
}
}
|
Add error case to TransformResult
UTS 35 specifies an error case in the likely subtags algorithm. It says that the error case can be returned in a way conventional in the programming language. I propose adding it to the TransformResult enum:
```
#[allow(clippy::exhaustive_enums)]
pub enum TransformResult {
/// The canonicalization operation modified the locale.
Modified,
/// The canonicalization operation did not modify the locale.
Unmodified,
// NEW ENTRY:
/// The canonicalization operation failed to run to completion.
/// The locale was not modified.
Failed,
}
```
Unfortunately the enum is marked as `exhaustive`, so we need to wait until 2.0 to do this.
OK?
- [ ] @zbraniecki
|
2023-08-16T07:31:40Z
|
1.4
|
2023-12-05T21:33:16Z
|
5bbfdf215bb4aa46a236a7317e38bfe2f92205ac
|
[
"test_maximize"
] |
[
"canonicalizer::test_uts35_rule_matches",
"canonicalizer::test_uts35_replacement",
"expander::tests::test_new_keys",
"expander::tests::test_new_small_keys",
"expander::tests::test_no_keys",
"fallback::algorithms::tests::test_fallback",
"expander::tests::test_mixed_keys",
"expander::tests::test_old_keys",
"test_minimize",
"test_canonicalize",
"components/locid_transform/src/directionality.rs - directionality::LocaleDirectionality (line 27)",
"components/locid_transform/src/canonicalizer.rs - canonicalizer::LocaleCanonicalizer (line 27)",
"components/locid_transform/src/fallback/mod.rs - fallback (line 15)",
"components/locid_transform/src/canonicalizer.rs - canonicalizer::LocaleCanonicalizer::canonicalize (line 309)",
"components/locid_transform/src/expander.rs - expander::LocaleExpander (line 38)",
"components/locid_transform/src/expander.rs - expander::LocaleExpander (line 56)",
"components/locid_transform/src/fallback/mod.rs - fallback::LocaleFallbacker (line 60)",
"components/locid_transform/src/lib.rs - (line 37)",
"components/locid_transform/src/lib.rs - (line 52)",
"components/locid_transform/src/directionality.rs - directionality::LocaleDirectionality::get (line 164)",
"components/locid_transform/src/directionality.rs - directionality::LocaleDirectionality::new_with_expander (line 87)",
"components/locid_transform/src/directionality.rs - directionality::LocaleDirectionality::get (line 147)",
"components/locid_transform/src/lib.rs - (line 24)",
"components/locid_transform/src/expander.rs - expander::LocaleExpander (line 21)"
] |
[] |
[] |
|
unicode-org/icu4x
| 4,796
|
unicode-org__icu4x-4796
|
[
"4713"
] |
75cb5b6d114f116894ec4448fe7b7a8f62909876
| "diff --git a/components/calendar/src/persian.rs b/components/calendar/src/persian.rs\n--- a/compone(...TRUNCATED)
| "diff --git a/components/calendar/src/persian.rs b/components/calendar/src/persian.rs\n--- a/compone(...TRUNCATED)
| "Persian calendar conversion uses wrong algorithm\nLooking at https://github.com/unicode-org/icu4x/b(...TRUNCATED)
| "Thank you @roozbehp for highlighting this.\r\n\r\nAs you noted, Calendrical Calculations specifies (...TRUNCATED)
|
2024-04-11T15:21:14Z
|
1.4
|
2024-04-15T03:35:00Z
|
5bbfdf215bb4aa46a236a7317e38bfe2f92205ac
| ["persian::tests::test_fixed_from_persian","persian::tests::test_persian_from_fixed","persian::tests(...TRUNCATED)
| ["buddhist::test::test_buddhist_cases_near_rd_zero","buddhist::test::test_buddhist_cases_near_epoch"(...TRUNCATED)
|
[] |
[] |
unicode-org/icu4x
| 4,533
|
unicode-org__icu4x-4533
|
[
"4488"
] |
a917d38e90c5fdea62397da64d7b3bf5c2fa09da
| "diff --git a/CHANGELOG.md b/CHANGELOG.md\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -21,6 +21,7 @@(...TRUNCATED)
| "diff --git a/provider/datagen/src/driver.rs b/provider/datagen/src/driver.rs\n--- a/provider/datage(...TRUNCATED)
| "Auxiliary keys don't work with hybrid or preresolved fallback\nThe way datagen works with hybrid an(...TRUNCATED)
|
2024-01-20T12:55:46Z
|
1.4
|
2024-01-31T16:24:32Z
|
5bbfdf215bb4aa46a236a7317e38bfe2f92205ac
|
[
"explicit_preresolved",
"explicit_hybrid",
"explicit_runtime"
] | ["registry::test_paths_correct","transform::cldr::characters::tests::test_parse_consecutive_punct_ch(...TRUNCATED)
|
[
"provider/datagen/src/baked_exporter.rs - baked_exporter (line 13)"
] |
[] |
End of preview. Expand
in Data Studio
README.md exists but content is empty.
- Downloads last month
- 1