There are many changes involved with this, but let's just talk about
user-facing changes.
- Creating a `Client` and `Server` now needs a Tokio `Core` event loop
to attach to.
- `Request` and `Response` both no longer implement the
`std::io::{Read,Write}` traits, but instead represent their bodies as a
`futures::Stream` of items, where each item is a `Chunk`.
- The `Client.request` method now takes a `Request`, instead of being
used as a builder, and returns a `Future` that resolves to `Response`.
- The `Handler` trait for servers is no more, and instead the Tokio
`Service` trait is used. This allows interoperability with generic
middleware.
BREAKING CHANGE: A big sweeping set of breaking changes.
		
	
		
			
				
	
	
		
			146 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			146 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| //! HTTP RequestUris
 | |
| use std::fmt::{Display, self};
 | |
| 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, Eq, Hash, 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 { path: "/where".to_string(), query: Some("q=now".to_string()) }`.
 | |
|     AbsolutePath {
 | |
|         /// The path part of the request uri.
 | |
|         path: String,
 | |
|         /// The query part of the request uri.
 | |
|         query: Option<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 Default for RequestUri {
 | |
|     fn default() -> RequestUri {
 | |
|         RequestUri::Star
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl FromStr for RequestUri {
 | |
|     type Err = Error;
 | |
| 
 | |
|     fn from_str(s: &str) -> Result<RequestUri, Error> {
 | |
|         let bytes = s.as_bytes();
 | |
|         if bytes.len() == 0 {
 | |
|             Err(Error::Uri(UrlError::RelativeUrlWithoutBase))
 | |
|         } else if bytes == b"*" {
 | |
|             Ok(RequestUri::Star)
 | |
|         } else if bytes.starts_with(b"/") {
 | |
|             let mut temp = "http://example.com".to_owned();
 | |
|             temp.push_str(s);
 | |
|             let url = try!(Url::parse(&temp));
 | |
|             Ok(RequestUri::AbsolutePath {
 | |
|                 path: url.path().to_owned(),
 | |
|                 query: url.query().map(|q| q.to_owned()),
 | |
|             })
 | |
|         } else if bytes.contains(&b'/') {
 | |
|             Ok(RequestUri::AbsoluteUri(try!(Url::parse(s))))
 | |
|         } else {
 | |
|             let mut temp = "http://".to_owned();
 | |
|             temp.push_str(s);
 | |
|             let url = try!(Url::parse(&temp));
 | |
|             if url.query().is_some() {
 | |
|                 return Err(Error::Uri(UrlError::RelativeUrlWithoutBase));
 | |
|             }
 | |
|             //TODO: compare vs u.authority()?
 | |
|             Ok(RequestUri::Authority(s.to_owned()))
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Display for RequestUri {
 | |
|     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 | |
|         match *self {
 | |
|             RequestUri::AbsolutePath { ref path, ref query } => {
 | |
|                 try!(f.write_str(path));
 | |
|                 match *query {
 | |
|                     Some(ref q) => write!(f, "?{}", q),
 | |
|                     None => Ok(()),
 | |
|                 }
 | |
|             }
 | |
|             RequestUri::AbsoluteUri(ref url) => write!(f, "{}", url),
 | |
|             RequestUri::Authority(ref path) => f.write_str(path),
 | |
|             RequestUri::Star => f.write_str("*")
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| #[test]
 | |
| fn test_uri_fromstr() {
 | |
|     fn parse(s: &str, result: RequestUri) {
 | |
|         assert_eq!(s.parse::<RequestUri>().unwrap(), result);
 | |
|     }
 | |
|     fn parse_err(s: &str) {
 | |
|         assert!(s.parse::<RequestUri>().is_err());
 | |
|     }
 | |
| 
 | |
|     parse("*", RequestUri::Star);
 | |
|     parse("**", RequestUri::Authority("**".to_owned()));
 | |
|     parse("http://hyper.rs/", RequestUri::AbsoluteUri(Url::parse("http://hyper.rs/").unwrap()));
 | |
|     parse("hyper.rs", RequestUri::Authority("hyper.rs".to_owned()));
 | |
|     parse_err("hyper.rs?key=value");
 | |
|     parse_err("hyper.rs/");
 | |
|     parse("/", RequestUri::AbsolutePath { path: "/".to_owned(), query: None });
 | |
| }
 | |
| 
 | |
| #[test]
 | |
| fn test_uri_display() {
 | |
|     fn assert_display(expected_string: &str, request_uri: RequestUri) {
 | |
|         assert_eq!(expected_string, format!("{}", request_uri));
 | |
|     }
 | |
| 
 | |
|     assert_display("*", RequestUri::Star);
 | |
|     assert_display("http://hyper.rs/", RequestUri::AbsoluteUri(Url::parse("http://hyper.rs/").unwrap()));
 | |
|     assert_display("hyper.rs", RequestUri::Authority("hyper.rs".to_owned()));
 | |
|     assert_display("/", RequestUri::AbsolutePath { path: "/".to_owned(), query: None });
 | |
|     assert_display("/where?key=value", RequestUri::AbsolutePath {
 | |
|         path: "/where".to_owned(),
 | |
|         query: Some("key=value".to_owned()),
 | |
|     });
 | |
| }
 |