Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Unix Domains Sockets #233

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Support Unix Domains Sockets #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1836d
fix typo
Aug 31, 2020
c1e6912
support unix domain sockets
Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ tiny_http = "0.6.0"
url = "2"
threadpool = "1"
num_cpus = "1"
anysocket="0.1"

[dev-dependencies]
postgres = { version = "0.15.2", default-features = false }
Expand Down
33 changes: 17 additions & 16 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ pub extern crate url;
pub extern crate percent_encoding;
extern crate threadpool;
extern crate num_cpus;
extern crate anysocket;

// https://github.com/servo/rust-url/blob/e121d8d0aafd50247de5f5310a227ecb1efe6ffe/percent_encoding/lib.rs#L126
pub const DEFAULT_ENCODE_SET: &percent_encoding::AsciiSet = &percent_encoding::CONTROLS
Expand All @@ -90,8 +91,6 @@ use std::io::Cursor;
use std::io::Result as IoResult;
use std::io::Read;
use std::marker::PhantomData;
use std::net::SocketAddr;
use std::net::ToSocketAddrs;
use std::panic;
use std::panic::AssertUnwindSafe;
use std::slice::Iter as SliceIter;
Expand All @@ -101,6 +100,8 @@ use std::sync::mpsc;
use std::thread;
use std::fmt;

use anysocket::AbstractToSocketAddrs;
use anysocket::AbstractAddr;

pub mod cgi;
pub mod content_encoding;
Expand Down Expand Up @@ -214,7 +215,7 @@ macro_rules! assert_or_400 {
///
/// If you need to handle these situations, please see `Server`.
pub fn start_server<A, F>(addr: A, handler: F) -> !
where A: ToSocketAddrs,
where A: AbstractToSocketAddrs,
F: Send + Sync + 'static + Fn(&Request) -> Response
{
Server::new(addr, handler).expect("Failed to start server").run();
Expand All @@ -227,7 +228,7 @@ pub fn start_server<A, F>(addr: A, handler: F) -> !
/// When `pool_size` is `None`, the thread pool size will default to `8 * num-cpus`.
/// `pool_size` must be greater than zero or this function will panic.
pub fn start_server_with_pool<A, F>(addr: A, pool_size: Option<usize>, handler: F) -> !
where A: ToSocketAddrs,
where A: AbstractToSocketAddrs,
F: Send + Sync + 'static + Fn(&Request) -> Response
{
Server::new(addr, handler).expect("Failed to start server")
Expand All @@ -237,7 +238,7 @@ pub fn start_server_with_pool<A, F>(addr: A, pool_size: Option<usize>, handler:
}


/// Executes a function in either a thread of a thread pool
/// Executes a function in either a thread or a thread pool
enum Executor {
Threaded,
Pooled {
Expand Down Expand Up @@ -296,7 +297,7 @@ impl<F> Server<F> where F: Send + Sync + 'static + Fn(&Request) -> Response {
/// Returns an error if there was an error while creating the listening socket, for example if
/// the port is already in use.
pub fn new<A>(addr: A, handler: F) -> Result<Server<F>, Box<dyn Error + Send + Sync>>
where A: ToSocketAddrs
where A: AbstractToSocketAddrs
{
let server = try!(tiny_http::Server::http(addr));
Ok(Server {
Expand All @@ -318,7 +319,7 @@ impl<F> Server<F> where F: Send + Sync + 'static + Fn(&Request) -> Response {
handler: F,
certificate: Vec<u8>,
private_key: Vec<u8>,
) -> Result<Server<F>, Box<dyn Error + Send + Sync>> where A: ToSocketAddrs {
) -> Result<Server<F>, Box<dyn Error + Send + Sync>> where A: AbstractToSocketAddrs {
let ssl_config = tiny_http::SslConfig {
certificate,
private_key,
Expand All @@ -341,7 +342,7 @@ impl<F> Server<F> where F: Send + Sync + 'static + Fn(&Request) -> Response {

/// Returns the address of the listening socket.
#[inline]
pub fn server_addr(&self) -> SocketAddr {
pub fn server_addr(&self) -> AbstractAddr {
self.server.server_addr()
}

Expand Down Expand Up @@ -457,7 +458,7 @@ impl<F> Server<F> where F: Send + Sync + 'static + Fn(&Request) -> Response {
let url = request.url().to_owned();
let method = request.method().as_str().to_owned();
let headers = request.headers().iter().map(|h| (h.field.to_string(), h.value.clone().into())).collect();
let remote_addr = *request.remote_addr();
let remote_addr = request.remote_addr().clone();

tiny_http_request = Arc::new(Mutex::new(Some(request)));
let data = Arc::new(Mutex::new(Some(Box::new(RequestRead(tiny_http_request.clone())) as Box<_>)));
Expand Down Expand Up @@ -549,7 +550,7 @@ pub struct Request {
headers: Vec<(String, String)>,
https: bool,
data: Arc<Mutex<Option<Box<dyn Read + Send>>>>,
remote_addr: SocketAddr,
remote_addr: AbstractAddr,
}

impl fmt::Debug for Request {
Expand All @@ -573,7 +574,7 @@ impl Request {
-> Request where U: Into<String>, M: Into<String>
{
let data = Arc::new(Mutex::new(Some(Box::new(Cursor::new(data)) as Box<_>)));
let remote_addr = "127.0.0.1:12345".parse().unwrap();
let remote_addr = "127.0.0.1:12345".parse::<std::net::SocketAddr>().unwrap().into();

Request {
url: url.into(),
Expand All @@ -586,7 +587,7 @@ impl Request {
}

/// Builds a fake HTTP request to be used during tests.
pub fn fake_http_from<U, M>(from: SocketAddr, method: M, url: U,
pub fn fake_http_from<U, M>(from: AbstractAddr, method: M, url: U,
headers: Vec<(String, String)>, data: Vec<u8>)
-> Request where U: Into<String>, M: Into<String>
{
Expand All @@ -610,7 +611,7 @@ impl Request {
-> Request where U: Into<String>, M: Into<String>
{
let data = Arc::new(Mutex::new(Some(Box::new(Cursor::new(data)) as Box<_>)));
let remote_addr = "127.0.0.1:12345".parse().unwrap();
let remote_addr = "127.0.0.1:12345".parse::<std::net::SocketAddr>().unwrap().into();

Request {
url: url.into(),
Expand All @@ -623,7 +624,7 @@ impl Request {
}

/// Builds a fake HTTPS request to be used during tests.
pub fn fake_https_from<U, M>(from: SocketAddr, method: M, url: U,
pub fn fake_https_from<U, M>(from: AbstractAddr, method: M, url: U,
headers: Vec<(String, String)>, data: Vec<u8>)
-> Request where U: Into<String>, M: Into<String>
{
Expand Down Expand Up @@ -669,7 +670,7 @@ impl Request {
headers: self.headers.clone(), // TODO: expensive
https: self.https,
data: self.data.clone(),
remote_addr: self.remote_addr,
remote_addr: self.remote_addr.clone(),
})
}

Expand Down Expand Up @@ -867,7 +868,7 @@ impl Request {
/// }
/// ```
#[inline]
pub fn remote_addr(&self) -> &SocketAddr {
pub fn remote_addr(&self) -> &AbstractAddr {
&self.remote_addr
}
}
Expand Down