"]
+description = "Static files support for actix web."
+readme = "README.md"
+keywords = ["actix", "http", "async", "futures"]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web.git"
+documentation = "https://docs.rs/actix-files/"
+categories = ["asynchronous", "web-programming::http-server"]
+license = "MIT/Apache-2.0"
+edition = "2018"
+workspace = ".."
+
+[lib]
+name = "actix_files"
+path = "src/lib.rs"
+
+[dependencies]
+actix-web = "1.0.0-alpha.2"
+actix-service = "0.3.4"
+bitflags = "1"
+bytes = "0.4"
+futures = "0.1.25"
+derive_more = "0.14"
+log = "0.4"
+mime = "0.3"
+mime_guess = "2.0.0-alpha"
+percent-encoding = "1.0"
+v_htmlescape = "0.4"
+
+[dev-dependencies]
+actix-web = { version = "1.0.0-alpha.2", features=["ssl"] }
diff --git a/actix-files/README.md b/actix-files/README.md
new file mode 100644
index 000000000..5b133f57e
--- /dev/null
+++ b/actix-files/README.md
@@ -0,0 +1 @@
+# Static files support for actix web [](https://travis-ci.org/actix/actix-web) [](https://codecov.io/gh/actix/actix-web) [](https://crates.io/crates/actix-files) [](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
diff --git a/actix-files/src/error.rs b/actix-files/src/error.rs
new file mode 100644
index 000000000..ca99fa813
--- /dev/null
+++ b/actix-files/src/error.rs
@@ -0,0 +1,41 @@
+use actix_web::{http::StatusCode, HttpResponse, ResponseError};
+use derive_more::Display;
+
+/// Errors which can occur when serving static files.
+#[derive(Display, Debug, PartialEq)]
+pub enum FilesError {
+ /// Path is not a directory
+ #[display(fmt = "Path is not a directory. Unable to serve static files")]
+ IsNotDirectory,
+
+ /// Cannot render directory
+ #[display(fmt = "Unable to render directory without index file")]
+ IsDirectory,
+}
+
+/// Return `NotFound` for `FilesError`
+impl ResponseError for FilesError {
+ fn error_response(&self) -> HttpResponse {
+ HttpResponse::new(StatusCode::NOT_FOUND)
+ }
+}
+
+#[derive(Display, Debug, PartialEq)]
+pub enum UriSegmentError {
+ /// The segment started with the wrapped invalid character.
+ #[display(fmt = "The segment started with the wrapped invalid character")]
+ BadStart(char),
+ /// The segment contained the wrapped invalid character.
+ #[display(fmt = "The segment contained the wrapped invalid character")]
+ BadChar(char),
+ /// The segment ended with the wrapped invalid character.
+ #[display(fmt = "The segment ended with the wrapped invalid character")]
+ BadEnd(char),
+}
+
+/// Return `BadRequest` for `UriSegmentError`
+impl ResponseError for UriSegmentError {
+ fn error_response(&self) -> HttpResponse {
+ HttpResponse::new(StatusCode::BAD_REQUEST)
+ }
+}
diff --git a/actix-files/src/lib.rs b/actix-files/src/lib.rs
new file mode 100644
index 000000000..8404ab319
--- /dev/null
+++ b/actix-files/src/lib.rs
@@ -0,0 +1,1211 @@
+//! Static files support
+use std::cell::RefCell;
+use std::fmt::Write;
+use std::fs::{DirEntry, File};
+use std::io::{Read, Seek};
+use std::path::{Path, PathBuf};
+use std::rc::Rc;
+use std::{cmp, io};
+
+use actix_service::boxed::{self, BoxedNewService, BoxedService};
+use actix_service::{IntoNewService, NewService, Service};
+use actix_web::dev::{
+ HttpServiceFactory, Payload, ResourceDef, ServiceConfig, ServiceFromRequest,
+ ServiceRequest, ServiceResponse,
+};
+use actix_web::error::{BlockingError, Error, ErrorInternalServerError};
+use actix_web::http::header::DispositionType;
+use actix_web::{web, FromRequest, HttpRequest, HttpResponse, Responder};
+use bytes::Bytes;
+use futures::future::{ok, Either, FutureResult};
+use futures::{Async, Future, Poll, Stream};
+use mime;
+use mime_guess::get_mime_type;
+use percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET};
+use v_htmlescape::escape as escape_html_entity;
+
+mod error;
+mod named;
+mod range;
+
+use self::error::{FilesError, UriSegmentError};
+pub use crate::named::NamedFile;
+pub use crate::range::HttpRange;
+
+type HttpService = BoxedService, ServiceResponse, Error>;
+type HttpNewService =
+ BoxedNewService<(), ServiceRequest
, ServiceResponse, Error, ()>;
+
+/// Return the MIME type associated with a filename extension (case-insensitive).
+/// If `ext` is empty or no associated type for the extension was found, returns
+/// the type `application/octet-stream`.
+#[inline]
+pub fn file_extension_to_mime(ext: &str) -> mime::Mime {
+ get_mime_type(ext)
+}
+
+#[doc(hidden)]
+/// A helper created from a `std::fs::File` which reads the file
+/// chunk-by-chunk on a `ThreadPool`.
+pub struct ChunkedReadFile {
+ size: u64,
+ offset: u64,
+ file: Option,
+ fut: Option>>>,
+ counter: u64,
+}
+
+fn handle_error(err: BlockingError) -> Error {
+ match err {
+ BlockingError::Error(err) => err.into(),
+ BlockingError::Canceled => ErrorInternalServerError("Unexpected error").into(),
+ }
+}
+
+impl Stream for ChunkedReadFile {
+ type Item = Bytes;
+ type Error = Error;
+
+ fn poll(&mut self) -> Poll, Error> {
+ if self.fut.is_some() {
+ return match self.fut.as_mut().unwrap().poll().map_err(handle_error)? {
+ Async::Ready((file, bytes)) => {
+ self.fut.take();
+ self.file = Some(file);
+ self.offset += bytes.len() as u64;
+ self.counter += bytes.len() as u64;
+ Ok(Async::Ready(Some(bytes)))
+ }
+ Async::NotReady => Ok(Async::NotReady),
+ };
+ }
+
+ let size = self.size;
+ let offset = self.offset;
+ let counter = self.counter;
+
+ if size == counter {
+ Ok(Async::Ready(None))
+ } else {
+ let mut file = self.file.take().expect("Use after completion");
+ self.fut = Some(Box::new(web::block(move || {
+ let max_bytes: usize;
+ max_bytes = cmp::min(size.saturating_sub(counter), 65_536) as usize;
+ let mut buf = Vec::with_capacity(max_bytes);
+ file.seek(io::SeekFrom::Start(offset))?;
+ let nbytes =
+ file.by_ref().take(max_bytes as u64).read_to_end(&mut buf)?;
+ if nbytes == 0 {
+ return Err(io::ErrorKind::UnexpectedEof.into());
+ }
+ Ok((file, Bytes::from(buf)))
+ })));
+ self.poll()
+ }
+ }
+}
+
+type DirectoryRenderer =
+ Fn(&Directory, &HttpRequest) -> Result;
+
+/// A directory; responds with the generated directory listing.
+#[derive(Debug)]
+pub struct Directory {
+ /// Base directory
+ pub base: PathBuf,
+ /// Path of subdirectory to generate listing for
+ pub path: PathBuf,
+}
+
+impl Directory {
+ /// Create a new directory
+ pub fn new(base: PathBuf, path: PathBuf) -> Directory {
+ Directory { base, path }
+ }
+
+ /// Is this entry visible from this directory?
+ pub fn is_visible(&self, entry: &io::Result) -> bool {
+ if let Ok(ref entry) = *entry {
+ if let Some(name) = entry.file_name().to_str() {
+ if name.starts_with('.') {
+ return false;
+ }
+ }
+ if let Ok(ref md) = entry.metadata() {
+ let ft = md.file_type();
+ return ft.is_dir() || ft.is_file() || ft.is_symlink();
+ }
+ }
+ false
+ }
+}
+
+// show file url as relative to static path
+macro_rules! encode_file_url {
+ ($path:ident) => {
+ utf8_percent_encode(&$path.to_string_lossy(), DEFAULT_ENCODE_SET)
+ };
+}
+
+// " -- " & -- & ' -- ' < -- < > -- > / -- /
+macro_rules! encode_file_name {
+ ($entry:ident) => {
+ escape_html_entity(&$entry.file_name().to_string_lossy())
+ };
+}
+
+fn directory_listing(
+ dir: &Directory,
+ req: &HttpRequest,
+) -> Result {
+ let index_of = format!("Index of {}", req.path());
+ let mut body = String::new();
+ let base = Path::new(req.path());
+
+ for entry in dir.path.read_dir()? {
+ if dir.is_visible(&entry) {
+ let entry = entry.unwrap();
+ let p = match entry.path().strip_prefix(&dir.path) {
+ Ok(p) => base.join(p),
+ Err(_) => continue,
+ };
+
+ // if file is a directory, add '/' to the end of the name
+ if let Ok(metadata) = entry.metadata() {
+ if metadata.is_dir() {
+ let _ = write!(
+ body,
+ "{}/",
+ encode_file_url!(p),
+ encode_file_name!(entry),
+ );
+ } else {
+ let _ = write!(
+ body,
+ "{}",
+ encode_file_url!(p),
+ encode_file_name!(entry),
+ );
+ }
+ } else {
+ continue;
+ }
+ }
+ }
+
+ let html = format!(
+ "\
+ {}\
+ {}
\
+ \n",
+ index_of, index_of, body
+ );
+ Ok(ServiceResponse::new(
+ req.clone(),
+ HttpResponse::Ok()
+ .content_type("text/html; charset=utf-8")
+ .body(html),
+ ))
+}
+
+type MimeOverride = Fn(&mime::Name) -> DispositionType;
+
+/// Static files handling
+///
+/// `Files` service must be registered with `App::service()` method.
+///
+/// ```rust
+/// use actix_web::App;
+/// use actix_files as fs;
+///
+/// fn main() {
+/// let app = App::new()
+/// .service(fs::Files::new("/static", "."));
+/// }
+/// ```
+pub struct Files {
+ path: String,
+ directory: PathBuf,
+ index: Option,
+ show_index: bool,
+ default: Rc>>>>,
+ renderer: Rc,
+ mime_override: Option>,
+ file_flags: named::Flags,
+}
+
+impl Clone for Files {
+ fn clone(&self) -> Self {
+ Self {
+ directory: self.directory.clone(),
+ index: self.index.clone(),
+ show_index: self.show_index,
+ default: self.default.clone(),
+ renderer: self.renderer.clone(),
+ file_flags: self.file_flags,
+ path: self.path.clone(),
+ mime_override: self.mime_override.clone(),
+ }
+ }
+}
+
+impl Files {
+ /// Create new `Files` instance for specified base directory.
+ ///
+ /// `File` uses `ThreadPool` for blocking filesystem operations.
+ /// By default pool with 5x threads of available cpus is used.
+ /// Pool size can be changed by setting ACTIX_CPU_POOL environment variable.
+ pub fn new>(path: &str, dir: T) -> Files {
+ let dir = dir.into().canonicalize().unwrap_or_else(|_| PathBuf::new());
+ if !dir.is_dir() {
+ log::error!("Specified path is not a directory");
+ }
+
+ Files {
+ path: path.to_string(),
+ directory: dir,
+ index: None,
+ show_index: false,
+ default: Rc::new(RefCell::new(None)),
+ renderer: Rc::new(directory_listing),
+ mime_override: None,
+ file_flags: named::Flags::default(),
+ }
+ }
+
+ /// Show files listing for directories.
+ ///
+ /// By default show files listing is disabled.
+ pub fn show_files_listing(mut self) -> Self {
+ self.show_index = true;
+ self
+ }
+
+ /// Set custom directory renderer
+ pub fn files_listing_renderer(mut self, f: F) -> Self
+ where
+ for<'r, 's> F:
+ Fn(&'r Directory, &'s HttpRequest) -> Result
+ + 'static,
+ {
+ self.renderer = Rc::new(f);
+ self
+ }
+
+ /// Specifies mime override callback
+ pub fn mime_override(mut self, f: F) -> Self
+ where
+ F: Fn(&mime::Name) -> DispositionType + 'static,
+ {
+ self.mime_override = Some(Rc::new(f));
+ self
+ }
+
+ /// Set index file
+ ///
+ /// Shows specific index file for directory "/" instead of
+ /// showing files listing.
+ pub fn index_file>(mut self, index: T) -> Self {
+ self.index = Some(index.into());
+ self
+ }
+
+ #[inline]
+ ///Specifies whether to use ETag or not.
+ ///
+ ///Default is true.
+ pub fn use_etag(mut self, value: bool) -> Self {
+ self.file_flags.set(named::Flags::ETAG, value);
+ self
+ }
+
+ #[inline]
+ ///Specifies whether to use Last-Modified or not.
+ ///
+ ///Default is true.
+ pub fn use_last_modified(mut self, value: bool) -> Self {
+ self.file_flags.set(named::Flags::LAST_MD, value);
+ self
+ }
+
+ /// Sets default handler which is used when no matched file could be found.
+ pub fn default_handler(mut self, f: F) -> Self
+ where
+ F: IntoNewService,
+ U: NewService<
+ Request = ServiceRequest,
+ Response = ServiceResponse,
+ Error = Error,
+ > + 'static,
+ {
+ // create and configure default resource
+ self.default = Rc::new(RefCell::new(Some(Rc::new(boxed::new_service(
+ f.into_new_service().map_init_err(|_| ()),
+ )))));
+
+ self
+ }
+}
+
+impl HttpServiceFactory
for Files
+where
+ P: 'static,
+{
+ fn register(self, config: &mut ServiceConfig
) {
+ if self.default.borrow().is_none() {
+ *self.default.borrow_mut() = Some(config.default_service());
+ }
+ let rdef = if config.is_root() {
+ ResourceDef::root_prefix(&self.path)
+ } else {
+ ResourceDef::prefix(&self.path)
+ };
+ config.register_service(rdef, None, self, None)
+ }
+}
+
+impl NewService for Files {
+ type Request = ServiceRequest
;
+ type Response = ServiceResponse;
+ type Error = Error;
+ type Service = FilesService
;
+ type InitError = ();
+ type Future = Box>;
+
+ fn new_service(&self, _: &()) -> Self::Future {
+ let mut srv = FilesService {
+ directory: self.directory.clone(),
+ index: self.index.clone(),
+ show_index: self.show_index,
+ default: None,
+ renderer: self.renderer.clone(),
+ mime_override: self.mime_override.clone(),
+ file_flags: self.file_flags,
+ };
+
+ if let Some(ref default) = *self.default.borrow() {
+ Box::new(
+ default
+ .new_service(&())
+ .map(move |default| {
+ srv.default = Some(default);
+ srv
+ })
+ .map_err(|_| ()),
+ )
+ } else {
+ Box::new(ok(srv))
+ }
+ }
+}
+
+pub struct FilesService {
+ directory: PathBuf,
+ index: Option,
+ show_index: bool,
+ default: Option>,
+ renderer: Rc,
+ mime_override: Option>,
+ file_flags: named::Flags,
+}
+
+impl FilesService
{
+ fn handle_err(
+ &mut self,
+ e: io::Error,
+ req: HttpRequest,
+ payload: Payload
,
+ ) -> Either<
+ FutureResult,
+ Box>,
+ > {
+ log::debug!("Files: Failed to handle {}: {}", req.path(), e);
+ if let Some(ref mut default) = self.default {
+ Either::B(default.call(ServiceRequest::from_parts(req, payload)))
+ } else {
+ Either::A(ok(ServiceResponse::from_err(e, req.clone())))
+ }
+ }
+}
+
+impl Service for FilesService
{
+ type Request = ServiceRequest
;
+ type Response = ServiceResponse;
+ type Error = Error;
+ type Future = Either<
+ FutureResult,
+ Box>,
+ >;
+
+ fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+ Ok(Async::Ready(()))
+ }
+
+ fn call(&mut self, req: ServiceRequest) -> Self::Future {
+ let (req, pl) = req.into_parts();
+
+ let real_path = match PathBufWrp::get_pathbuf(req.match_info().path()) {
+ Ok(item) => item,
+ Err(e) => return Either::A(ok(ServiceResponse::from_err(e, req.clone()))),
+ };
+
+ // full filepath
+ let path = match self.directory.join(&real_path.0).canonicalize() {
+ Ok(path) => path,
+ Err(e) => return self.handle_err(e, req, pl),
+ };
+
+ if path.is_dir() {
+ if let Some(ref redir_index) = self.index {
+ let path = path.join(redir_index);
+
+ match NamedFile::open(path) {
+ Ok(mut named_file) => {
+ if let Some(ref mime_override) = self.mime_override {
+ let new_disposition =
+ mime_override(&named_file.content_type.type_());
+ named_file.content_disposition.disposition = new_disposition;
+ }
+
+ named_file.flags = self.file_flags;
+ Either::A(ok(match named_file.respond_to(&req) {
+ Ok(item) => ServiceResponse::new(req.clone(), item),
+ Err(e) => ServiceResponse::from_err(e, req.clone()),
+ }))
+ }
+ Err(e) => return self.handle_err(e, req, pl),
+ }
+ } else if self.show_index {
+ let dir = Directory::new(self.directory.clone(), path);
+ let x = (self.renderer)(&dir, &req);
+ match x {
+ Ok(resp) => Either::A(ok(resp)),
+ Err(e) => return self.handle_err(e, req, pl),
+ }
+ } else {
+ Either::A(ok(ServiceResponse::from_err(
+ FilesError::IsDirectory,
+ req.clone(),
+ )))
+ }
+ } else {
+ match NamedFile::open(path) {
+ Ok(mut named_file) => {
+ if let Some(ref mime_override) = self.mime_override {
+ let new_disposition =
+ mime_override(&named_file.content_type.type_());
+ named_file.content_disposition.disposition = new_disposition;
+ }
+
+ named_file.flags = self.file_flags;
+ match named_file.respond_to(&req) {
+ Ok(item) => {
+ Either::A(ok(ServiceResponse::new(req.clone(), item)))
+ }
+ Err(e) => {
+ Either::A(ok(ServiceResponse::from_err(e, req.clone())))
+ }
+ }
+ }
+ Err(e) => self.handle_err(e, req, pl),
+ }
+ }
+ }
+}
+
+#[derive(Debug)]
+struct PathBufWrp(PathBuf);
+
+impl PathBufWrp {
+ fn get_pathbuf(path: &str) -> Result {
+ let mut buf = PathBuf::new();
+ for segment in path.split('/') {
+ if segment == ".." {
+ buf.pop();
+ } else if segment.starts_with('.') {
+ return Err(UriSegmentError::BadStart('.'));
+ } else if segment.starts_with('*') {
+ return Err(UriSegmentError::BadStart('*'));
+ } else if segment.ends_with(':') {
+ return Err(UriSegmentError::BadEnd(':'));
+ } else if segment.ends_with('>') {
+ return Err(UriSegmentError::BadEnd('>'));
+ } else if segment.ends_with('<') {
+ return Err(UriSegmentError::BadEnd('<'));
+ } else if segment.is_empty() {
+ continue;
+ } else if cfg!(windows) && segment.contains('\\') {
+ return Err(UriSegmentError::BadChar('\\'));
+ } else {
+ buf.push(segment)
+ }
+ }
+
+ Ok(PathBufWrp(buf))
+ }
+}
+
+impl FromRequest
for PathBufWrp {
+ type Error = UriSegmentError;
+ type Future = Result;
+
+ fn from_request(req: &mut ServiceFromRequest) -> Self::Future {
+ PathBufWrp::get_pathbuf(req.request().match_info().path())
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use std::fs;
+ use std::iter::FromIterator;
+ use std::ops::Add;
+ use std::time::{Duration, SystemTime};
+
+ use bytes::BytesMut;
+
+ use super::*;
+ use actix_web::http::header::{
+ self, ContentDisposition, DispositionParam, DispositionType,
+ };
+ use actix_web::http::{Method, StatusCode};
+ use actix_web::test::{self, TestRequest};
+ use actix_web::App;
+
+ #[test]
+ fn test_file_extension_to_mime() {
+ let m = file_extension_to_mime("jpg");
+ assert_eq!(m, mime::IMAGE_JPEG);
+
+ let m = file_extension_to_mime("invalid extension!!");
+ assert_eq!(m, mime::APPLICATION_OCTET_STREAM);
+
+ let m = file_extension_to_mime("");
+ assert_eq!(m, mime::APPLICATION_OCTET_STREAM);
+ }
+
+ #[test]
+ fn test_if_modified_since_without_if_none_match() {
+ let file = NamedFile::open("Cargo.toml").unwrap();
+ let since =
+ header::HttpDate::from(SystemTime::now().add(Duration::from_secs(60)));
+
+ let req = TestRequest::default()
+ .header(header::IF_MODIFIED_SINCE, since)
+ .to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(resp.status(), StatusCode::NOT_MODIFIED);
+ }
+
+ #[test]
+ fn test_if_modified_since_with_if_none_match() {
+ let file = NamedFile::open("Cargo.toml").unwrap();
+ let since =
+ header::HttpDate::from(SystemTime::now().add(Duration::from_secs(60)));
+
+ let req = TestRequest::default()
+ .header(header::IF_NONE_MATCH, "miss_etag")
+ .header(header::IF_MODIFIED_SINCE, since)
+ .to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_ne!(resp.status(), StatusCode::NOT_MODIFIED);
+ }
+
+ #[test]
+ fn test_named_file_text() {
+ assert!(NamedFile::open("test--").is_err());
+ let mut file = NamedFile::open("Cargo.toml").unwrap();
+ {
+ file.file();
+ let _f: &File = &file;
+ }
+ {
+ let _f: &mut File = &mut file;
+ }
+
+ let req = TestRequest::default().to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(
+ resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ "text/x-toml"
+ );
+ assert_eq!(
+ resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+ "inline; filename=\"Cargo.toml\""
+ );
+ }
+
+ #[test]
+ fn test_named_file_set_content_type() {
+ let mut file = NamedFile::open("Cargo.toml")
+ .unwrap()
+ .set_content_type(mime::TEXT_XML);
+ {
+ file.file();
+ let _f: &File = &file;
+ }
+ {
+ let _f: &mut File = &mut file;
+ }
+
+ let req = TestRequest::default().to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(
+ resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ "text/xml"
+ );
+ assert_eq!(
+ resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+ "inline; filename=\"Cargo.toml\""
+ );
+ }
+
+ #[test]
+ fn test_named_file_image() {
+ let mut file = NamedFile::open("tests/test.png").unwrap();
+ {
+ file.file();
+ let _f: &File = &file;
+ }
+ {
+ let _f: &mut File = &mut file;
+ }
+
+ let req = TestRequest::default().to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(
+ resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ "image/png"
+ );
+ assert_eq!(
+ resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+ "inline; filename=\"test.png\""
+ );
+ }
+
+ #[test]
+ fn test_named_file_image_attachment() {
+ let cd = ContentDisposition {
+ disposition: DispositionType::Attachment,
+ parameters: vec![DispositionParam::Filename(String::from("test.png"))],
+ };
+ let mut file = NamedFile::open("tests/test.png")
+ .unwrap()
+ .set_content_disposition(cd);
+ {
+ file.file();
+ let _f: &File = &file;
+ }
+ {
+ let _f: &mut File = &mut file;
+ }
+
+ let req = TestRequest::default().to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(
+ resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ "image/png"
+ );
+ assert_eq!(
+ resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+ "attachment; filename=\"test.png\""
+ );
+ }
+
+ #[test]
+ fn test_named_file_binary() {
+ let mut file = NamedFile::open("tests/test.binary").unwrap();
+ {
+ file.file();
+ let _f: &File = &file;
+ }
+ {
+ let _f: &mut File = &mut file;
+ }
+
+ let req = TestRequest::default().to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(
+ resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ "application/octet-stream"
+ );
+ assert_eq!(
+ resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+ "attachment; filename=\"test.binary\""
+ );
+ }
+
+ #[test]
+ fn test_named_file_status_code_text() {
+ let mut file = NamedFile::open("Cargo.toml")
+ .unwrap()
+ .set_status_code(StatusCode::NOT_FOUND);
+ {
+ file.file();
+ let _f: &File = &file;
+ }
+ {
+ let _f: &mut File = &mut file;
+ }
+
+ let req = TestRequest::default().to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(
+ resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ "text/x-toml"
+ );
+ assert_eq!(
+ resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+ "inline; filename=\"Cargo.toml\""
+ );
+ assert_eq!(resp.status(), StatusCode::NOT_FOUND);
+ }
+
+ #[test]
+ fn test_mime_override() {
+ fn all_attachment(_: &mime::Name) -> DispositionType {
+ DispositionType::Attachment
+ }
+
+ let mut srv = test::init_service(
+ App::new().service(
+ Files::new("/", ".")
+ .mime_override(all_attachment)
+ .index_file("Cargo.toml"),
+ ),
+ );
+
+ let request = TestRequest::get().uri("/").to_request();
+ let response = test::call_success(&mut srv, request);
+ assert_eq!(response.status(), StatusCode::OK);
+
+ let content_disposition = response
+ .headers()
+ .get(header::CONTENT_DISPOSITION)
+ .expect("To have CONTENT_DISPOSITION");
+ let content_disposition = content_disposition
+ .to_str()
+ .expect("Convert CONTENT_DISPOSITION to str");
+ assert_eq!(content_disposition, "attachment; filename=\"Cargo.toml\"");
+ }
+
+ #[test]
+ fn test_named_file_ranges_status_code() {
+ let mut srv = test::init_service(
+ App::new().service(Files::new("/test", ".").index_file("Cargo.toml")),
+ );
+
+ // Valid range header
+ let request = TestRequest::get()
+ .uri("/t%65st/Cargo.toml")
+ .header(header::RANGE, "bytes=10-20")
+ .to_request();
+ let response = test::call_success(&mut srv, request);
+ assert_eq!(response.status(), StatusCode::PARTIAL_CONTENT);
+
+ // Invalid range header
+ let request = TestRequest::get()
+ .uri("/t%65st/Cargo.toml")
+ .header(header::RANGE, "bytes=1-0")
+ .to_request();
+ let response = test::call_success(&mut srv, request);
+
+ assert_eq!(response.status(), StatusCode::RANGE_NOT_SATISFIABLE);
+ }
+
+ #[test]
+ fn test_named_file_content_range_headers() {
+ let mut srv = test::init_service(
+ App::new().service(Files::new("/test", ".").index_file("tests/test.binary")),
+ );
+
+ // Valid range header
+ let request = TestRequest::get()
+ .uri("/t%65st/tests/test.binary")
+ .header(header::RANGE, "bytes=10-20")
+ .to_request();
+
+ let response = test::call_success(&mut srv, request);
+ let contentrange = response
+ .headers()
+ .get(header::CONTENT_RANGE)
+ .unwrap()
+ .to_str()
+ .unwrap();
+
+ assert_eq!(contentrange, "bytes 10-20/100");
+
+ // Invalid range header
+ let request = TestRequest::get()
+ .uri("/t%65st/tests/test.binary")
+ .header(header::RANGE, "bytes=10-5")
+ .to_request();
+ let response = test::call_success(&mut srv, request);
+
+ let contentrange = response
+ .headers()
+ .get(header::CONTENT_RANGE)
+ .unwrap()
+ .to_str()
+ .unwrap();
+
+ assert_eq!(contentrange, "bytes */100");
+ }
+
+ #[test]
+ fn test_named_file_content_length_headers() {
+ let mut srv = test::init_service(
+ App::new().service(Files::new("test", ".").index_file("tests/test.binary")),
+ );
+
+ // Valid range header
+ let request = TestRequest::get()
+ .uri("/t%65st/tests/test.binary")
+ .header(header::RANGE, "bytes=10-20")
+ .to_request();
+ let response = test::call_success(&mut srv, request);
+
+ let contentlength = response
+ .headers()
+ .get(header::CONTENT_LENGTH)
+ .unwrap()
+ .to_str()
+ .unwrap();
+
+ assert_eq!(contentlength, "11");
+
+ // Invalid range header
+ let request = TestRequest::get()
+ .uri("/t%65st/tests/test.binary")
+ .header(header::RANGE, "bytes=10-8")
+ .to_request();
+ let response = test::call_success(&mut srv, request);
+ assert_eq!(response.status(), StatusCode::RANGE_NOT_SATISFIABLE);
+
+ // Without range header
+ let request = TestRequest::get()
+ .uri("/t%65st/tests/test.binary")
+ // .no_default_headers()
+ .to_request();
+ let response = test::call_success(&mut srv, request);
+
+ let contentlength = response
+ .headers()
+ .get(header::CONTENT_LENGTH)
+ .unwrap()
+ .to_str()
+ .unwrap();
+
+ assert_eq!(contentlength, "100");
+
+ // chunked
+ let request = TestRequest::get()
+ .uri("/t%65st/tests/test.binary")
+ .to_request();
+ let mut response = test::call_success(&mut srv, request);
+
+ // with enabled compression
+ // {
+ // let te = response
+ // .headers()
+ // .get(header::TRANSFER_ENCODING)
+ // .unwrap()
+ // .to_str()
+ // .unwrap();
+ // assert_eq!(te, "chunked");
+ // }
+
+ let bytes =
+ test::block_on(response.take_body().fold(BytesMut::new(), |mut b, c| {
+ b.extend(c);
+ Ok::<_, Error>(b)
+ }))
+ .unwrap();
+ let data = Bytes::from(fs::read("tests/test.binary").unwrap());
+ assert_eq!(bytes.freeze(), data);
+ }
+
+ #[test]
+ fn test_static_files_with_spaces() {
+ let mut srv = test::init_service(
+ App::new().service(Files::new("/", ".").index_file("Cargo.toml")),
+ );
+ let request = TestRequest::get()
+ .uri("/tests/test%20space.binary")
+ .to_request();
+ let mut response = test::call_success(&mut srv, request);
+ assert_eq!(response.status(), StatusCode::OK);
+
+ let bytes =
+ test::block_on(response.take_body().fold(BytesMut::new(), |mut b, c| {
+ b.extend(c);
+ Ok::<_, Error>(b)
+ }))
+ .unwrap();
+
+ let data = Bytes::from(fs::read("tests/test space.binary").unwrap());
+ assert_eq!(bytes.freeze(), data);
+ }
+
+ #[test]
+ fn test_named_file_not_allowed() {
+ let file = NamedFile::open("Cargo.toml").unwrap();
+ let req = TestRequest::default()
+ .method(Method::POST)
+ .to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(resp.status(), StatusCode::METHOD_NOT_ALLOWED);
+
+ let file = NamedFile::open("Cargo.toml").unwrap();
+ let req = TestRequest::default().method(Method::PUT).to_http_request();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(resp.status(), StatusCode::METHOD_NOT_ALLOWED);
+ }
+
+ #[test]
+ fn test_named_file_content_encoding() {
+ let mut srv = test::init_service(App::new().enable_encoding().service(
+ web::resource("/").to(|| {
+ NamedFile::open("Cargo.toml")
+ .unwrap()
+ .set_content_encoding(header::ContentEncoding::Identity)
+ }),
+ ));
+
+ let request = TestRequest::get()
+ .uri("/")
+ .header(header::ACCEPT_ENCODING, "gzip")
+ .to_request();
+ let res = test::call_success(&mut srv, request);
+ assert_eq!(res.status(), StatusCode::OK);
+
+ assert_eq!(
+ res.headers()
+ .get(header::CONTENT_ENCODING)
+ .unwrap()
+ .to_str()
+ .unwrap(),
+ "identity"
+ );
+ }
+
+ #[test]
+ fn test_named_file_allowed_method() {
+ let req = TestRequest::default().method(Method::GET).to_http_request();
+ let file = NamedFile::open("Cargo.toml").unwrap();
+ let resp = file.respond_to(&req).unwrap();
+ assert_eq!(resp.status(), StatusCode::OK);
+ }
+
+ #[test]
+ fn test_static_files() {
+ let mut srv = test::init_service(
+ App::new().service(Files::new("/", ".").show_files_listing()),
+ );
+ let req = TestRequest::with_uri("/missing").to_request();
+
+ let resp = test::call_success(&mut srv, req);
+ assert_eq!(resp.status(), StatusCode::NOT_FOUND);
+
+ let mut srv = test::init_service(App::new().service(Files::new("/", ".")));
+
+ let req = TestRequest::default().to_request();
+ let resp = test::call_success(&mut srv, req);
+ assert_eq!(resp.status(), StatusCode::NOT_FOUND);
+
+ let mut srv = test::init_service(
+ App::new().service(Files::new("/", ".").show_files_listing()),
+ );
+ let req = TestRequest::with_uri("/tests").to_request();
+ let mut resp = test::call_success(&mut srv, req);
+ assert_eq!(
+ resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ "text/html; charset=utf-8"
+ );
+
+ let bytes =
+ test::block_on(resp.take_body().fold(BytesMut::new(), |mut b, c| {
+ b.extend(c);
+ Ok::<_, Error>(b)
+ }))
+ .unwrap();
+ assert!(format!("{:?}", bytes).contains("/tests/test.png"));
+ }
+
+ #[test]
+ fn test_static_files_bad_directory() {
+ let _st: Files<()> = Files::new("/", "missing");
+ let _st: Files<()> = Files::new("/", "Cargo.toml");
+ }
+
+ #[test]
+ fn test_default_handler_file_missing() {
+ let mut st = test::block_on(
+ Files::new("/", ".")
+ .default_handler(|req: ServiceRequest<_>| {
+ Ok(req.into_response(HttpResponse::Ok().body("default content")))
+ })
+ .new_service(&()),
+ )
+ .unwrap();
+ let req = TestRequest::with_uri("/missing").to_srv_request();
+
+ let mut resp = test::call_success(&mut st, req);
+ assert_eq!(resp.status(), StatusCode::OK);
+ let bytes =
+ test::block_on(resp.take_body().fold(BytesMut::new(), |mut b, c| {
+ b.extend(c);
+ Ok::<_, Error>(b)
+ }))
+ .unwrap();
+
+ assert_eq!(bytes.freeze(), Bytes::from_static(b"default content"));
+ }
+
+ // #[test]
+ // fn test_serve_index() {
+ // let st = Files::new(".").index_file("test.binary");
+ // let req = TestRequest::default().uri("/tests").finish();
+
+ // let resp = st.handle(&req).respond_to(&req).unwrap();
+ // let resp = resp.as_msg();
+ // assert_eq!(resp.status(), StatusCode::OK);
+ // assert_eq!(
+ // resp.headers()
+ // .get(header::CONTENT_TYPE)
+ // .expect("content type"),
+ // "application/octet-stream"
+ // );
+ // assert_eq!(
+ // resp.headers()
+ // .get(header::CONTENT_DISPOSITION)
+ // .expect("content disposition"),
+ // "attachment; filename=\"test.binary\""
+ // );
+
+ // let req = TestRequest::default().uri("/tests/").finish();
+ // let resp = st.handle(&req).respond_to(&req).unwrap();
+ // let resp = resp.as_msg();
+ // assert_eq!(resp.status(), StatusCode::OK);
+ // assert_eq!(
+ // resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ // "application/octet-stream"
+ // );
+ // assert_eq!(
+ // resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+ // "attachment; filename=\"test.binary\""
+ // );
+
+ // // nonexistent index file
+ // let req = TestRequest::default().uri("/tests/unknown").finish();
+ // let resp = st.handle(&req).respond_to(&req).unwrap();
+ // let resp = resp.as_msg();
+ // assert_eq!(resp.status(), StatusCode::NOT_FOUND);
+
+ // let req = TestRequest::default().uri("/tests/unknown/").finish();
+ // let resp = st.handle(&req).respond_to(&req).unwrap();
+ // let resp = resp.as_msg();
+ // assert_eq!(resp.status(), StatusCode::NOT_FOUND);
+ // }
+
+ // #[test]
+ // fn test_serve_index_nested() {
+ // let st = Files::new(".").index_file("mod.rs");
+ // let req = TestRequest::default().uri("/src/client").finish();
+ // let resp = st.handle(&req).respond_to(&req).unwrap();
+ // let resp = resp.as_msg();
+ // assert_eq!(resp.status(), StatusCode::OK);
+ // assert_eq!(
+ // resp.headers().get(header::CONTENT_TYPE).unwrap(),
+ // "text/x-rust"
+ // );
+ // assert_eq!(
+ // resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+ // "inline; filename=\"mod.rs\""
+ // );
+ // }
+
+ // #[test]
+ // fn integration_serve_index() {
+ // let mut srv = test::TestServer::with_factory(|| {
+ // App::new().handler(
+ // "test",
+ // Files::new(".").index_file("Cargo.toml"),
+ // )
+ // });
+
+ // let request = srv.get().uri(srv.url("/test")).finish().unwrap();
+ // let response = srv.execute(request.send()).unwrap();
+ // assert_eq!(response.status(), StatusCode::OK);
+ // let bytes = srv.execute(response.body()).unwrap();
+ // let data = Bytes::from(fs::read("Cargo.toml").unwrap());
+ // assert_eq!(bytes, data);
+
+ // let request = srv.get().uri(srv.url("/test/")).finish().unwrap();
+ // let response = srv.execute(request.send()).unwrap();
+ // assert_eq!(response.status(), StatusCode::OK);
+ // let bytes = srv.execute(response.body()).unwrap();
+ // let data = Bytes::from(fs::read("Cargo.toml").unwrap());
+ // assert_eq!(bytes, data);
+
+ // // nonexistent index file
+ // let request = srv.get().uri(srv.url("/test/unknown")).finish().unwrap();
+ // let response = srv.execute(request.send()).unwrap();
+ // assert_eq!(response.status(), StatusCode::NOT_FOUND);
+
+ // let request = srv.get().uri(srv.url("/test/unknown/")).finish().unwrap();
+ // let response = srv.execute(request.send()).unwrap();
+ // assert_eq!(response.status(), StatusCode::NOT_FOUND);
+ // }
+
+ // #[test]
+ // fn integration_percent_encoded() {
+ // let mut srv = test::TestServer::with_factory(|| {
+ // App::new().handler(
+ // "test",
+ // Files::new(".").index_file("Cargo.toml"),
+ // )
+ // });
+
+ // let request = srv
+ // .get()
+ // .uri(srv.url("/test/%43argo.toml"))
+ // .finish()
+ // .unwrap();
+ // let response = srv.execute(request.send()).unwrap();
+ // assert_eq!(response.status(), StatusCode::OK);
+ // }
+
+ #[test]
+ fn test_path_buf() {
+ assert_eq!(
+ PathBufWrp::get_pathbuf("/test/.tt").map(|t| t.0),
+ Err(UriSegmentError::BadStart('.'))
+ );
+ assert_eq!(
+ PathBufWrp::get_pathbuf("/test/*tt").map(|t| t.0),
+ Err(UriSegmentError::BadStart('*'))
+ );
+ assert_eq!(
+ PathBufWrp::get_pathbuf("/test/tt:").map(|t| t.0),
+ Err(UriSegmentError::BadEnd(':'))
+ );
+ assert_eq!(
+ PathBufWrp::get_pathbuf("/test/tt<").map(|t| t.0),
+ Err(UriSegmentError::BadEnd('<'))
+ );
+ assert_eq!(
+ PathBufWrp::get_pathbuf("/test/tt>").map(|t| t.0),
+ Err(UriSegmentError::BadEnd('>'))
+ );
+ assert_eq!(
+ PathBufWrp::get_pathbuf("/seg1/seg2/").unwrap().0,
+ PathBuf::from_iter(vec!["seg1", "seg2"])
+ );
+ assert_eq!(
+ PathBufWrp::get_pathbuf("/seg1/../seg2/").unwrap().0,
+ PathBuf::from_iter(vec!["seg2"])
+ );
+ }
+}
diff --git a/actix-files/src/named.rs b/actix-files/src/named.rs
new file mode 100644
index 000000000..4ee1a3caa
--- /dev/null
+++ b/actix-files/src/named.rs
@@ -0,0 +1,430 @@
+use std::fs::{File, Metadata};
+use std::io;
+use std::ops::{Deref, DerefMut};
+use std::path::{Path, PathBuf};
+use std::time::{SystemTime, UNIX_EPOCH};
+
+#[cfg(unix)]
+use std::os::unix::fs::MetadataExt;
+
+use bitflags::bitflags;
+use mime;
+use mime_guess::guess_mime_type;
+
+use actix_web::http::header::{
+ self, ContentDisposition, DispositionParam, DispositionType,
+};
+use actix_web::http::{ContentEncoding, Method, StatusCode};
+use actix_web::middleware::encoding::BodyEncoding;
+use actix_web::{Error, HttpMessage, HttpRequest, HttpResponse, Responder};
+
+use crate::range::HttpRange;
+use crate::ChunkedReadFile;
+
+bitflags! {
+ pub(crate) struct Flags: u32 {
+ const ETAG = 0b00000001;
+ const LAST_MD = 0b00000010;
+ }
+}
+
+impl Default for Flags {
+ fn default() -> Self {
+ Flags::all()
+ }
+}
+
+/// A file with an associated name.
+#[derive(Debug)]
+pub struct NamedFile {
+ path: PathBuf,
+ file: File,
+ pub(crate) content_type: mime::Mime,
+ pub(crate) content_disposition: header::ContentDisposition,
+ pub(crate) md: Metadata,
+ modified: Option,
+ pub(crate) encoding: Option,
+ pub(crate) status_code: StatusCode,
+ pub(crate) flags: Flags,
+}
+
+impl NamedFile {
+ /// Creates an instance from a previously opened file.
+ ///
+ /// The given `path` need not exist and is only used to determine the `ContentType` and
+ /// `ContentDisposition` headers.
+ ///
+ /// # Examples
+ ///
+ /// ```rust
+ /// use actix_files::NamedFile;
+ /// use std::io::{self, Write};
+ /// use std::env;
+ /// use std::fs::File;
+ ///
+ /// fn main() -> io::Result<()> {
+ /// let mut file = File::create("foo.txt")?;
+ /// file.write_all(b"Hello, world!")?;
+ /// let named_file = NamedFile::from_file(file, "bar.txt")?;
+ /// Ok(())
+ /// }
+ /// ```
+ pub fn from_file>(file: File, path: P) -> io::Result {
+ let path = path.as_ref().to_path_buf();
+
+ // Get the name of the file and use it to construct default Content-Type
+ // and Content-Disposition values
+ let (content_type, content_disposition) = {
+ let filename = match path.file_name() {
+ Some(name) => name.to_string_lossy(),
+ None => {
+ return Err(io::Error::new(
+ io::ErrorKind::InvalidInput,
+ "Provided path has no filename",
+ ));
+ }
+ };
+
+ let ct = guess_mime_type(&path);
+ let disposition_type = match ct.type_() {
+ mime::IMAGE | mime::TEXT | mime::VIDEO => DispositionType::Inline,
+ _ => DispositionType::Attachment,
+ };
+ let cd = ContentDisposition {
+ disposition: disposition_type,
+ parameters: vec![DispositionParam::Filename(filename.into_owned())],
+ };
+ (ct, cd)
+ };
+
+ let md = file.metadata()?;
+ let modified = md.modified().ok();
+ let encoding = None;
+ Ok(NamedFile {
+ path,
+ file,
+ content_type,
+ content_disposition,
+ md,
+ modified,
+ encoding,
+ status_code: StatusCode::OK,
+ flags: Flags::default(),
+ })
+ }
+
+ /// Attempts to open a file in read-only mode.
+ ///
+ /// # Examples
+ ///
+ /// ```rust
+ /// use actix_files::NamedFile;
+ ///
+ /// let file = NamedFile::open("foo.txt");
+ /// ```
+ pub fn open>(path: P) -> io::Result {
+ Self::from_file(File::open(&path)?, path)
+ }
+
+ /// Returns reference to the underlying `File` object.
+ #[inline]
+ pub fn file(&self) -> &File {
+ &self.file
+ }
+
+ /// Retrieve the path of this file.
+ ///
+ /// # Examples
+ ///
+ /// ```rust
+ /// # use std::io;
+ /// use actix_files::NamedFile;
+ ///
+ /// # fn path() -> io::Result<()> {
+ /// let file = NamedFile::open("test.txt")?;
+ /// assert_eq!(file.path().as_os_str(), "foo.txt");
+ /// # Ok(())
+ /// # }
+ /// ```
+ #[inline]
+ pub fn path(&self) -> &Path {
+ self.path.as_path()
+ }
+
+ /// Set response **Status Code**
+ pub fn set_status_code(mut self, status: StatusCode) -> Self {
+ self.status_code = status;
+ self
+ }
+
+ /// Set the MIME Content-Type for serving this file. By default
+ /// the Content-Type is inferred from the filename extension.
+ #[inline]
+ pub fn set_content_type(mut self, mime_type: mime::Mime) -> Self {
+ self.content_type = mime_type;
+ self
+ }
+
+ /// Set the Content-Disposition for serving this file. This allows
+ /// changing the inline/attachment disposition as well as the filename
+ /// sent to the peer. By default the disposition is `inline` for text,
+ /// image, and video content types, and `attachment` otherwise, and
+ /// the filename is taken from the path provided in the `open` method
+ /// after converting it to UTF-8 using
+ /// [to_string_lossy](https://doc.rust-lang.org/std/ffi/struct.OsStr.html#method.to_string_lossy).
+ #[inline]
+ pub fn set_content_disposition(mut self, cd: header::ContentDisposition) -> Self {
+ self.content_disposition = cd;
+ self
+ }
+
+ /// Set content encoding for serving this file
+ #[inline]
+ pub fn set_content_encoding(mut self, enc: ContentEncoding) -> Self {
+ self.encoding = Some(enc);
+ self
+ }
+
+ #[inline]
+ ///Specifies whether to use ETag or not.
+ ///
+ ///Default is true.
+ pub fn use_etag(mut self, value: bool) -> Self {
+ self.flags.set(Flags::ETAG, value);
+ self
+ }
+
+ #[inline]
+ ///Specifies whether to use Last-Modified or not.
+ ///
+ ///Default is true.
+ pub fn use_last_modified(mut self, value: bool) -> Self {
+ self.flags.set(Flags::LAST_MD, value);
+ self
+ }
+
+ pub(crate) fn etag(&self) -> Option {
+ // This etag format is similar to Apache's.
+ self.modified.as_ref().map(|mtime| {
+ let ino = {
+ #[cfg(unix)]
+ {
+ self.md.ino()
+ }
+ #[cfg(not(unix))]
+ {
+ 0
+ }
+ };
+
+ let dur = mtime
+ .duration_since(UNIX_EPOCH)
+ .expect("modification time must be after epoch");
+ header::EntityTag::strong(format!(
+ "{:x}:{:x}:{:x}:{:x}",
+ ino,
+ self.md.len(),
+ dur.as_secs(),
+ dur.subsec_nanos()
+ ))
+ })
+ }
+
+ pub(crate) fn last_modified(&self) -> Option {
+ self.modified.map(|mtime| mtime.into())
+ }
+}
+
+impl Deref for NamedFile {
+ type Target = File;
+
+ fn deref(&self) -> &File {
+ &self.file
+ }
+}
+
+impl DerefMut for NamedFile {
+ fn deref_mut(&mut self) -> &mut File {
+ &mut self.file
+ }
+}
+
+/// Returns true if `req` has no `If-Match` header or one which matches `etag`.
+fn any_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool {
+ match req.get_header::() {
+ None | Some(header::IfMatch::Any) => true,
+ Some(header::IfMatch::Items(ref items)) => {
+ if let Some(some_etag) = etag {
+ for item in items {
+ if item.strong_eq(some_etag) {
+ return true;
+ }
+ }
+ }
+ false
+ }
+ }
+}
+
+/// Returns true if `req` doesn't have an `If-None-Match` header matching `req`.
+fn none_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool {
+ match req.get_header::() {
+ Some(header::IfNoneMatch::Any) => false,
+ Some(header::IfNoneMatch::Items(ref items)) => {
+ if let Some(some_etag) = etag {
+ for item in items {
+ if item.weak_eq(some_etag) {
+ return false;
+ }
+ }
+ }
+ true
+ }
+ None => true,
+ }
+}
+
+impl Responder for NamedFile {
+ type Error = Error;
+ type Future = Result;
+
+ fn respond_to(self, req: &HttpRequest) -> Self::Future {
+ if self.status_code != StatusCode::OK {
+ let mut resp = HttpResponse::build(self.status_code);
+ resp.set(header::ContentType(self.content_type.clone()))
+ .header(
+ header::CONTENT_DISPOSITION,
+ self.content_disposition.to_string(),
+ );
+ // TODO blocking by compressing
+ // if let Some(current_encoding) = self.encoding {
+ // resp.content_encoding(current_encoding);
+ // }
+ let reader = ChunkedReadFile {
+ size: self.md.len(),
+ offset: 0,
+ file: Some(self.file),
+ fut: None,
+ counter: 0,
+ };
+ return Ok(resp.streaming(reader));
+ }
+
+ match req.method() {
+ &Method::HEAD | &Method::GET => (),
+ _ => {
+ return Ok(HttpResponse::MethodNotAllowed()
+ .header(header::CONTENT_TYPE, "text/plain")
+ .header(header::ALLOW, "GET, HEAD")
+ .body("This resource only supports GET and HEAD."));
+ }
+ }
+
+ let etag = if self.flags.contains(Flags::ETAG) {
+ self.etag()
+ } else {
+ None
+ };
+ let last_modified = if self.flags.contains(Flags::LAST_MD) {
+ self.last_modified()
+ } else {
+ None
+ };
+
+ // check preconditions
+ let precondition_failed = if !any_match(etag.as_ref(), req) {
+ true
+ } else if let (Some(ref m), Some(header::IfUnmodifiedSince(ref since))) =
+ (last_modified, req.get_header())
+ {
+ m > since
+ } else {
+ false
+ };
+
+ // check last modified
+ let not_modified = if !none_match(etag.as_ref(), req) {
+ true
+ } else if req.headers().contains_key(header::IF_NONE_MATCH) {
+ false
+ } else if let (Some(ref m), Some(header::IfModifiedSince(ref since))) =
+ (last_modified, req.get_header())
+ {
+ m <= since
+ } else {
+ false
+ };
+
+ let mut resp = HttpResponse::build(self.status_code);
+ resp.set(header::ContentType(self.content_type.clone()))
+ .header(
+ header::CONTENT_DISPOSITION,
+ self.content_disposition.to_string(),
+ );
+ // default compressing
+ if let Some(current_encoding) = self.encoding {
+ resp.encoding(current_encoding);
+ }
+
+ resp.if_some(last_modified, |lm, resp| {
+ resp.set(header::LastModified(lm));
+ })
+ .if_some(etag, |etag, resp| {
+ resp.set(header::ETag(etag));
+ });
+
+ resp.header(header::ACCEPT_RANGES, "bytes");
+
+ let mut length = self.md.len();
+ let mut offset = 0;
+
+ // check for range header
+ if let Some(ranges) = req.headers().get(header::RANGE) {
+ if let Ok(rangesheader) = ranges.to_str() {
+ if let Ok(rangesvec) = HttpRange::parse(rangesheader, length) {
+ length = rangesvec[0].length;
+ offset = rangesvec[0].start;
+ resp.encoding(ContentEncoding::Identity);
+ resp.header(
+ header::CONTENT_RANGE,
+ format!(
+ "bytes {}-{}/{}",
+ offset,
+ offset + length - 1,
+ self.md.len()
+ ),
+ );
+ } else {
+ resp.header(header::CONTENT_RANGE, format!("bytes */{}", length));
+ return Ok(resp.status(StatusCode::RANGE_NOT_SATISFIABLE).finish());
+ };
+ } else {
+ return Ok(resp.status(StatusCode::BAD_REQUEST).finish());
+ };
+ };
+
+ resp.header(header::CONTENT_LENGTH, format!("{}", length));
+
+ if precondition_failed {
+ return Ok(resp.status(StatusCode::PRECONDITION_FAILED).finish());
+ } else if not_modified {
+ return Ok(resp.status(StatusCode::NOT_MODIFIED).finish());
+ }
+
+ if *req.method() == Method::HEAD {
+ Ok(resp.finish())
+ } else {
+ let reader = ChunkedReadFile {
+ offset,
+ size: length,
+ file: Some(self.file),
+ fut: None,
+ counter: 0,
+ };
+ if offset != 0 || length != self.md.len() {
+ return Ok(resp.status(StatusCode::PARTIAL_CONTENT).streaming(reader));
+ };
+ Ok(resp.streaming(reader))
+ }
+ }
+}
diff --git a/actix-files/src/range.rs b/actix-files/src/range.rs
new file mode 100644
index 000000000..d97a35e7e
--- /dev/null
+++ b/actix-files/src/range.rs
@@ -0,0 +1,375 @@
+/// HTTP Range header representation.
+#[derive(Debug, Clone, Copy)]
+pub struct HttpRange {
+ pub start: u64,
+ pub length: u64,
+}
+
+static PREFIX: &'static str = "bytes=";
+const PREFIX_LEN: usize = 6;
+
+impl HttpRange {
+ /// Parses Range HTTP header string as per RFC 2616.
+ ///
+ /// `header` is HTTP Range header (e.g. `bytes=bytes=0-9`).
+ /// `size` is full size of response (file).
+ pub fn parse(header: &str, size: u64) -> Result, ()> {
+ if header.is_empty() {
+ return Ok(Vec::new());
+ }
+ if !header.starts_with(PREFIX) {
+ return Err(());
+ }
+
+ let size_sig = size as i64;
+ let mut no_overlap = false;
+
+ let all_ranges: Vec> = header[PREFIX_LEN..]
+ .split(',')
+ .map(|x| x.trim())
+ .filter(|x| !x.is_empty())
+ .map(|ra| {
+ let mut start_end_iter = ra.split('-');
+
+ let start_str = start_end_iter.next().ok_or(())?.trim();
+ let end_str = start_end_iter.next().ok_or(())?.trim();
+
+ if start_str.is_empty() {
+ // If no start is specified, end specifies the
+ // range start relative to the end of the file.
+ let mut length: i64 = end_str.parse().map_err(|_| ())?;
+
+ if length > size_sig {
+ length = size_sig;
+ }
+
+ Ok(Some(HttpRange {
+ start: (size_sig - length) as u64,
+ length: length as u64,
+ }))
+ } else {
+ let start: i64 = start_str.parse().map_err(|_| ())?;
+
+ if start < 0 {
+ return Err(());
+ }
+ if start >= size_sig {
+ no_overlap = true;
+ return Ok(None);
+ }
+
+ let length = if end_str.is_empty() {
+ // If no end is specified, range extends to end of the file.
+ size_sig - start
+ } else {
+ let mut end: i64 = end_str.parse().map_err(|_| ())?;
+
+ if start > end {
+ return Err(());
+ }
+
+ if end >= size_sig {
+ end = size_sig - 1;
+ }
+
+ end - start + 1
+ };
+
+ Ok(Some(HttpRange {
+ start: start as u64,
+ length: length as u64,
+ }))
+ }
+ })
+ .collect::>()?;
+
+ let ranges: Vec = all_ranges.into_iter().filter_map(|x| x).collect();
+
+ if no_overlap && ranges.is_empty() {
+ return Err(());
+ }
+
+ Ok(ranges)
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ struct T(&'static str, u64, Vec);
+
+ #[test]
+ fn test_parse() {
+ let tests = vec![
+ T("", 0, vec![]),
+ T("", 1000, vec![]),
+ T("foo", 0, vec![]),
+ T("bytes=", 0, vec![]),
+ T("bytes=7", 10, vec![]),
+ T("bytes= 7 ", 10, vec![]),
+ T("bytes=1-", 0, vec![]),
+ T("bytes=5-4", 10, vec![]),
+ T("bytes=0-2,5-4", 10, vec![]),
+ T("bytes=2-5,4-3", 10, vec![]),
+ T("bytes=--5,4--3", 10, vec![]),
+ T("bytes=A-", 10, vec![]),
+ T("bytes=A- ", 10, vec![]),
+ T("bytes=A-Z", 10, vec![]),
+ T("bytes= -Z", 10, vec![]),
+ T("bytes=5-Z", 10, vec![]),
+ T("bytes=Ran-dom, garbage", 10, vec![]),
+ T("bytes=0x01-0x02", 10, vec![]),
+ T("bytes= ", 10, vec![]),
+ T("bytes= , , , ", 10, vec![]),
+ T(
+ "bytes=0-9",
+ 10,
+ vec![HttpRange {
+ start: 0,
+ length: 10,
+ }],
+ ),
+ T(
+ "bytes=0-",
+ 10,
+ vec![HttpRange {
+ start: 0,
+ length: 10,
+ }],
+ ),
+ T(
+ "bytes=5-",
+ 10,
+ vec![HttpRange {
+ start: 5,
+ length: 5,
+ }],
+ ),
+ T(
+ "bytes=0-20",
+ 10,
+ vec![HttpRange {
+ start: 0,
+ length: 10,
+ }],
+ ),
+ T(
+ "bytes=15-,0-5",
+ 10,
+ vec![HttpRange {
+ start: 0,
+ length: 6,
+ }],
+ ),
+ T(
+ "bytes=1-2,5-",
+ 10,
+ vec![
+ HttpRange {
+ start: 1,
+ length: 2,
+ },
+ HttpRange {
+ start: 5,
+ length: 5,
+ },
+ ],
+ ),
+ T(
+ "bytes=-2 , 7-",
+ 11,
+ vec![
+ HttpRange {
+ start: 9,
+ length: 2,
+ },
+ HttpRange {
+ start: 7,
+ length: 4,
+ },
+ ],
+ ),
+ T(
+ "bytes=0-0 ,2-2, 7-",
+ 11,
+ vec![
+ HttpRange {
+ start: 0,
+ length: 1,
+ },
+ HttpRange {
+ start: 2,
+ length: 1,
+ },
+ HttpRange {
+ start: 7,
+ length: 4,
+ },
+ ],
+ ),
+ T(
+ "bytes=-5",
+ 10,
+ vec![HttpRange {
+ start: 5,
+ length: 5,
+ }],
+ ),
+ T(
+ "bytes=-15",
+ 10,
+ vec![HttpRange {
+ start: 0,
+ length: 10,
+ }],
+ ),
+ T(
+ "bytes=0-499",
+ 10000,
+ vec![HttpRange {
+ start: 0,
+ length: 500,
+ }],
+ ),
+ T(
+ "bytes=500-999",
+ 10000,
+ vec![HttpRange {
+ start: 500,
+ length: 500,
+ }],
+ ),
+ T(
+ "bytes=-500",
+ 10000,
+ vec![HttpRange {
+ start: 9500,
+ length: 500,
+ }],
+ ),
+ T(
+ "bytes=9500-",
+ 10000,
+ vec![HttpRange {
+ start: 9500,
+ length: 500,
+ }],
+ ),
+ T(
+ "bytes=0-0,-1",
+ 10000,
+ vec![
+ HttpRange {
+ start: 0,
+ length: 1,
+ },
+ HttpRange {
+ start: 9999,
+ length: 1,
+ },
+ ],
+ ),
+ T(
+ "bytes=500-600,601-999",
+ 10000,
+ vec![
+ HttpRange {
+ start: 500,
+ length: 101,
+ },
+ HttpRange {
+ start: 601,
+ length: 399,
+ },
+ ],
+ ),
+ T(
+ "bytes=500-700,601-999",
+ 10000,
+ vec![
+ HttpRange {
+ start: 500,
+ length: 201,
+ },
+ HttpRange {
+ start: 601,
+ length: 399,
+ },
+ ],
+ ),
+ // Match Apache laxity:
+ T(
+ "bytes= 1 -2 , 4- 5, 7 - 8 , ,,",
+ 11,
+ vec![
+ HttpRange {
+ start: 1,
+ length: 2,
+ },
+ HttpRange {
+ start: 4,
+ length: 2,
+ },
+ HttpRange {
+ start: 7,
+ length: 2,
+ },
+ ],
+ ),
+ ];
+
+ for t in tests {
+ let header = t.0;
+ let size = t.1;
+ let expected = t.2;
+
+ let res = HttpRange::parse(header, size);
+
+ if res.is_err() {
+ if expected.is_empty() {
+ continue;
+ } else {
+ assert!(
+ false,
+ "parse({}, {}) returned error {:?}",
+ header,
+ size,
+ res.unwrap_err()
+ );
+ }
+ }
+
+ let got = res.unwrap();
+
+ if got.len() != expected.len() {
+ assert!(
+ false,
+ "len(parseRange({}, {})) = {}, want {}",
+ header,
+ size,
+ got.len(),
+ expected.len()
+ );
+ continue;
+ }
+
+ for i in 0..expected.len() {
+ if got[i].start != expected[i].start {
+ assert!(
+ false,
+ "parseRange({}, {})[{}].start = {}, want {}",
+ header, size, i, got[i].start, expected[i].start
+ )
+ }
+ if got[i].length != expected[i].length {
+ assert!(
+ false,
+ "parseRange({}, {})[{}].length = {}, want {}",
+ header, size, i, got[i].length, expected[i].length
+ )
+ }
+ }
+ }
+ }
+}
diff --git a/tests/test space.binary b/actix-files/tests/test space.binary
similarity index 100%
rename from tests/test space.binary
rename to actix-files/tests/test space.binary
diff --git a/tests/test.binary b/actix-files/tests/test.binary
similarity index 100%
rename from tests/test.binary
rename to actix-files/tests/test.binary
diff --git a/tests/test.png b/actix-files/tests/test.png
similarity index 100%
rename from tests/test.png
rename to actix-files/tests/test.png
diff --git a/actix-http/.appveyor.yml b/actix-http/.appveyor.yml
new file mode 100644
index 000000000..780fdd6b5
--- /dev/null
+++ b/actix-http/.appveyor.yml
@@ -0,0 +1,41 @@
+environment:
+ global:
+ PROJECT_NAME: actix-http
+ matrix:
+ # Stable channel
+ - TARGET: i686-pc-windows-msvc
+ CHANNEL: stable
+ - TARGET: x86_64-pc-windows-gnu
+ CHANNEL: stable
+ - TARGET: x86_64-pc-windows-msvc
+ CHANNEL: stable
+ # Nightly channel
+ - TARGET: i686-pc-windows-msvc
+ CHANNEL: nightly
+ - TARGET: x86_64-pc-windows-gnu
+ CHANNEL: nightly
+ - TARGET: x86_64-pc-windows-msvc
+ CHANNEL: nightly
+
+# Install Rust and Cargo
+# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml)
+install:
+ - ps: >-
+ If ($Env:TARGET -eq 'x86_64-pc-windows-gnu') {
+ $Env:PATH += ';C:\msys64\mingw64\bin'
+ } ElseIf ($Env:TARGET -eq 'i686-pc-windows-gnu') {
+ $Env:PATH += ';C:\MinGW\bin'
+ }
+ - curl -sSf -o rustup-init.exe https://win.rustup.rs
+ - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y
+ - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+ - rustc -Vv
+ - cargo -V
+
+# 'cargo test' takes care of building for us, so disable Appveyor's build stage.
+build: false
+
+# Equivalent to Travis' `script` phase
+test_script:
+ - cargo clean
+ - cargo test
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
new file mode 100644
index 000000000..e5a162310
--- /dev/null
+++ b/actix-http/CHANGES.md
@@ -0,0 +1,27 @@
+# Changes
+
+## [0.1.0-alpha.3] - 2019-04-xx
+
+### Fixed
+
+* Rust 1.31.0 compatibility
+
+* Preallocate read buffer for h1 codec
+
+* Detect socket disconnection during protocol selection
+
+
+## [0.1.0-alpha.2] - 2019-03-29
+
+### Added
+
+* Added ws::Message::Nop, no-op websockets message
+
+### Changed
+
+* Do not use thread pool for decomression if chunk size is smaller than 2048.
+
+
+## [0.1.0-alpha.1] - 2019-03-28
+
+* Initial impl
diff --git a/actix-http/CODE_OF_CONDUCT.md b/actix-http/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..599b28c0d
--- /dev/null
+++ b/actix-http/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at fafhrd91@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
new file mode 100644
index 000000000..2de624b7c
--- /dev/null
+++ b/actix-http/Cargo.toml
@@ -0,0 +1,107 @@
+[package]
+name = "actix-http"
+version = "0.1.0-alpha.2"
+authors = ["Nikolay Kim "]
+description = "Actix http primitives"
+readme = "README.md"
+keywords = ["actix", "http", "framework", "async", "futures"]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-http.git"
+documentation = "https://docs.rs/actix-http/"
+categories = ["network-programming", "asynchronous",
+ "web-programming::http-server",
+ "web-programming::websocket"]
+license = "MIT/Apache-2.0"
+edition = "2018"
+workspace = ".."
+
+[package.metadata.docs.rs]
+features = ["ssl", "fail", "brotli", "flate2-zlib", "secure-cookies"]
+
+[badges]
+travis-ci = { repository = "actix/actix-web", branch = "master" }
+codecov = { repository = "actix/actix-web", branch = "master", service = "github" }
+
+[lib]
+name = "actix_http"
+path = "src/lib.rs"
+
+[features]
+default = []
+
+# openssl
+ssl = ["openssl", "actix-connect/ssl"]
+
+# brotli encoding, requires c compiler
+brotli = ["brotli2"]
+
+# miniz-sys backend for flate2 crate
+flate2-zlib = ["flate2/miniz-sys"]
+
+# rust backend for flate2 crate
+flate2-rust = ["flate2/rust_backend"]
+
+# failure integration. actix does not use failure anymore
+fail = ["failure"]
+
+# support for secure cookies
+secure-cookies = ["ring"]
+
+[dependencies]
+actix-service = "0.3.4"
+actix-codec = "0.1.2"
+actix-connect = "0.1.0"
+actix-utils = "0.3.4"
+actix-server-config = "0.1.0"
+actix-threadpool = "0.1.0"
+
+base64 = "0.10"
+bitflags = "1.0"
+bytes = "0.4"
+byteorder = "1.2"
+derive_more = "0.14"
+encoding = "0.2"
+futures = "0.1"
+hashbrown = "0.1.8"
+h2 = "0.1.16"
+http = "0.1.16"
+httparse = "1.3"
+indexmap = "1.0"
+lazy_static = "1.0"
+language-tags = "0.2"
+log = "0.4"
+mime = "0.3"
+percent-encoding = "1.0"
+rand = "0.6"
+regex = "1.0"
+serde = "1.0"
+serde_json = "1.0"
+sha1 = "0.6"
+slab = "0.4"
+serde_urlencoded = "0.5.3"
+time = "0.1"
+tokio-tcp = "0.1.3"
+tokio-timer = "0.2"
+tokio-current-thread = "0.1"
+trust-dns-resolver = { version="0.11.0-alpha.2", default-features = false }
+
+# for secure cookie
+ring = { version = "0.14.6", optional = true }
+
+# compression
+brotli2 = { version="^0.3.2", optional = true }
+flate2 = { version="^1.0.2", optional = true, default-features = false }
+
+# optional deps
+failure = { version = "0.1.5", optional = true }
+openssl = { version="0.10", optional = true }
+
+[dev-dependencies]
+actix-rt = "0.2.2"
+actix-server = { version = "0.4.1", features=["ssl"] }
+actix-connect = { version = "0.1.0", features=["ssl"] }
+actix-http-test = { version = "0.1.0-alpha.2", features=["ssl"] }
+env_logger = "0.6"
+serde_derive = "1.0"
+openssl = { version="0.10" }
+tokio-tcp = "0.1"
diff --git a/actix-http/LICENSE-APACHE b/actix-http/LICENSE-APACHE
new file mode 100644
index 000000000..6cdf2d16c
--- /dev/null
+++ b/actix-http/LICENSE-APACHE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2017-NOW Nikolay Kim
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/actix-http/LICENSE-MIT b/actix-http/LICENSE-MIT
new file mode 100644
index 000000000..0f80296ae
--- /dev/null
+++ b/actix-http/LICENSE-MIT
@@ -0,0 +1,25 @@
+Copyright (c) 2017 Nikolay Kim
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/actix-http/README.md b/actix-http/README.md
new file mode 100644
index 000000000..467e67a9d
--- /dev/null
+++ b/actix-http/README.md
@@ -0,0 +1,46 @@
+# Actix http [](https://travis-ci.org/actix/actix-http) [](https://codecov.io/gh/actix/actix-http) [](https://crates.io/crates/actix-web) [](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+Actix http
+
+## Documentation & community resources
+
+* [User Guide](https://actix.rs/docs/)
+* [API Documentation](https://docs.rs/actix-http/)
+* [Chat on gitter](https://gitter.im/actix/actix)
+* Cargo package: [actix-http](https://crates.io/crates/actix-http)
+* Minimum supported Rust version: 1.26 or later
+
+## Example
+
+```rust
+// see examples/framed_hello.rs for complete list of used crates.
+extern crate actix_http;
+use actix_http::{h1, Response, ServiceConfig};
+
+fn main() {
+ Server::new().bind("framed_hello", "127.0.0.1:8080", || {
+ IntoFramed::new(|| h1::Codec::new(ServiceConfig::default())) // <- create h1 codec
+ .and_then(TakeItem::new().map_err(|_| ())) // <- read one request
+ .and_then(|(_req, _framed): (_, Framed<_, _>)| { // <- send response and close conn
+ SendResponse::send(_framed, Response::Ok().body("Hello world!"))
+ .map_err(|_| ())
+ .map(|_| ())
+ })
+ }).unwrap().run();
+}
+```
+
+## License
+
+This project is licensed under either of
+
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0))
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT))
+
+at your option.
+
+## Code of Conduct
+
+Contribution to the actix-http crate is organized under the terms of the
+Contributor Covenant, the maintainer of actix-http, @fafhrd91, promises to
+intervene to uphold that code of conduct.
diff --git a/actix-http/examples/echo.rs b/actix-http/examples/echo.rs
new file mode 100644
index 000000000..c36292c44
--- /dev/null
+++ b/actix-http/examples/echo.rs
@@ -0,0 +1,37 @@
+use std::{env, io};
+
+use actix_http::{error::PayloadError, HttpService, Request, Response};
+use actix_server::Server;
+use bytes::BytesMut;
+use futures::{Future, Stream};
+use http::header::HeaderValue;
+use log::info;
+
+fn main() -> io::Result<()> {
+ env::set_var("RUST_LOG", "echo=info");
+ env_logger::init();
+
+ Server::build()
+ .bind("echo", "127.0.0.1:8080", || {
+ HttpService::build()
+ .client_timeout(1000)
+ .client_disconnect(1000)
+ .finish(|mut req: Request| {
+ req.take_payload()
+ .fold(BytesMut::new(), move |mut body, chunk| {
+ body.extend_from_slice(&chunk);
+ Ok::<_, PayloadError>(body)
+ })
+ .and_then(|bytes| {
+ info!("request body: {:?}", bytes);
+ let mut res = Response::Ok();
+ res.header(
+ "x-head",
+ HeaderValue::from_static("dummy value!"),
+ );
+ Ok(res.body(bytes))
+ })
+ })
+ })?
+ .run()
+}
diff --git a/actix-http/examples/echo2.rs b/actix-http/examples/echo2.rs
new file mode 100644
index 000000000..b239796b4
--- /dev/null
+++ b/actix-http/examples/echo2.rs
@@ -0,0 +1,34 @@
+use std::{env, io};
+
+use actix_http::http::HeaderValue;
+use actix_http::{error::PayloadError, Error, HttpService, Request, Response};
+use actix_server::Server;
+use bytes::BytesMut;
+use futures::{Future, Stream};
+use log::info;
+
+fn handle_request(mut req: Request) -> impl Future- {
+ req.take_payload()
+ .fold(BytesMut::new(), move |mut body, chunk| {
+ body.extend_from_slice(&chunk);
+ Ok::<_, PayloadError>(body)
+ })
+ .from_err()
+ .and_then(|bytes| {
+ info!("request body: {:?}", bytes);
+ let mut res = Response::Ok();
+ res.header("x-head", HeaderValue::from_static("dummy value!"));
+ Ok(res.body(bytes))
+ })
+}
+
+fn main() -> io::Result<()> {
+ env::set_var("RUST_LOG", "echo=info");
+ env_logger::init();
+
+ Server::build()
+ .bind("echo", "127.0.0.1:8080", || {
+ HttpService::build().finish(|_req: Request| handle_request(_req))
+ })?
+ .run()
+}
diff --git a/actix-http/examples/framed_hello.rs b/actix-http/examples/framed_hello.rs
new file mode 100644
index 000000000..7d4c13d34
--- /dev/null
+++ b/actix-http/examples/framed_hello.rs
@@ -0,0 +1,28 @@
+use std::{env, io};
+
+use actix_codec::Framed;
+use actix_http::{h1, Response, SendResponse, ServiceConfig};
+use actix_server::{Io, Server};
+use actix_service::{fn_service, NewService};
+use actix_utils::framed::IntoFramed;
+use actix_utils::stream::TakeItem;
+use futures::Future;
+use tokio_tcp::TcpStream;
+
+fn main() -> io::Result<()> {
+ env::set_var("RUST_LOG", "framed_hello=info");
+ env_logger::init();
+
+ Server::build()
+ .bind("framed_hello", "127.0.0.1:8080", || {
+ fn_service(|io: Io| Ok(io.into_parts().0))
+ .and_then(IntoFramed::new(|| h1::Codec::new(ServiceConfig::default())))
+ .and_then(TakeItem::new().map_err(|_| ()))
+ .and_then(|(_req, _framed): (_, Framed<_, _>)| {
+ SendResponse::send(_framed, Response::Ok().body("Hello world!"))
+ .map_err(|_| ())
+ .map(|_| ())
+ })
+ })?
+ .run()
+}
diff --git a/actix-http/examples/hello-world.rs b/actix-http/examples/hello-world.rs
new file mode 100644
index 000000000..6e3820390
--- /dev/null
+++ b/actix-http/examples/hello-world.rs
@@ -0,0 +1,26 @@
+use std::{env, io};
+
+use actix_http::{HttpService, Response};
+use actix_server::Server;
+use futures::future;
+use http::header::HeaderValue;
+use log::info;
+
+fn main() -> io::Result<()> {
+ env::set_var("RUST_LOG", "hello_world=info");
+ env_logger::init();
+
+ Server::build()
+ .bind("hello-world", "127.0.0.1:8080", || {
+ HttpService::build()
+ .client_timeout(1000)
+ .client_disconnect(1000)
+ .finish(|_req| {
+ info!("{:?}", _req);
+ let mut res = Response::Ok();
+ res.header("x-head", HeaderValue::from_static("dummy value!"));
+ future::ok::<_, ()>(res.body("Hello world!"))
+ })
+ })?
+ .run()
+}
diff --git a/actix-http/rustfmt.toml b/actix-http/rustfmt.toml
new file mode 100644
index 000000000..5fcaaca0f
--- /dev/null
+++ b/actix-http/rustfmt.toml
@@ -0,0 +1,5 @@
+max_width = 89
+reorder_imports = true
+#wrap_comments = true
+#fn_args_density = "Compressed"
+#use_small_heuristics = false
diff --git a/actix-http/src/body.rs b/actix-http/src/body.rs
new file mode 100644
index 000000000..85717ba85
--- /dev/null
+++ b/actix-http/src/body.rs
@@ -0,0 +1,462 @@
+use std::marker::PhantomData;
+use std::{fmt, mem};
+
+use bytes::{Bytes, BytesMut};
+use futures::{Async, Poll, Stream};
+
+use crate::error::Error;
+
+#[derive(Debug, PartialEq, Copy, Clone)]
+/// Body size hint
+pub enum BodySize {
+ None,
+ Empty,
+ Sized(usize),
+ Sized64(u64),
+ Stream,
+}
+
+impl BodySize {
+ pub fn is_eof(&self) -> bool {
+ match self {
+ BodySize::None
+ | BodySize::Empty
+ | BodySize::Sized(0)
+ | BodySize::Sized64(0) => true,
+ _ => false,
+ }
+ }
+}
+
+/// Type that provides this trait can be streamed to a peer.
+pub trait MessageBody {
+ fn length(&self) -> BodySize;
+
+ fn poll_next(&mut self) -> Poll, Error>;
+}
+
+impl MessageBody for () {
+ fn length(&self) -> BodySize {
+ BodySize::Empty
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ Ok(Async::Ready(None))
+ }
+}
+
+impl MessageBody for Box {
+ fn length(&self) -> BodySize {
+ self.as_ref().length()
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ self.as_mut().poll_next()
+ }
+}
+
+pub enum ResponseBody {
+ Body(B),
+ Other(Body),
+}
+
+impl ResponseBody {
+ pub fn into_body(self) -> ResponseBody {
+ match self {
+ ResponseBody::Body(b) => ResponseBody::Other(b),
+ ResponseBody::Other(b) => ResponseBody::Other(b),
+ }
+ }
+}
+
+impl ResponseBody {
+ pub fn take_body(&mut self) -> ResponseBody {
+ std::mem::replace(self, ResponseBody::Other(Body::None))
+ }
+}
+
+impl ResponseBody {
+ pub fn as_ref(&self) -> Option<&B> {
+ if let ResponseBody::Body(ref b) = self {
+ Some(b)
+ } else {
+ None
+ }
+ }
+}
+
+impl MessageBody for ResponseBody {
+ fn length(&self) -> BodySize {
+ match self {
+ ResponseBody::Body(ref body) => body.length(),
+ ResponseBody::Other(ref body) => body.length(),
+ }
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ match self {
+ ResponseBody::Body(ref mut body) => body.poll_next(),
+ ResponseBody::Other(ref mut body) => body.poll_next(),
+ }
+ }
+}
+
+impl Stream for ResponseBody {
+ type Item = Bytes;
+ type Error = Error;
+
+ fn poll(&mut self) -> Poll, Self::Error> {
+ self.poll_next()
+ }
+}
+
+/// Represents various types of http message body.
+pub enum Body {
+ /// Empty response. `Content-Length` header is not set.
+ None,
+ /// Zero sized response body. `Content-Length` header is set to `0`.
+ Empty,
+ /// Specific response body.
+ Bytes(Bytes),
+ /// Generic message body.
+ Message(Box),
+}
+
+impl Body {
+ /// Create body from slice (copy)
+ pub fn from_slice(s: &[u8]) -> Body {
+ Body::Bytes(Bytes::from(s))
+ }
+
+ /// Create body from generic message body.
+ pub fn from_message(body: B) -> Body {
+ Body::Message(Box::new(body))
+ }
+}
+
+impl MessageBody for Body {
+ fn length(&self) -> BodySize {
+ match self {
+ Body::None => BodySize::None,
+ Body::Empty => BodySize::Empty,
+ Body::Bytes(ref bin) => BodySize::Sized(bin.len()),
+ Body::Message(ref body) => body.length(),
+ }
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ match self {
+ Body::None => Ok(Async::Ready(None)),
+ Body::Empty => Ok(Async::Ready(None)),
+ Body::Bytes(ref mut bin) => {
+ let len = bin.len();
+ if len == 0 {
+ Ok(Async::Ready(None))
+ } else {
+ Ok(Async::Ready(Some(bin.split_to(len))))
+ }
+ }
+ Body::Message(ref mut body) => body.poll_next(),
+ }
+ }
+}
+
+impl PartialEq for Body {
+ fn eq(&self, other: &Body) -> bool {
+ match *self {
+ Body::None => match *other {
+ Body::None => true,
+ _ => false,
+ },
+ Body::Empty => match *other {
+ Body::Empty => true,
+ _ => false,
+ },
+ Body::Bytes(ref b) => match *other {
+ Body::Bytes(ref b2) => b == b2,
+ _ => false,
+ },
+ Body::Message(_) => false,
+ }
+ }
+}
+
+impl fmt::Debug for Body {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ match *self {
+ Body::None => write!(f, "Body::None"),
+ Body::Empty => write!(f, "Body::Zero"),
+ Body::Bytes(ref b) => write!(f, "Body::Bytes({:?})", b),
+ Body::Message(_) => write!(f, "Body::Message(_)"),
+ }
+ }
+}
+
+impl From<&'static str> for Body {
+ fn from(s: &'static str) -> Body {
+ Body::Bytes(Bytes::from_static(s.as_ref()))
+ }
+}
+
+impl From<&'static [u8]> for Body {
+ fn from(s: &'static [u8]) -> Body {
+ Body::Bytes(Bytes::from_static(s))
+ }
+}
+
+impl From> for Body {
+ fn from(vec: Vec) -> Body {
+ Body::Bytes(Bytes::from(vec))
+ }
+}
+
+impl From for Body {
+ fn from(s: String) -> Body {
+ s.into_bytes().into()
+ }
+}
+
+impl<'a> From<&'a String> for Body {
+ fn from(s: &'a String) -> Body {
+ Body::Bytes(Bytes::from(AsRef::<[u8]>::as_ref(&s)))
+ }
+}
+
+impl From for Body {
+ fn from(s: Bytes) -> Body {
+ Body::Bytes(s)
+ }
+}
+
+impl From for Body {
+ fn from(s: BytesMut) -> Body {
+ Body::Bytes(s.freeze())
+ }
+}
+
+impl MessageBody for Bytes {
+ fn length(&self) -> BodySize {
+ BodySize::Sized(self.len())
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ if self.is_empty() {
+ Ok(Async::Ready(None))
+ } else {
+ Ok(Async::Ready(Some(mem::replace(self, Bytes::new()))))
+ }
+ }
+}
+
+impl MessageBody for BytesMut {
+ fn length(&self) -> BodySize {
+ BodySize::Sized(self.len())
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ if self.is_empty() {
+ Ok(Async::Ready(None))
+ } else {
+ Ok(Async::Ready(Some(
+ mem::replace(self, BytesMut::new()).freeze(),
+ )))
+ }
+ }
+}
+
+impl MessageBody for &'static str {
+ fn length(&self) -> BodySize {
+ BodySize::Sized(self.len())
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ if self.is_empty() {
+ Ok(Async::Ready(None))
+ } else {
+ Ok(Async::Ready(Some(Bytes::from_static(
+ mem::replace(self, "").as_ref(),
+ ))))
+ }
+ }
+}
+
+impl MessageBody for &'static [u8] {
+ fn length(&self) -> BodySize {
+ BodySize::Sized(self.len())
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ if self.is_empty() {
+ Ok(Async::Ready(None))
+ } else {
+ Ok(Async::Ready(Some(Bytes::from_static(mem::replace(
+ self, b"",
+ )))))
+ }
+ }
+}
+
+impl MessageBody for Vec {
+ fn length(&self) -> BodySize {
+ BodySize::Sized(self.len())
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ if self.is_empty() {
+ Ok(Async::Ready(None))
+ } else {
+ Ok(Async::Ready(Some(Bytes::from(mem::replace(
+ self,
+ Vec::new(),
+ )))))
+ }
+ }
+}
+
+impl MessageBody for String {
+ fn length(&self) -> BodySize {
+ BodySize::Sized(self.len())
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ if self.is_empty() {
+ Ok(Async::Ready(None))
+ } else {
+ Ok(Async::Ready(Some(Bytes::from(
+ mem::replace(self, String::new()).into_bytes(),
+ ))))
+ }
+ }
+}
+
+/// Type represent streaming body.
+/// Response does not contain `content-length` header and appropriate transfer encoding is used.
+pub struct BodyStream {
+ stream: S,
+ _t: PhantomData,
+}
+
+impl BodyStream
+where
+ S: Stream
- ,
+ E: Into,
+{
+ pub fn new(stream: S) -> Self {
+ BodyStream {
+ stream,
+ _t: PhantomData,
+ }
+ }
+}
+
+impl MessageBody for BodyStream
+where
+ S: Stream
- ,
+ E: Into,
+{
+ fn length(&self) -> BodySize {
+ BodySize::Stream
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ self.stream.poll().map_err(|e| e.into())
+ }
+}
+
+/// Type represent streaming body. This body implementation should be used
+/// if total size of stream is known. Data get sent as is without using transfer encoding.
+pub struct SizedStream
{
+ size: usize,
+ stream: S,
+}
+
+impl SizedStream
+where
+ S: Stream- ,
+{
+ pub fn new(size: usize, stream: S) -> Self {
+ SizedStream { size, stream }
+ }
+}
+
+impl
MessageBody for SizedStream
+where
+ S: Stream- ,
+{
+ fn length(&self) -> BodySize {
+ BodySize::Sized(self.size)
+ }
+
+ fn poll_next(&mut self) -> Poll, Error> {
+ self.stream.poll()
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ impl Body {
+ pub(crate) fn get_ref(&self) -> &[u8] {
+ match *self {
+ Body::Bytes(ref bin) => &bin,
+ _ => panic!(),
+ }
+ }
+ }
+
+ impl ResponseBody {
+ pub(crate) fn get_ref(&self) -> &[u8] {
+ match *self {
+ ResponseBody::Body(ref b) => b.get_ref(),
+ ResponseBody::Other(ref b) => b.get_ref(),
+ }
+ }
+ }
+
+ #[test]
+ fn test_static_str() {
+ assert_eq!(Body::from("").length(), BodySize::Sized(0));
+ assert_eq!(Body::from("test").length(), BodySize::Sized(4));
+ assert_eq!(Body::from("test").get_ref(), b"test");
+ }
+
+ #[test]
+ fn test_static_bytes() {
+ assert_eq!(Body::from(b"test".as_ref()).length(), BodySize::Sized(4));
+ assert_eq!(Body::from(b"test".as_ref()).get_ref(), b"test");
+ assert_eq!(
+ Body::from_slice(b"test".as_ref()).length(),
+ BodySize::Sized(4)
+ );
+ assert_eq!(Body::from_slice(b"test".as_ref()).get_ref(), b"test");
+ }
+
+ #[test]
+ fn test_vec() {
+ assert_eq!(Body::from(Vec::from("test")).length(), BodySize::Sized(4));
+ assert_eq!(Body::from(Vec::from("test")).get_ref(), b"test");
+ }
+
+ #[test]
+ fn test_bytes() {
+ assert_eq!(Body::from(Bytes::from("test")).length(), BodySize::Sized(4));
+ assert_eq!(Body::from(Bytes::from("test")).get_ref(), b"test");
+ }
+
+ #[test]
+ fn test_string() {
+ let b = "test".to_owned();
+ assert_eq!(Body::from(b.clone()).length(), BodySize::Sized(4));
+ assert_eq!(Body::from(b.clone()).get_ref(), b"test");
+ assert_eq!(Body::from(&b).length(), BodySize::Sized(4));
+ assert_eq!(Body::from(&b).get_ref(), b"test");
+ }
+
+ #[test]
+ fn test_bytes_mut() {
+ let b = BytesMut::from("test");
+ assert_eq!(Body::from(b.clone()).length(), BodySize::Sized(4));
+ assert_eq!(Body::from(b).get_ref(), b"test");
+ }
+}
diff --git a/actix-http/src/builder.rs b/actix-http/src/builder.rs
new file mode 100644
index 000000000..2f7466a90
--- /dev/null
+++ b/actix-http/src/builder.rs
@@ -0,0 +1,141 @@
+use std::fmt::Debug;
+use std::marker::PhantomData;
+
+use actix_server_config::ServerConfig as SrvConfig;
+use actix_service::{IntoNewService, NewService};
+
+use crate::body::MessageBody;
+use crate::config::{KeepAlive, ServiceConfig};
+use crate::request::Request;
+use crate::response::Response;
+
+use crate::h1::H1Service;
+use crate::h2::H2Service;
+use crate::service::HttpService;
+
+/// A http service builder
+///
+/// This type can be used to construct an instance of `http service` through a
+/// builder-like pattern.
+pub struct HttpServiceBuilder {
+ keep_alive: KeepAlive,
+ client_timeout: u64,
+ client_disconnect: u64,
+ _t: PhantomData<(T, S)>,
+}
+
+impl HttpServiceBuilder
+where
+ S: NewService,
+ S::Error: Debug + 'static,
+ S::Service: 'static,
+{
+ /// Create instance of `ServiceConfigBuilder`
+ pub fn new() -> HttpServiceBuilder {
+ HttpServiceBuilder {
+ keep_alive: KeepAlive::Timeout(5),
+ client_timeout: 5000,
+ client_disconnect: 0,
+ _t: PhantomData,
+ }
+ }
+
+ /// Set server keep-alive setting.
+ ///
+ /// By default keep alive is set to a 5 seconds.
+ pub fn keep_alive>(mut self, val: U) -> Self {
+ self.keep_alive = val.into();
+ self
+ }
+
+ /// Set server client timeout in milliseconds for first request.
+ ///
+ /// Defines a timeout for reading client request header. If a client does not transmit
+ /// the entire set headers within this time, the request is terminated with
+ /// the 408 (Request Time-out) error.
+ ///
+ /// To disable timeout set value to 0.
+ ///
+ /// By default client timeout is set to 5000 milliseconds.
+ pub fn client_timeout(mut self, val: u64) -> Self {
+ self.client_timeout = val;
+ self
+ }
+
+ /// Set server connection disconnect timeout in milliseconds.
+ ///
+ /// Defines a timeout for disconnect connection. If a disconnect procedure does not complete
+ /// within this time, the request get dropped. This timeout affects secure connections.
+ ///
+ /// To disable timeout set value to 0.
+ ///
+ /// By default disconnect timeout is set to 0.
+ pub fn client_disconnect(mut self, val: u64) -> Self {
+ self.client_disconnect = val;
+ self
+ }
+
+ // #[cfg(feature = "ssl")]
+ // /// Configure alpn protocols for SslAcceptorBuilder.
+ // pub fn configure_openssl(
+ // builder: &mut openssl::ssl::SslAcceptorBuilder,
+ // ) -> io::Result<()> {
+ // let protos: &[u8] = b"\x02h2";
+ // builder.set_alpn_select_callback(|_, protos| {
+ // const H2: &[u8] = b"\x02h2";
+ // if protos.windows(3).any(|window| window == H2) {
+ // Ok(b"h2")
+ // } else {
+ // Err(openssl::ssl::AlpnError::NOACK)
+ // }
+ // });
+ // builder.set_alpn_protos(&protos)?;
+
+ // Ok(())
+ // }
+
+ /// Finish service configuration and create *http service* for HTTP/1 protocol.
+ pub fn h1(self, service: F) -> H1Service
+ where
+ B: MessageBody + 'static,
+ F: IntoNewService,
+ S::Response: Into>,
+ {
+ let cfg = ServiceConfig::new(
+ self.keep_alive,
+ self.client_timeout,
+ self.client_disconnect,
+ );
+ H1Service::with_config(cfg, service.into_new_service())
+ }
+
+ /// Finish service configuration and create *http service* for HTTP/2 protocol.
+ pub fn h2(self, service: F) -> H2Service
+ where
+ B: MessageBody + 'static,
+ F: IntoNewService,
+ S::Response: Into>,
+ {
+ let cfg = ServiceConfig::new(
+ self.keep_alive,
+ self.client_timeout,
+ self.client_disconnect,
+ );
+ H2Service::with_config(cfg, service.into_new_service())
+ }
+
+ /// Finish service configuration and create `HttpService` instance.
+ pub fn finish(self, service: F) -> HttpService
+ where
+ B: MessageBody + 'static,
+ F: IntoNewService,
+ S::Response: Into>,
+ {
+ let cfg = ServiceConfig::new(
+ self.keep_alive,
+ self.client_timeout,
+ self.client_disconnect,
+ );
+ HttpService::with_config(cfg, service.into_new_service())
+ }
+}
diff --git a/actix-http/src/client/connection.rs b/actix-http/src/client/connection.rs
new file mode 100644
index 000000000..4522dbbd3
--- /dev/null
+++ b/actix-http/src/client/connection.rs
@@ -0,0 +1,269 @@
+use std::{fmt, io, time};
+
+use actix_codec::{AsyncRead, AsyncWrite, Framed};
+use bytes::{Buf, Bytes};
+use futures::future::{err, Either, Future, FutureResult};
+use futures::Poll;
+use h2::client::SendRequest;
+
+use crate::body::MessageBody;
+use crate::h1::ClientCodec;
+use crate::message::{RequestHead, ResponseHead};
+use crate::payload::Payload;
+
+use super::error::SendRequestError;
+use super::pool::Acquired;
+use super::{h1proto, h2proto};
+
+pub(crate) enum ConnectionType {
+ H1(Io),
+ H2(SendRequest),
+}
+
+pub trait Connection {
+ type Io: AsyncRead + AsyncWrite;
+ type Future: Future
- ;
+
+ /// Send request and body
+ fn send_request(
+ self,
+ head: RequestHead,
+ body: B,
+ ) -> Self::Future;
+
+ type TunnelFuture: Future<
+ Item = (ResponseHead, Framed),
+ Error = SendRequestError,
+ >;
+
+ /// Send request, returns Response and Framed
+ fn open_tunnel(self, head: RequestHead) -> Self::TunnelFuture;
+}
+
+pub(crate) trait ConnectionLifetime: AsyncRead + AsyncWrite + 'static {
+ /// Close connection
+ fn close(&mut self);
+
+ /// Release connection to the connection pool
+ fn release(&mut self);
+}
+
+#[doc(hidden)]
+/// HTTP client connection
+pub struct IoConnection {
+ io: Option>,
+ created: time::Instant,
+ pool: Option>,
+}
+
+impl fmt::Debug for IoConnection
+where
+ T: fmt::Debug,
+{
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ match self.io {
+ Some(ConnectionType::H1(ref io)) => write!(f, "H1Connection({:?})", io),
+ Some(ConnectionType::H2(_)) => write!(f, "H2Connection"),
+ None => write!(f, "Connection(Empty)"),
+ }
+ }
+}
+
+impl IoConnection {
+ pub(crate) fn new(
+ io: ConnectionType,
+ created: time::Instant,
+ pool: Option>,
+ ) -> Self {
+ IoConnection {
+ pool,
+ created,
+ io: Some(io),
+ }
+ }
+
+ pub(crate) fn into_inner(self) -> (ConnectionType, time::Instant) {
+ (self.io.unwrap(), self.created)
+ }
+}
+
+impl Connection for IoConnection
+where
+ T: AsyncRead + AsyncWrite + 'static,
+{
+ type Io = T;
+ type Future = Box>;
+
+ fn send_request(
+ mut self,
+ head: RequestHead,
+ body: B,
+ ) -> Self::Future {
+ match self.io.take().unwrap() {
+ ConnectionType::H1(io) => Box::new(h1proto::send_request(
+ io,
+ head,
+ body,
+ self.created,
+ self.pool,
+ )),
+ ConnectionType::H2(io) => Box::new(h2proto::send_request(
+ io,
+ head,
+ body,
+ self.created,
+ self.pool,
+ )),
+ }
+ }
+
+ type TunnelFuture = Either<
+ Box<
+ Future<
+ Item = (ResponseHead, Framed),
+ Error = SendRequestError,
+ >,
+ >,
+ FutureResult<(ResponseHead, Framed), SendRequestError>,
+ >;
+
+ /// Send request, returns Response and Framed
+ fn open_tunnel(mut self, head: RequestHead) -> Self::TunnelFuture {
+ match self.io.take().unwrap() {
+ ConnectionType::H1(io) => {
+ Either::A(Box::new(h1proto::open_tunnel(io, head)))
+ }
+ ConnectionType::H2(io) => {
+ if let Some(mut pool) = self.pool.take() {
+ pool.release(IoConnection::new(
+ ConnectionType::H2(io),
+ self.created,
+ None,
+ ));
+ }
+ Either::B(err(SendRequestError::TunnelNotSupported))
+ }
+ }
+ }
+}
+
+#[allow(dead_code)]
+pub(crate) enum EitherConnection {
+ A(IoConnection),
+ B(IoConnection),
+}
+
+impl Connection for EitherConnection
+where
+ A: AsyncRead + AsyncWrite + 'static,
+ B: AsyncRead + AsyncWrite + 'static,
+{
+ type Io = EitherIo;
+ type Future = Box>;
+
+ fn send_request(
+ self,
+ head: RequestHead,
+ body: RB,
+ ) -> Self::Future {
+ match self {
+ EitherConnection::A(con) => con.send_request(head, body),
+ EitherConnection::B(con) => con.send_request(head, body),
+ }
+ }
+
+ type TunnelFuture = Box<
+ Future<
+ Item = (ResponseHead, Framed),
+ Error = SendRequestError,
+ >,
+ >;
+
+ /// Send request, returns Response and Framed
+ fn open_tunnel(self, head: RequestHead) -> Self::TunnelFuture {
+ match self {
+ EitherConnection::A(con) => Box::new(
+ con.open_tunnel(head)
+ .map(|(head, framed)| (head, framed.map_io(EitherIo::A))),
+ ),
+ EitherConnection::B(con) => Box::new(
+ con.open_tunnel(head)
+ .map(|(head, framed)| (head, framed.map_io(EitherIo::B))),
+ ),
+ }
+ }
+}
+
+pub enum EitherIo {
+ A(A),
+ B(B),
+}
+
+impl io::Read for EitherIo
+where
+ A: io::Read,
+ B: io::Read,
+{
+ fn read(&mut self, buf: &mut [u8]) -> io::Result {
+ match self {
+ EitherIo::A(ref mut val) => val.read(buf),
+ EitherIo::B(ref mut val) => val.read(buf),
+ }
+ }
+}
+
+impl AsyncRead for EitherIo
+where
+ A: AsyncRead,
+ B: AsyncRead,
+{
+ unsafe fn prepare_uninitialized_buffer(&self, buf: &mut [u8]) -> bool {
+ match self {
+ EitherIo::A(ref val) => val.prepare_uninitialized_buffer(buf),
+ EitherIo::B(ref val) => val.prepare_uninitialized_buffer(buf),
+ }
+ }
+}
+
+impl io::Write for EitherIo
+where
+ A: io::Write,
+ B: io::Write,
+{
+ fn write(&mut self, buf: &[u8]) -> io::Result {
+ match self {
+ EitherIo::A(ref mut val) => val.write(buf),
+ EitherIo::B(ref mut val) => val.write(buf),
+ }
+ }
+
+ fn flush(&mut self) -> io::Result<()> {
+ match self {
+ EitherIo::A(ref mut val) => val.flush(),
+ EitherIo::B(ref mut val) => val.flush(),
+ }
+ }
+}
+
+impl AsyncWrite for EitherIo
+where
+ A: AsyncWrite,
+ B: AsyncWrite,
+{
+ fn shutdown(&mut self) -> Poll<(), io::Error> {
+ match self {
+ EitherIo::A(ref mut val) => val.shutdown(),
+ EitherIo::B(ref mut val) => val.shutdown(),
+ }
+ }
+
+ fn write_buf(&mut self, buf: &mut U) -> Poll
+ where
+ Self: Sized,
+ {
+ match self {
+ EitherIo::A(ref mut val) => val.write_buf(buf),
+ EitherIo::B(ref mut val) => val.write_buf(buf),
+ }
+ }
+}
diff --git a/actix-http/src/client/connector.rs b/actix-http/src/client/connector.rs
new file mode 100644
index 000000000..804756ced
--- /dev/null
+++ b/actix-http/src/client/connector.rs
@@ -0,0 +1,442 @@
+use std::fmt;
+use std::marker::PhantomData;
+use std::time::Duration;
+
+use actix_codec::{AsyncRead, AsyncWrite};
+use actix_connect::{
+ default_connector, Connect as TcpConnect, Connection as TcpConnection,
+};
+use actix_service::{apply_fn, Service, ServiceExt};
+use actix_utils::timeout::{TimeoutError, TimeoutService};
+use http::Uri;
+use tokio_tcp::TcpStream;
+
+use super::connection::Connection;
+use super::error::ConnectError;
+use super::pool::{ConnectionPool, Protocol};
+
+#[cfg(feature = "ssl")]
+use openssl::ssl::SslConnector;
+
+#[cfg(not(feature = "ssl"))]
+type SslConnector = ();
+
+/// Http client connector builde instance.
+/// `Connector` type uses builder-like pattern for connector service construction.
+pub struct Connector {
+ connector: T,
+ timeout: Duration,
+ conn_lifetime: Duration,
+ conn_keep_alive: Duration,
+ disconnect_timeout: Duration,
+ limit: usize,
+ #[allow(dead_code)]
+ ssl: SslConnector,
+ _t: PhantomData,
+}
+
+impl Connector<(), ()> {
+ pub fn new() -> Connector<
+ impl Service<
+ Request = TcpConnect,
+ Response = TcpConnection,
+ Error = actix_connect::ConnectError,
+ > + Clone,
+ TcpStream,
+ > {
+ let ssl = {
+ #[cfg(feature = "ssl")]
+ {
+ use log::error;
+ use openssl::ssl::{SslConnector, SslMethod};
+
+ let mut ssl = SslConnector::builder(SslMethod::tls()).unwrap();
+ let _ = ssl
+ .set_alpn_protos(b"\x02h2\x08http/1.1")
+ .map_err(|e| error!("Can not set alpn protocol: {:?}", e));
+ ssl.build()
+ }
+ #[cfg(not(feature = "ssl"))]
+ {}
+ };
+
+ Connector {
+ ssl,
+ connector: default_connector(),
+ timeout: Duration::from_secs(1),
+ conn_lifetime: Duration::from_secs(75),
+ conn_keep_alive: Duration::from_secs(15),
+ disconnect_timeout: Duration::from_millis(3000),
+ limit: 100,
+ _t: PhantomData,
+ }
+ }
+}
+
+impl Connector {
+ /// Use custom connector.
+ pub fn connector(self, connector: T1) -> Connector
+ where
+ U1: AsyncRead + AsyncWrite + fmt::Debug,
+ T1: Service<
+ Request = TcpConnect,
+ Response = TcpConnection,
+ Error = actix_connect::ConnectError,
+ > + Clone,
+ {
+ Connector {
+ connector,
+ timeout: self.timeout,
+ conn_lifetime: self.conn_lifetime,
+ conn_keep_alive: self.conn_keep_alive,
+ disconnect_timeout: self.disconnect_timeout,
+ limit: self.limit,
+ ssl: self.ssl,
+ _t: PhantomData,
+ }
+ }
+}
+
+impl Connector
+where
+ U: AsyncRead + AsyncWrite + fmt::Debug + 'static,
+ T: Service<
+ Request = TcpConnect,
+ Response = TcpConnection,
+ Error = actix_connect::ConnectError,
+ > + Clone,
+{
+ /// Connection timeout, i.e. max time to connect to remote host including dns name resolution.
+ /// Set to 1 second by default.
+ pub fn timeout(mut self, timeout: Duration) -> Self {
+ self.timeout = timeout;
+ self
+ }
+
+ #[cfg(feature = "ssl")]
+ /// Use custom `SslConnector` instance.
+ pub fn ssl(mut self, connector: SslConnector) -> Self {
+ self.ssl = connector;
+ self
+ }
+
+ /// Set total number of simultaneous connections per type of scheme.
+ ///
+ /// If limit is 0, the connector has no limit.
+ /// The default limit size is 100.
+ pub fn limit(mut self, limit: usize) -> Self {
+ self.limit = limit;
+ self
+ }
+
+ /// Set keep-alive period for opened connection.
+ ///
+ /// Keep-alive period is the period between connection usage. If
+ /// the delay between repeated usages of the same connection
+ /// exceeds this period, the connection is closed.
+ /// Default keep-alive period is 15 seconds.
+ pub fn conn_keep_alive(mut self, dur: Duration) -> Self {
+ self.conn_keep_alive = dur;
+ self
+ }
+
+ /// Set max lifetime period for connection.
+ ///
+ /// Connection lifetime is max lifetime of any opened connection
+ /// until it is closed regardless of keep-alive period.
+ /// Default lifetime period is 75 seconds.
+ pub fn conn_lifetime(mut self, dur: Duration) -> Self {
+ self.conn_lifetime = dur;
+ self
+ }
+
+ /// Set server connection disconnect timeout in milliseconds.
+ ///
+ /// Defines a timeout for disconnect connection. If a disconnect procedure does not complete
+ /// within this time, the socket get dropped. This timeout affects only secure connections.
+ ///
+ /// To disable timeout set value to 0.
+ ///
+ /// By default disconnect timeout is set to 3000 milliseconds.
+ pub fn disconnect_timeout(mut self, dur: Duration) -> Self {
+ self.disconnect_timeout = dur;
+ self
+ }
+
+ /// Finish configuration process and create connector service.
+ pub fn service(
+ self,
+ ) -> impl Service + Clone
+ {
+ #[cfg(not(feature = "ssl"))]
+ {
+ let connector = TimeoutService::new(
+ self.timeout,
+ apply_fn(self.connector, |msg: Uri, srv| srv.call(msg.into()))
+ .map_err(ConnectError::from)
+ .map(|stream| (stream.into_parts().0, Protocol::Http1)),
+ )
+ .map_err(|e| match e {
+ TimeoutError::Service(e) => e,
+ TimeoutError::Timeout => ConnectError::Timeout,
+ });
+
+ connect_impl::InnerConnector {
+ tcp_pool: ConnectionPool::new(
+ connector,
+ self.conn_lifetime,
+ self.conn_keep_alive,
+ None,
+ self.limit,
+ ),
+ }
+ }
+ #[cfg(feature = "ssl")]
+ {
+ const H2: &[u8] = b"h2";
+ use actix_connect::ssl::OpensslConnector;
+
+ let ssl_service = TimeoutService::new(
+ self.timeout,
+ apply_fn(self.connector.clone(), |msg: Uri, srv| srv.call(msg.into()))
+ .map_err(ConnectError::from)
+ .and_then(
+ OpensslConnector::service(self.ssl)
+ .map_err(ConnectError::from)
+ .map(|stream| {
+ let sock = stream.into_parts().0;
+ let h2 = sock
+ .get_ref()
+ .ssl()
+ .selected_alpn_protocol()
+ .map(|protos| protos.windows(2).any(|w| w == H2))
+ .unwrap_or(false);
+ if h2 {
+ (sock, Protocol::Http2)
+ } else {
+ (sock, Protocol::Http1)
+ }
+ }),
+ ),
+ )
+ .map_err(|e| match e {
+ TimeoutError::Service(e) => e,
+ TimeoutError::Timeout => ConnectError::Timeout,
+ });
+
+ let tcp_service = TimeoutService::new(
+ self.timeout,
+ apply_fn(self.connector.clone(), |msg: Uri, srv| srv.call(msg.into()))
+ .map_err(ConnectError::from)
+ .map(|stream| (stream.into_parts().0, Protocol::Http1)),
+ )
+ .map_err(|e| match e {
+ TimeoutError::Service(e) => e,
+ TimeoutError::Timeout => ConnectError::Timeout,
+ });
+
+ connect_impl::InnerConnector {
+ tcp_pool: ConnectionPool::new(
+ tcp_service,
+ self.conn_lifetime,
+ self.conn_keep_alive,
+ None,
+ self.limit,
+ ),
+ ssl_pool: ConnectionPool::new(
+ ssl_service,
+ self.conn_lifetime,
+ self.conn_keep_alive,
+ Some(self.disconnect_timeout),
+ self.limit,
+ ),
+ }
+ }
+ }
+}
+
+#[cfg(not(feature = "ssl"))]
+mod connect_impl {
+ use futures::future::{err, Either, FutureResult};
+ use futures::Poll;
+
+ use super::*;
+ use crate::client::connection::IoConnection;
+
+ pub(crate) struct InnerConnector
+ where
+ Io: AsyncRead + AsyncWrite + 'static,
+ T: Service,
+ {
+ pub(crate) tcp_pool: ConnectionPool,
+ }
+
+ impl Clone for InnerConnector
+ where
+ Io: AsyncRead + AsyncWrite + 'static,
+ T: Service
+ + Clone,
+ {
+ fn clone(&self) -> Self {
+ InnerConnector {
+ tcp_pool: self.tcp_pool.clone(),
+ }
+ }
+ }
+
+ impl Service for InnerConnector
+ where
+ Io: AsyncRead + AsyncWrite + 'static,
+ T: Service,
+ {
+ type Request = Uri;
+ type Response = IoConnection;
+ type Error = ConnectError;
+ type Future = Either<
+ as Service>::Future,
+ FutureResult, ConnectError>,
+ >;
+
+ fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+ self.tcp_pool.poll_ready()
+ }
+
+ fn call(&mut self, req: Uri) -> Self::Future {
+ match req.scheme_str() {
+ Some("https") | Some("wss") => {
+ Either::B(err(ConnectError::SslIsNotSupported))
+ }
+ _ => Either::A(self.tcp_pool.call(req)),
+ }
+ }
+ }
+}
+
+#[cfg(feature = "ssl")]
+mod connect_impl {
+ use std::marker::PhantomData;
+
+ use futures::future::{Either, FutureResult};
+ use futures::{Async, Future, Poll};
+
+ use super::*;
+ use crate::client::connection::EitherConnection;
+
+ pub(crate) struct InnerConnector
+ where
+ Io1: AsyncRead + AsyncWrite + 'static,
+ Io2: AsyncRead + AsyncWrite + 'static,
+ T1: Service,
+ T2: Service,
+ {
+ pub(crate) tcp_pool: ConnectionPool,
+ pub(crate) ssl_pool: ConnectionPool,
+ }
+
+ impl Clone for InnerConnector
+ where
+ Io1: AsyncRead + AsyncWrite + 'static,
+ Io2: AsyncRead + AsyncWrite + 'static,
+ T1: Service
+ + Clone,
+ T2: Service
+ + Clone,
+ {
+ fn clone(&self) -> Self {
+ InnerConnector {
+ tcp_pool: self.tcp_pool.clone(),
+ ssl_pool: self.ssl_pool.clone(),
+ }
+ }
+ }
+
+ impl Service for InnerConnector
+ where
+ Io1: AsyncRead + AsyncWrite + 'static,
+ Io2: AsyncRead + AsyncWrite + 'static,
+ T1: Service,
+ T2: Service,
+ {
+ type Request = Uri;
+ type Response = EitherConnection;
+ type Error = ConnectError;
+ type Future = Either<
+ FutureResult,
+ Either<
+ InnerConnectorResponseA,
+ InnerConnectorResponseB,
+ >,
+ >;
+
+ fn poll_ready(&mut self) -> Poll<(), Self::Error> {
+ self.tcp_pool.poll_ready()
+ }
+
+ fn call(&mut self, req: Uri) -> Self::Future {
+ match req.scheme_str() {
+ Some("https") | Some("wss") => {
+ Either::B(Either::B(InnerConnectorResponseB {
+ fut: self.ssl_pool.call(req),
+ _t: PhantomData,
+ }))
+ }
+ _ => Either::B(Either::A(InnerConnectorResponseA {
+ fut: self.tcp_pool.call(req),
+ _t: PhantomData,
+ })),
+ }
+ }
+ }
+
+ pub(crate) struct InnerConnectorResponseA
+ where
+ Io1: AsyncRead + AsyncWrite + 'static,
+ T: Service,
+ {
+ fut: as Service>::Future,
+ _t: PhantomData,
+ }
+
+ impl Future for InnerConnectorResponseA
+ where
+ T: Service,
+ Io1: AsyncRead + AsyncWrite + 'static,
+ Io2: AsyncRead + AsyncWrite + 'static,
+ {
+ type Item = EitherConnection;
+ type Error = ConnectError;
+
+ fn poll(&mut self) -> Poll {
+ match self.fut.poll()? {
+ Async::NotReady => Ok(Async::NotReady),
+ Async::Ready(res) => Ok(Async::Ready(EitherConnection::A(res))),
+ }
+ }
+ }
+
+ pub(crate) struct InnerConnectorResponseB
+ where
+ Io2: AsyncRead + AsyncWrite + 'static,
+ T: Service,
+ {
+ fut: as Service>::Future,
+ _t: PhantomData,
+ }
+
+ impl Future for InnerConnectorResponseB
+ where
+ T: Service,
+ Io1: AsyncRead + AsyncWrite + 'static,
+ Io2: AsyncRead + AsyncWrite + 'static,
+ {
+ type Item = EitherConnection;
+ type Error = ConnectError;
+
+ fn poll(&mut self) -> Poll {
+ match self.fut.poll()? {
+ Async::NotReady => Ok(Async::NotReady),
+ Async::Ready(res) => Ok(Async::Ready(EitherConnection::B(res))),
+ }
+ }
+ }
+}
diff --git a/actix-http/src/client/error.rs b/actix-http/src/client/error.rs
new file mode 100644
index 000000000..fc4b5b72b
--- /dev/null
+++ b/actix-http/src/client/error.rs
@@ -0,0 +1,130 @@
+use std::io;
+
+use derive_more::{Display, From};
+use trust_dns_resolver::error::ResolveError;
+
+#[cfg(feature = "ssl")]
+use openssl::ssl::{Error as SslError, HandshakeError};
+
+use crate::error::{Error, ParseError, ResponseError};
+use crate::http::Error as HttpError;
+use crate::response::Response;
+
+/// A set of errors that can occur while connecting to an HTTP host
+#[derive(Debug, Display, From)]
+pub enum ConnectError {
+ /// SSL feature is not enabled
+ #[display(fmt = "SSL is not supported")]
+ SslIsNotSupported,
+
+ /// SSL error
+ #[cfg(feature = "ssl")]
+ #[display(fmt = "{}", _0)]
+ SslError(SslError),
+
+ /// Failed to resolve the hostname
+ #[display(fmt = "Failed resolving hostname: {}", _0)]
+ Resolver(ResolveError),
+
+ /// No dns records
+ #[display(fmt = "No dns records found for the input")]
+ NoRecords,
+
+ /// Http2 error
+ #[display(fmt = "{}", _0)]
+ H2(h2::Error),
+
+ /// Connecting took too long
+ #[display(fmt = "Timeout out while establishing connection")]
+ Timeout,
+
+ /// Connector has been disconnected
+ #[display(fmt = "Internal error: connector has been disconnected")]
+ Disconnected,
+
+ /// Unresolved host name
+ #[display(fmt = "Connector received `Connect` method with unresolved host")]
+ Unresolverd,
+
+ /// Connection io error
+ #[display(fmt = "{}", _0)]
+ Io(io::Error),
+}
+
+impl From