Support http over unix domain sockets

Cargo.toml

@@ -27,8 +27,11 @@ dirs = "5.0"
 encoding_rs = "0.8.28"
 encoding_rs_io = "0.1.7"
 flate2 = "1.0.22"
+futures-core = { version = "0.3.28", default-features = false }
+http = "1"
 # Add "tracing" feature to hyper once it stabilizes
 hyper = { version = "1.2", default-features = false }
+hyper-util = { version = "0.1", features = ["tokio"] }
 indicatif = "0.17"
 jsonxf = "1.1.0"
 memchr = "2.4.1"
@@ -38,6 +41,7 @@ mime_guess = "2.0"
 once_cell = "1.8.0"
 os_display = "0.1.3"
 pem = "3.0"
+pin-project-lite = "0.2"
 regex-lite = "0.1.5"
 roff = "0.2.1"
 rpassword = "7.2.0"
@@ -48,6 +52,7 @@ serde_urlencoded = "0.7.0"
 supports-hyperlinks = "3.0.0"
 termcolor = "1.1.2"
 time = "0.3.16"
+tokio = { version = "1", features = ["rt-multi-thread"] }
 unicode-width = "0.1.9"
 url = "2.2.2"
 ruzstd = { version = "0.7", default-features = false, features = ["std"]}

src/cli.rs

@@ -347,6 +347,16 @@ Example: --print=Hb"
     #[clap(short = '6', long)]
     pub ipv6: bool,
 
+    /// Connect using a Unix domain socket.
+    ///
+    /// Example: xh :/index.html --unix-socket=/var/run/temp.sock
+    #[clap(
+        long,
+        value_name = "FILE",
+        conflicts_with_all=["proxy", "verify", "cert", "cert_key", "ssl", "resolve", "interface", "ipv4", "ipv6", "https", "http_version"]
+    )]
+    pub unix_socket: Option<PathBuf>,
+
     /// Do not attempt to read stdin.
     ///
     /// This disables the default behaviour of reading the request body from stdin
