refactor: replace torut with manual implementation (#5271)

Author: jetjinser

Cargo.lock

@@ -220,10 +220,12 @@ criterion = "0.5"
 crossbeam = "0.8.2"
 crossbeam-channel = "0.5.1"
 ctrlc = "3.1"
+data-encoding = "2.6"
 daggy = "0.8.0"
 dashmap = "6.0"
 derive_more = { version = "1", default-features = false }
 eaglesong = "0.1"
+ed25519-dalek = "2.1"
 env_logger = "0.10"
 fail = "0.4"
 faster-hex = "0.6"
@@ -240,6 +242,7 @@ governor = { version = "0.10", default-features = false, features = [
 ] }
 hex = "0.4"
 hickory-resolver = "0.24.2"
+hmac = "0.12"
 http-body-util = "0.1"
 hyper = "1"
 hyper-tls = "0.6"
@@ -288,6 +291,7 @@ secio = { version = "0.6.8", package = "tentacle-secio" }
 secp256k1 = "0.30"
 semver = "1.0"
 sentry = "0.34.0"
+sha2 = "0.10"
 serde = "1.0"
 serde_json = "1.0"
 serde_plain = "0.3.0"
@@ -305,7 +309,6 @@ tiny-keccak = "2.0"
 tokio = "1.35.0"
 tokio-util = "0.7.8"
 toml = "0.5"
-torut = "0.2.1"
 tower-http = "0.6"
 ubyte = "0.10"
 url = "2.2.2"

Cargo.toml

@@ -84,12 +84,6 @@ ignore = [
   "RUSTSEC-2024-0436",
   # wait https://github.com/tikv/rust-prometheus/issues/538
   "RUSTSEC-2024-0437",
-  # torut introduce these:
-  #   - https://rustsec.org/advisories/RUSTSEC-2022-0093
-  #   - https://rustsec.org/advisories/RUSTSEC-2024-0344
-  # these won't have bad effect for ckb
-  "RUSTSEC-2024-0344",
-  "RUSTSEC-2022-0093",
   #"RUSTSEC-0000-0000",
   #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
   #"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish

deny.toml

@@ -2,7 +2,7 @@ mod tor_basic;
 mod tor_connect;
 mod tor_hash_password;
 mod tor_reconnect;
-use ckb_async_runtime::Runtime;
+use ckb_async_runtime::{Handle, Runtime};
 use ckb_logger::{error, info};
 use std::{path::Path, process::Child};
 use tempfile::{TempDir, tempdir};
@@ -52,9 +52,15 @@ impl TorServer {
     pub fn tor_wait_bootstrap_done(&self) {
         let tor_controller_url = format!("127.0.0.1:{}", self.control_port);
         let controller_password = self.controller_password.clone();
-        Runtime::new().unwrap().block_on(async {
-            let tor_controller =
-                ckb_onion::TorController::new(tor_controller_url, controller_password, None).await;
+        let runtime = Runtime::new().unwrap();
+        let handle = Handle::new(runtime.handle().clone(), None);
+        handle.block_on(async {
+            let tor_controller = ckb_onion::TorController::new(
+                tor_controller_url,
+                controller_password,
+                handle.clone(),
+            )
+            .await;
             let mut tor_controller = tor_controller.unwrap();
             if let Err(err) = tor_controller.wait_tor_server_bootstrap_done().await {
                 error!("wait tor server bootstrap done error: {:?}", err);

test/src/specs/tor/mod.rs

@@ -10,15 +10,21 @@ repository = "https://github.com/nervosnetwork/ckb"
 rust-version = "1.95.0"
 
 [dependencies]
-base64.workspace = true
+data-encoding.workspace = true
+ed25519-dalek = { workspace = true, features = ["hazmat"] }
+hmac.workspace = true
+hex.workspace = true
+rand.workspace = true
+sha2.workspace = true
+tiny-keccak = { workspace = true, features = ["sha3"] }
 tokio = { workspace = true, features = [ "full", "macros" ]}
-torut.workspace = true
 ckb-error.workspace = true
 ckb-async-runtime.workspace = true
 ckb-logger.workspace = true
 ckb-stop-handler.workspace = true
 ckb-network.workspace = true
-futures.workspace = true
+thiserror.workspace = true
+strum.workspace = true
 
 [dev-dependencies]
 ckb-network.workspace = true

util/onion/Cargo.toml

@@ -2,19 +2,17 @@
 
 use std::net::SocketAddr;
 
-use futures::future::BoxFuture;
-use torut::control::{AsyncEvent, ConnError};
-
+mod onion;
 /// Onion service module
 pub mod onion_service;
+mod tor_connection;
 /// Tor controller module
 pub mod tor_controller;
 
+pub use onion::{OnionAddressV3, TorPublicKeyV3, TorSecretKeyV3};
+pub use tor_connection::ConnError;
 pub use tor_controller::TorController;
 
-/// Tor event handler function
-pub type TorEventHandlerFn = fn(AsyncEvent<'_>) -> BoxFuture<'static, Result<(), ConnError>>;
-
 /// Configuration for onion service
 pub struct OnionServiceConfig {
     /// path to store onion private key, default is ./data/network/onion_private_key