9ba074d150
The old names followed the old style of including the module name and "Error" in each variant. The new style is to refer to an error from its owning module, and variants are now scoped to their enum, so there's no need to include the enum name in the variant name. BREAKING CHANGE: The terms `Http` and `Error` have been removed from the Error type and its variants. `HttpError` should now be accessed as `hyper::Error`, and variants like `HttpIoError` should be accessed as `Error::Io`.
88 lines
2.9 KiB
Rust
88 lines
2.9 KiB
Rust
//! HTTP RequestUris
|
|
use std::str::FromStr;
|
|
use url::Url;
|
|
use url::ParseError as UrlError;
|
|
|
|
use Error;
|
|
|
|
/// The Request-URI of a Request's StartLine.
|
|
///
|
|
/// From Section 5.3, Request Target:
|
|
/// > Once an inbound connection is obtained, the client sends an HTTP
|
|
/// > request message (Section 3) with a request-target derived from the
|
|
/// > target URI. There are four distinct formats for the request-target,
|
|
/// > depending on both the method being requested and whether the request
|
|
/// > is to a proxy.
|
|
/// >
|
|
/// > ```notrust
|
|
/// > request-target = origin-form
|
|
/// > / absolute-form
|
|
/// > / authority-form
|
|
/// > / asterisk-form
|
|
/// > ```
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum RequestUri {
|
|
/// The most common request target, an absolute path and optional query.
|
|
///
|
|
/// For example, the line `GET /where?q=now HTTP/1.1` would parse the URI
|
|
/// as `AbsolutePath("/where?q=now".to_string())`.
|
|
AbsolutePath(String),
|
|
|
|
/// An absolute URI. Used in conjunction with proxies.
|
|
///
|
|
/// > When making a request to a proxy, other than a CONNECT or server-wide
|
|
/// > OPTIONS request (as detailed below), a client MUST send the target
|
|
/// > URI in absolute-form as the request-target.
|
|
///
|
|
/// An example StartLine with an `AbsoluteUri` would be
|
|
/// `GET http://www.example.org/pub/WWW/TheProject.html HTTP/1.1`.
|
|
AbsoluteUri(Url),
|
|
|
|
/// The authority form is only for use with `CONNECT` requests.
|
|
///
|
|
/// An example StartLine: `CONNECT www.example.com:80 HTTP/1.1`.
|
|
Authority(String),
|
|
|
|
/// The star is used to target the entire server, instead of a specific resource.
|
|
///
|
|
/// This is only used for a server-wide `OPTIONS` request.
|
|
Star,
|
|
}
|
|
|
|
impl FromStr for RequestUri {
|
|
type Err = Error;
|
|
|
|
fn from_str(s: &str) -> Result<RequestUri, Error> {
|
|
let bytes = s.as_bytes();
|
|
if bytes == [] {
|
|
Err(Error::Uri(UrlError::InvalidCharacter))
|
|
} else if bytes == b"*" {
|
|
Ok(RequestUri::Star)
|
|
} else if bytes.starts_with(b"/") {
|
|
Ok(RequestUri::AbsolutePath(s.to_string()))
|
|
} else if bytes.contains(&b'/') {
|
|
Ok(RequestUri::AbsoluteUri(try!(Url::parse(s))))
|
|
} else {
|
|
let mut temp = "http://".to_string();
|
|
temp.push_str(s);
|
|
try!(Url::parse(&temp[..]));
|
|
todo!("compare vs u.authority()");
|
|
Ok(RequestUri::Authority(s.to_string()))
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_uri_fromstr() {
|
|
fn read(s: &str, result: RequestUri) {
|
|
assert_eq!(s.parse::<RequestUri>().unwrap(), result);
|
|
}
|
|
|
|
read("*", RequestUri::Star);
|
|
read("http://hyper.rs/", RequestUri::AbsoluteUri(Url::parse("http://hyper.rs/").unwrap()));
|
|
read("hyper.rs", RequestUri::Authority("hyper.rs".to_string()));
|
|
read("/", RequestUri::AbsolutePath("/".to_string()));
|
|
}
|
|
|
|
|