@@ -1011,7 +1021,7 @@ impl FromStr for Print {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct Timeout(Duration);
 
 impl Timeout {

src/cookie.rs

@@ -0,0 +1,44 @@
+use std::sync::Arc;
+
+use anyhow::Result;
+use reqwest::{
+    blocking::{Request, Response},
+    cookie::CookieStore,
+    header,
+};
+
+use crate::middleware::{Context, Middleware};
+
+pub struct CookieMiddleware<T>(Arc<T>);
+
+impl<T> CookieMiddleware<T> {
+    pub fn new(cookie_jar: Arc<T>) -> Self {
+        CookieMiddleware(cookie_jar)
+    }
+}
+
+impl<T: CookieStore> Middleware for CookieMiddleware<T> {
+    fn handle(&mut self, mut ctx: Context, mut request: Request) -> Result<Response> {
+        let url = request.url().clone();
+
+        if let Some(header) = self.0.cookies(&url) {
+            request
+                .headers_mut()
+                .entry(header::COOKIE)
+                .or_insert(header);
+        }
+
+        let response = self.next(&mut ctx, request)?;
+
+        let mut cookies = response
+            .headers()
+            .get_all(header::SET_COOKIE)
+            .iter()
+            .peekable();
+        if cookies.peek().is_some() {
+            self.0.set_cookies(&mut cookies, &url);
+        }
+
+        Ok(response)
+    }
+}

src/main.rs

@@ -2,6 +2,7 @@
 mod auth;
 mod buffer;
 mod cli;
+mod cookie;
 mod decoder;
 mod download;
 mod formatting;
@@ -15,6 +16,8 @@ mod redirect;
 mod request_items;
 mod session;
 mod to_curl;
+#[cfg(unix)]
+mod unix_socket;
 mod utils;
 
 use std::env;
@@ -27,6 +30,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context, Result};
+use cookie::CookieMiddleware;
 use cookie_store::{CookieStore, RawCookie};
 use redirect::RedirectFollower;
 use reqwest::blocking::Client;
@@ -35,7 +39,6 @@ use reqwest::header::{
 };
 use reqwest::tls;
 use url::Host;
-use utils::reason_phrase;
 
 use crate::auth::{Auth, DigestAuthMiddleware};
 use crate::buffer::Buffer;
@@ -45,7 +48,7 @@ use crate::middleware::ClientWithMiddleware;
 use crate::printer::Printer;
 use crate::request_items::{Body, FORM_CONTENT_TYPE, JSON_ACCEPT, JSON_CONTENT_TYPE};
 use crate::session::Session;
-use crate::utils::{test_mode, test_pretend_term, url_with_query};
+use crate::utils::{reason_phrase, test_mode, test_pretend_term, url_with_query};
 
 #[cfg(not(any(feature = "native-tls", feature = "rustls")))]
 compile_error!("Either native-tls or rustls feature must be enabled!");
@@ -86,6 +89,15 @@ fn main() {
                 eprintln!();
                 eprintln!("Try running without the --native-tls flag.");
             }
+            if msg.starts_with("deadline has elapsed") {
+                process::exit(2);
+            }
+            #[cfg(unix)]
+            {
+                if err.downcast_ref::<unix_socket::TimeoutError>().is_some() {
+                    process::exit(2);
+                }
+            }
             if let Some(err) = err.downcast_ref::<reqwest::Error>() {
                 if err.is_timeout() {
                     process::exit(2);
@@ -286,9 +298,6 @@ fn run(args: Cli) -> Result<i32> {
         None => client,
     };
 
-    let cookie_jar = Arc::new(reqwest_cookie_store::CookieStoreMutex::default());
-    client = client.cookie_provider(cookie_jar.clone());
-
     client = match (args.ipv4, args.ipv6) {
         (true, false) => client.local_address(IpAddr::from(Ipv4Addr::UNSPECIFIED)),
         (false, true) => client.local_address(IpAddr::from(Ipv6Addr::UNSPECIFIED)),
@@ -340,6 +349,8 @@ fn run(args: Cli) -> Result<i32> {
     log::trace!("{client:#?}");
     let client = client.build()?;
 
+    let cookie_jar = Arc::new(reqwest_cookie_store::CookieStoreMutex::default());
+
     let mut session = match &args.session {
         Some(name_or_path) => Some(
             Session::load_session(url.clone(), name_or_path.clone(), args.is_session_read_only)
@@ -561,42 +572,55 @@ fn run(args: Cli) -> Result<i32> {
         printer.print_request_body(&mut request)?;
     }
 
+    let mut client = ClientWithMiddleware::new(client);
+
     if !args.offline {
         let mut response = {
             let history_print = args.history_print.unwrap_or(print);
-            let mut client = ClientWithMiddleware::new(&client);
-            if args.all {
-                client = client.with_printer(|prev_response, next_request| {
-                    if history_print.response_headers {
-                        printer.print_response_headers(prev_response)?;
-                    }
-                    if history_print.response_body {
-                        printer.print_response_body(
-                            prev_response,
-                            response_charset,
-                            response_mime,
-                        )?;
-                        printer.print_separator()?;
-                    }
-                    if history_print.response_meta {
-                        printer.print_response_meta(prev_response)?;
-                    }
-                    if history_print.request_headers {
-                        printer.print_request_headers(next_request, &*cookie_jar)?;
-                    }
-                    if history_print.request_body {
-                        printer.print_request_body(next_request)?;
-                    }
-                    Ok(())
-                });
-            }
             if args.follow {
                 client = client.with(RedirectFollower::new(args.max_redirects.unwrap_or(10)));
             }
             if let Some(Auth::Digest(username, password)) = &auth {
                 client = client.with(DigestAuthMiddleware::new(username, password));
             }
-            client.execute(request)?
+            client = client.with(CookieMiddleware::new(cookie_jar.clone()));
+            if let Some(socket_path) = args.unix_socket {
+                #[cfg(not(unix))]
+                {
+                    return Err(anyhow::anyhow!(
+                        "HTTP over Unix domain sockets is not supported on this platform"
+                    ));
+                }
+                #[cfg(unix)]
+                {
+                    client = client.with_unix_socket(
+                        socket_path,
+                        args.timeout.and_then(|t| t.as_duration()),
+                    )?;
+                }
+            }
+            client.execute(request, |prev_response, next_request| {
+                if !args.all {
+                    return Ok(());
+                }
+                if history_print.response_headers {
+                    printer.print_response_headers(prev_response)?;
+                }
+                if history_print.response_body {
+                    printer.print_response_body(prev_response, response_charset, response_mime)?;
+                    printer.print_separator()?;
+                }
+                if history_print.response_meta {
+                    printer.print_response_meta(prev_response)?;
+                }
+                if history_print.request_headers {
+                    printer.print_request_headers(next_request, &*cookie_jar)?;
+                }
+                if history_print.request_body {
+                    printer.print_request_body(next_request)?;
+                }
+                Ok(())
+            })?
         };
 
         let status = response.status();