Merge pull request #20 from trinity-1686a/generic-socket

Allow to take arbitrary socket instead of address to estaplish connexion to proxy

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
         run: |
           sudo add-apt-repository ppa:artyom.h31/3proxy -y
           sudo apt-get update
-          sudo apt-get install 3proxy -y
+          sudo apt-get install 3proxy socat -y
       - name: Run tests
         run: |
           cargo build --verbose --all

Cargo.toml

@@ -30,6 +30,6 @@ either = "1"
 thiserror = "1.0"
 
 [dev-dependencies]
-tokio = { version = "0.2", features = ["io-util", "rt-threaded"] }
+tokio = { version = "0.2", features = ["io-util", "rt-threaded", "uds", "dns"] }
 once_cell = "1.2.0"
 hyper = "0.13"

examples/socket.rs

@@ -0,0 +1,44 @@
+//! Test the tor proxy capabilities
+//!
+//! This example requires a running tor proxy.
+
+use tokio::{
+    io::{AsyncReadExt, AsyncWriteExt},
+    net::{TcpStream, UnixStream},
+    runtime::Runtime,
+};
+use tokio_socks::{tcp::Socks5Stream, Error};
+
+const UNIX_PROXY_ADDR: &str = "/tmp/tor/socket.s";
+const TCP_PROXY_ADDR: &str = "127.0.0.1:9050";
+const ONION_ADDR: &str = "3g2upl4pq6kufc4m.onion:80"; // DuckDuckGo
+
+async fn connect() -> Result<(), Error> {
+    // This require Tor to listen on and Unix Domain Socket.
+    // You have to create a directory /tmp/tor owned by tor, and for which only tor
+    // has rights, and add the following line to your torrc :
+    // SocksPort unix:/tmp/tor/socket.s
+    let socket = UnixStream::connect(UNIX_PROXY_ADDR).await?;
+    let target = Socks5Stream::tor_resolve_with_socket(socket, "duckduckgo.com:0").await?;
+    eprintln!("duckduckgo.com = {:?}", target);
+    let socket = UnixStream::connect(UNIX_PROXY_ADDR).await?;
+    let target = Socks5Stream::tor_resolve_ptr_with_socket(socket, "176.34.155.23:0").await?;
+    eprintln!("176.34.155.23 = {:?}", target);
+
+    let socket = TcpStream::connect(TCP_PROXY_ADDR).await?;
+    socket.set_nodelay(true)?;
+    let mut conn = Socks5Stream::connect_with_socket(socket, ONION_ADDR).await?;
+    conn.write_all(b"GET /\n\n").await?;
+
+    let mut buf = Vec::new();
+    let n = conn.read_to_end(&mut buf).await?;
+
+    println!("{} bytes read\n\n{}", n, String::from_utf8_lossy(&buf));
+
+    Ok(())
+}
+
+fn main() {
+    let mut rt = Runtime::new().unwrap();
+    rt.block_on(connect()).unwrap();
+}

src/error.rs

@@ -64,6 +64,5 @@ pub enum Error {
     PasswordAuthFailure(u8),
 }
 
-
 ///// Result type of `tokio-socks`
 // pub type Result<T> = std::result::Result<T, Error>;

src/lib.rs

@@ -90,7 +90,7 @@ impl Stream for ProxyAddrsStream {
             Some(Err(_)) => {
                 let err = self.0.take().unwrap().unwrap_err();
                 Poll::Ready(Some(Err(err.into())))
-            }
+            },
             None => unreachable!(),
         }
     }
@@ -235,8 +235,7 @@ impl IntoTargetAddr<'static> for (String, u16) {
 }
 
 impl<'a, T> IntoTargetAddr<'a> for &'a T
-where
-    T: IntoTargetAddr<'a> + Copy,
+where T: IntoTargetAddr<'a> + Copy
 {
     fn into_target_addr(self) -> Result<TargetAddr<'a>> {
         (*self).into_target_addr()
@@ -299,9 +298,7 @@ mod tests {
     }
 
     fn into_target_addr<'a, T>(t: T) -> Result<TargetAddr<'a>>
-    where
-        T: IntoTargetAddr<'a>,
-    {
+    where T: IntoTargetAddr<'a> {
         t.into_target_addr()
     }