Support http over unix domain sockets

Cargo.toml

@@ -26,8 +26,10 @@ dirs = "5.0"
 encoding_rs = "0.8.28"
 encoding_rs_io = "0.1.7"
 flate2 = "1.0.22"
+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"
@@ -47,6 +49,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,12 @@ 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")]
+    pub unix_socket: Option<PathBuf>,
+
     /// Do not attempt to read stdin.
     ///
     /// This disables the default behaviour of reading the request body from stdin

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;
@@ -14,6 +15,8 @@ mod redirect;
 mod request_items;
 mod session;
 mod to_curl;
+#[cfg(unix)]
+mod unix_socket;
 mod utils;
 mod vendored;
 
@@ -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,9 @@ 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};
+#[cfg(unix)]
+use crate::unix_socket::UnixSocket;
+use crate::utils::{reason_phrase, test_mode, test_pretend_term, url_with_query};
 use crate::vendored::reqwest_cookie_store;
 
 #[cfg(not(any(feature = "native-tls", feature = "rustls")))]
@@ -282,9 +287,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)),
@@ -336,6 +338,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)
@@ -557,42 +561,50 @@ 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()));
+            #[cfg(unix)]
+            if let Some(unix_socket) = args.unix_socket {
+                client = client.with(UnixSocket::new(unix_socket));
+            }
+            #[cfg(not(unix))]
+            if let Some(_) = args.unix_socket {
+                return Err(anyhow!(
+                    "HTTP over Unix domain sockets is not supported on this platform"
+                ));
+            }
+            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();

src/middleware.rs

@@ -24,18 +24,18 @@ impl ResponseExt for Response {
     }
 }
 
-type Printer<'a, 'b> = &'a mut (dyn FnMut(&mut Response, &mut Request) -> Result<()> + 'b);
+type Printer<'a> = &'a mut (dyn FnMut(&mut Response, &mut Request) -> Result<()> + 'a);
 
-pub struct Context<'a, 'b> {
-    client: &'a Client,
-    printer: Option<Printer<'a, 'b>>,
+pub struct Context<'a, 'b, 'c> {
+    client: Client,
+    printer: Printer<'c>,
     middlewares: &'a mut [Box<dyn Middleware + 'b>],
 }
 
-impl<'a, 'b> Context<'a, 'b> {
+impl<'a, 'b, 'c> Context<'a, 'b, 'c> {
     fn new(
-        client: &'a Client,
-        printer: Option<Printer<'a, 'b>>,
+        client: Client,
+        printer: Printer<'c>,
         middlewares: &'a mut [Box<dyn Middleware + 'b>],
     ) -> Self {
         Context {
@@ -57,8 +57,7 @@ impl<'a, 'b> Context<'a, 'b> {
                 Ok(response)
             }
             [ref mut head, tail @ ..] => head.handle(
-                #[allow(clippy::needless_option_as_deref)]
-                Context::new(self.client, self.printer.as_deref_mut(), tail),
+                Context::new(self.client.clone(), self.printer, tail),
                 request,
             ),
         }
@@ -78,51 +77,34 @@ pub trait Middleware {
         response: &mut Response,
         request: &mut Request,
     ) -> Result<()> {
-        if let Some(ref mut printer) = ctx.printer {
-            printer(response, request)?;
-        }
-
+        (ctx.printer)(response, request)?;
         Ok(())
     }
 }
 
-pub struct ClientWithMiddleware<'a, T>
-where
-    T: FnMut(&mut Response, &mut Request) -> Result<()>,
-{
-    client: &'a Client,
-    printer: Option<T>,
+pub struct ClientWithMiddleware<'a> {
+    client: Client,
     middlewares: Vec<Box<dyn Middleware + 'a>>,
 }
 
-impl<'a, T> ClientWithMiddleware<'a, T>
-where
-    T: FnMut(&mut Response, &mut Request) -> Result<()> + 'a,
-{
-    pub fn new(client: &'a Client) -> Self {
+impl<'a> ClientWithMiddleware<'a> {
+    pub fn new(client: Client) -> Self {
         ClientWithMiddleware {
             client,
-            printer: None,
             middlewares: vec![],
         }
     }
 
-    pub fn with_printer(mut self, printer: T) -> Self {
-        self.printer = Some(printer);
-        self
-    }
-
     pub fn with(mut self, middleware: impl Middleware + 'a) -> Self {
         self.middlewares.push(Box::new(middleware));
         self
     }
 
-    pub fn execute(&mut self, request: Request) -> Result<Response> {
-        let mut ctx = Context::new(
-            self.client,
-            self.printer.as_mut().map(|p| p as _),
-            &mut self.middlewares[..],
-        );
+    pub fn execute<'b, T>(&mut self, request: Request, mut printer: T) -> Result<Response>
+    where
+        T: FnMut(&mut Response, &mut Request) -> Result<()> + 'b,
+    {
+        let mut ctx = Context::new(self.client.clone(), &mut printer, &mut self.middlewares[..]);
         ctx.execute(request)
     }
 }

src/printer.rs

@@ -20,7 +20,7 @@ use crate::{
     formatting::serde_json_format,
     formatting::{get_json_formatter, Highlighter},
     middleware::ResponseExt,
-    utils::{copy_largebuf, test_mode, BUFFER_SIZE},
+    utils::{copy_largebuf, BUFFER_SIZE},
 };
 
 const BINARY_SUPPRESSOR: &str = concat!(
@@ -345,9 +345,7 @@ impl Printer {
             // even know if we're going to use HTTP/2 yet.
             headers.entry(HOST).or_insert_with(|| {
                 // Added at https://github.com/hyperium/hyper-util/blob/53aadac50d/src/client/legacy/client.rs#L278
-                if test_mode() {
-                    HeaderValue::from_str("http.mock")
-                } else if let Some(port) = request.url().port() {
+                if let Some(port) = request.url().port() {
                     HeaderValue::from_str(&format!("{}:{}", host, port))
                 } else {
                     HeaderValue::from_str(host)

src/to_curl.rs

@@ -299,6 +299,11 @@ pub fn translate(args: Cli) -> Result<Command> {
         cmd.arg(interface);
     };
 
+    if let Some(unix_socket) = args.unix_socket {
+        cmd.arg("--unix-socket");
+        cmd.arg(unix_socket);
+    }
+
     if !args.resolve.is_empty() {
         let port = url
             .port_or_known_default()