got sidetracked with fwd proxy

jmwample · Mar 23, 2024 · 5c5d1f7 · 5c5d1f7
1 parent c0f3379
commit 5c5d1f7
Show file tree

Hide file tree

Showing 4 changed files with 559 additions and 9 deletions.
diff --git a/crates/lyrebird/Cargo.toml b/crates/lyrebird/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lyrebird"
 version = "0.1.0"
 edition = "2021"
-authers = ["Jack Wampler"]
+authors = ["Jack Wampler"]
 
 
 [[bin]]

diff --git a/crates/lyrebird/src/main.rs b/crates/lyrebird/src/main.rs
@@ -17,16 +17,16 @@ use fast_socks5::{
     util::target_addr::TargetAddr,
     AuthenticationMethod,
 };
+use safelog::sensitive;
+use tokio::task::JoinSet;
 use tokio::{
     io::{copy_bidirectional, AsyncRead, AsyncWrite, AsyncWriteExt},
     net::{TcpListener, TcpStream},
     signal::unix::SignalKind,
     sync::oneshot,
 };
-// use tokio_stream::StreamExt;
-use safelog::sensitive;
-use tokio::task::JoinSet;
 use tokio_util::sync::CancellationToken;
+// use tokio_stream::StreamExt;
 // use tor_chanmgr::transport::proxied::{settings_to_protocol, Protocol};
 // use tor_linkspec::PtTransportName;
 // use tor_ptmgr::ipc::{
@@ -42,11 +42,6 @@ use tracing_subscriber::{filter::LevelFilter, prelude::*};
 
 use std::{env, net::SocketAddr, str::FromStr, sync::Arc};
 
-// /// The location where the obfs4 server will store its state
-// const SERVER_STATE_LOCATION: &str = "/tmp/arti-pt";
-// /// The location where the obfs4 client will store its state
-// const CLIENT_STATE_LOCATION: &str = "/tmp/arti-pt-client";
-
 /// Client Socks address to listen on.
 const CLIENT_SOCKS_ADDR: &str = "127.0.0.1:0";
 

diff --git a/crates/obfs4/Cargo.toml b/crates/obfs4/Cargo.toml
@@ -12,6 +12,11 @@ name = "fwd_proxy"
 test = false
 bench = false
 
+[[bin]]
+name = "fwd"
+test = false
+bench = false
+
 [dependencies]
 ## Local
 ptrs = { path="../ptrs" }
@@ -68,6 +73,10 @@ cipher = "0.4.4"
 zeroize = "1.7.0"
 thiserror = "1.0.56"
 
+# fwd
+fast-socks5 = "0.9.1"
+url = "2.5.0"
+
 [dev-dependencies]
 tracing-subscriber = "0.3.18"
 hex-literal = "0.4.1"