Integrated Tor arti Client

api/src/owner.rs

@@ -23,8 +23,8 @@ use uuid::Uuid;
 use crate::config::{TorConfig, WalletConfig};
 use crate::core::core::OutputFeatures;
 use crate::core::global;
-use crate::impls::HttpSlateSender;
 use crate::impls::SlateSender as _;
+use crate::impls::TorSlateSender;
 use crate::keychain::{Identifier, Keychain};
 use crate::libwallet::api_impl::owner_updater::{start_updater_log_thread, StatusMessage};
 use crate::libwallet::api_impl::{owner, owner_updater};
@@ -669,17 +669,15 @@ where
 		};
 		// Helper functionality. If send arguments exist, attempt to send sync and
 		// finalize
-		let skip_tor = match send_args.as_ref() {
-			None => false,
-			Some(sa) => sa.skip_tor,
-		};
 		match send_args {
 			Some(sa) => {
 				let tor_config_lock = self.tor_config.lock();
 				let tc = tor_config_lock.clone();
 				let tc = match tc {
 					Some(mut c) => {
-						c.skip_send_attempt = Some(skip_tor);
+						if let Some(skip_tor) = sa.skip_tor {
+							c.skip_send_attempt = Some(skip_tor);
+						}
 						Some(c)
 					}
 					None => None,
@@ -845,7 +843,9 @@ where
 				let tc = tor_config_lock.clone();
 				let tc = match tc {
 					Some(mut c) => {
-						c.skip_send_attempt = Some(sa.skip_tor);
+						if let Some(skip_tor) = sa.skip_tor {
+							c.skip_send_attempt = Some(skip_tor);
+						}
 						Some(c)
 					}
 					None => None,
@@ -2495,7 +2495,7 @@ pub fn try_slatepack_sync_workflow(
 	slate: &Slate,
 	dest: &str,
 	tor_config: Option<TorConfig>,
-	tor_sender: Option<HttpSlateSender>,
+	tor_sender: Option<TorSlateSender>,
 	send_to_finalize: bool,
 	test_mode: bool,
 ) -> Result<Option<Slate>, Error> {
@@ -2505,7 +2505,7 @@ pub fn try_slatepack_sync_workflow(
 		}
 	}
 	let mut ret_slate = Slate::blank(2, false);
-	let mut send_sync = |mut sender: HttpSlateSender, method_str: &str| match sender
+	let mut send_sync = |mut sender: TorSlateSender, method_str: &str| match sender
 		.send_tx(&slate, send_to_finalize)
 	{
 		Ok(s) => {
@@ -2531,18 +2531,16 @@ pub fn try_slatepack_sync_workflow(
 					if test_mode {
 						None
 					} else {
-						match HttpSlateSender::with_socks_proxy(
-							&tor_addr.to_http_str(),
-							&tor_config.as_ref().unwrap().socks_proxy_addr,
-							&tor_config.as_ref().unwrap().send_config_dir,
-							tor_config.as_ref().unwrap().bridge.clone(),
-							tor_config.as_ref().unwrap().proxy.clone(),
-						) {
-							Ok(s) => Some(s),
-							Err(e) => {
-								debug!("Send (TOR): Cannot create TOR Slate sender {:?}", e);
-								None
+						if let Some(tc) = tor_config {
+							match TorSlateSender::new(&tor_addr.to_http_str(), tc) {
+								Ok(s) => Some(s),
+								Err(e) => {
+									debug!("Send (TOR): Cannot create TOR Slate sender {:?}", e);
+									None
+								}
 							}
+						} else {
+							return Err(Error::TorConfig("Tor config is not set".to_string()));
 						}
 					}
 				}

config/src/comments.rs

@@ -206,16 +206,24 @@ fn comments() -> HashMap<String, String> {
 		"[tor]".to_string(),
 		"
 #########################################
-### TOR CONFIGURATION (Experimental)  ###
+### TOR CONFIGURATION                 ###
 #########################################
 "
 		.to_string(),
 	);
 
+	retval.insert(
+		"use_integrated".to_string(),
+		"
+#Whether to use integrated Tor library
+"
+		.to_string(),
+	);
+
 	retval.insert(
 		"skip_send_attempt".to_string(),
 		"
-#Whether to skip send attempts (used for debugging) 
+#Whether to skip send attempts (default false)
 "
 		.to_string(),
 	);
@@ -259,8 +267,11 @@ fn comments() -> HashMap<String, String> {
 		"
 #Tor bridge relay: allow to send and receive via TOR in a country where it is censored.
 #Enable it by entering a single bridge line. To disable it, you must comment it.
-#Support of the transport: obfs4, meek and snowflake. 
-#obfs4proxy or snowflake client binary must be installed and on your path.
+#Support of the transport: webtunnel, obfs4, and snowflake.
+#webtunnel, obfs4proxy or snowflake client binary must be installed and on your path.
+#Custom path for client binary
+#bridge_bin_path = \"\"
+
 #For example, the bridge line must be in the following format for obfs4 transport: \"obfs4 [IP:PORT] [FINGERPRINT] cert=[CERT] iat-mode=[IAT-MODE]\"
 #bridge_line = \"\"
 

config/src/types.rs

@@ -162,6 +162,8 @@ impl From<io::Error> for ConfigError {
 /// Tor configuration
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct TorConfig {
+	/// whether to use integrated Tor library
+	pub use_integrated: Option<bool>,
 	/// whether to skip any attempts to send via TOR
 	pub skip_send_attempt: Option<bool>,
 	/// Whether to start tor listener on listener startup (default true)
@@ -181,6 +183,7 @@ pub struct TorConfig {
 impl Default for TorConfig {
 	fn default() -> TorConfig {
 		TorConfig {
+			use_integrated: Some(true),
 			skip_send_attempt: Some(false),
 			use_tor_listener: true,
 			socks_proxy_addr: "127.0.0.1:59050".to_owned(),
@@ -194,6 +197,8 @@ impl Default for TorConfig {
 /// Tor Bridge Config
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct TorBridgeConfig {
+	/// Path to bridge binary to use with integrated Tor library
+	pub bridge_bin_path: Option<String>,
 	/// Bridge Line
 	pub bridge_line: Option<String>,
 	/// Client Option
@@ -203,6 +208,7 @@ pub struct TorBridgeConfig {
 impl Default for TorBridgeConfig {
 	fn default() -> TorBridgeConfig {
 		TorBridgeConfig {
+			bridge_bin_path: None,
 			bridge_line: None,
 			client_option: None,
 		}

controller/Cargo.toml

@@ -21,7 +21,7 @@ log = "0.4"
 prettytable-rs = "0.10"
 ring = "0.16"
 term = "0.6"
-tokio = { version = "0.2", features = ["full"] }
+tokio = { version = "1.52.3", features = ["full"] }
 uuid = { version = "0.8", features = ["serde", "v4"] }
 url = "2.1"
 chrono = { version = "0.4.11", features = ["serde"] }

controller/src/command.rs

@@ -224,7 +224,7 @@ where
 				g_args.tls_conf.clone(),
 				tor_config.use_tor_listener,
 				test_mode,
-				Some(tor_config.clone()),
+				tor_config,
 			);
 			if let Err(e) = res {
 				error!("Error starting listener: {}", e);
@@ -335,7 +335,7 @@ pub struct SendArgs {
 	pub target_slate_version: Option<u16>,
 	pub payment_proof_address: Option<SlatepackAddress>,
 	pub ttl_blocks: Option<u64>,
-	pub skip_tor: bool,
+	pub skip_tor: Option<bool>,
 	pub outfile: Option<String>,
 	pub bridge: Option<String>,
 	pub slatepack_qr: bool,
@@ -431,7 +431,9 @@ where
 			if let Some(b) = args.bridge.clone() {
 				c.bridge.bridge_line = Some(b);
 			}
-			c.skip_send_attempt = Some(args.skip_tor);
+			if let Some(s) = args.skip_tor {
+				c.skip_send_attempt = Some(s);
+			}
 			Some(c)
 		}
 		None => None,
@@ -630,7 +632,7 @@ where
 pub struct ReceiveArgs {
 	pub input_file: Option<String>,
 	pub input_slatepack_message: Option<String>,
-	pub skip_tor: bool,
+	pub skip_tor: Option<bool>,
 	pub outfile: Option<String>,
 	pub bridge: Option<String>,
 	pub slatepack_qr: bool,
@@ -666,7 +668,9 @@ where
 			if let Some(b) = args.bridge {
 				c.bridge.bridge_line = Some(b);
 			}
-			c.skip_send_attempt = Some(args.skip_tor);
+			if let Some(s) = args.skip_tor {
+				c.skip_send_attempt = Some(s);
+			}
 			Some(c)
 		}
 		None => None,
@@ -688,7 +692,7 @@ where
 		Ok(Some(_)) => {
 			println!();
 			println!(
-				"Transaction recieved and sent back to sender at {} for finalization.",
+				"Transaction received and sent back to sender at {} for finalization.",
 				dest
 			);
 			println!();
@@ -925,7 +929,7 @@ pub struct ProcessInvoiceArgs {
 	pub slate: Slate,
 	pub estimate_selection_strategies: bool,
 	pub ttl_blocks: Option<u64>,
-	pub skip_tor: bool,
+	pub skip_tor: Option<bool>,
 	pub outfile: Option<String>,
 	pub bridge: Option<String>,
 	pub slatepack_qr: bool,
@@ -1008,7 +1012,9 @@ where
 			if let Some(b) = args.bridge {
 				c.bridge.bridge_line = Some(b);
 			}
-			c.skip_send_attempt = Some(args.skip_tor);
+			if let Some(skip_tor) = args.skip_tor {
+				c.skip_send_attempt = Some(skip_tor);
+			}
 			Some(c)
 		}
 		None => None,