chaos-mesh · Hexilee · Oct 11, 2021 · Oct 12, 2021 · Oct 12, 2021 · Oct 12, 2021
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ name = "rs-tproxy"
 path = "rs-tproxy-controller/src/main.rs"
 
 [workspace]
-members = ["rs-tproxy-controller", "rs-tproxy-proxy", "tests"]
+members = ["rs-tproxy-controller", "rs-tproxy-proxy", "rs-tproxy-plugin", "examples/plugin-example", "tests"]
 
 [dependencies]
 anyhow = "1.0"
@@ -45,6 +45,7 @@ bincode = "1.3.3"
 default-net = "0.2.0"
 system_gateway = {git="https://github.com/aruntomar/system_gateway"}
 base64 = "0.13.0"
+log = "0.4"
 
 [dev-dependencies]
 test-case = "1.2"
diff --git a/Dockerfile b/Dockerfile
@@ -36,7 +36,7 @@ WORKDIR /tproxy-build
 
 RUN --mount=type=cache,target=/tproxy-build/target \
     --mount=type=cache,target=/root/.cargo/registry \
-    cargo build --release --all --target $TARGET
+    cargo build --release --bin rs-tproxy --target $TARGET
 
 RUN --mount=type=cache,target=/tproxy-build/target \
-    cp /tproxy-build/target/$TARGET/release/tproxy /tproxy
+    cp /tproxy-build/target/$TARGET/release/rs-tproxy /tproxy
diff --git a/Makefile b/Makefile
@@ -1,10 +1,14 @@
 build: 
-	cargo build --all
+	cargo build --workspace
 fmt:
-	cargo +nightly fmt
+	cargo fmt
 run: 
 	RUST_LOG=trace ./target/debug/tproxy $(config)
-test:
-	cargo test --all
+test: build
+	cargo test -p rs-tproxy-proxy -p rs-tproxy-plugin -p rs-tproxy-controller 
 lint:
-	cargo clippy --all-targets -- -D warnings
+	cargo clippy --all-targets -- -D warnings
+clean:
+	cargo clean
+image:
+	DOCKER_BUILDKIT=1 docker build --build-arg HTTP_PROXY=${HTTP_PROXY} --build-arg HTTPS_PROXY=${HTTPS_PROXY} . -t chaos-mesh/tproxy
diff --git a/examples/plugin-example/.cargo/config b/examples/plugin-example/.cargo/config
@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-unknown-unknown"
diff --git a/examples/plugin-example/Cargo.toml b/examples/plugin-example/Cargo.toml
@@ -0,0 +1,20 @@
+cargo-features = ["per-package-target"]
+
+[package]
+name = "plugin-example"
+version = "0.1.0"
+edition = "2018"
+forced-target = "wasm32-unknown-unknown"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+rs-tproxy-plugin = { path = "../../rs-tproxy-plugin" }
+
+serde_json = "1.0"
+log = "0.4"
+anyhow = "1.0"
+http = "0.2"
diff --git a/examples/plugin-example/src/lib.rs b/examples/plugin-example/src/lib.rs
@@ -0,0 +1,15 @@
+use log::info;
+use rs_tproxy_plugin::register_response_handler;
+
+register_response_handler!(|resp| {
+    let content_type = resp
+        .headers()
+        .get("content-type")
+        .ok_or(anyhow::anyhow!("content-type not found"))?
+        .to_str()?;
+    info!("get content-type: {}", content_type);
+    Ok(serde_json::to_vec(&serde_json::json!({
+        "type": content_type,
+        "content": *resp.body(),
+    }))?)
+});
diff --git a/rs-tproxy-controller/Cargo.toml b/rs-tproxy-controller/Cargo.toml
@@ -44,4 +44,5 @@ futures-util = { version = "0.3.7", default-features = false, features = ["alloc
 rs-tproxy-proxy = {path = "../rs-tproxy-proxy"}
 pnet = "0.28.0"
 default-net = "0.2.0"
-system_gateway = {git="https://github.com/aruntomar/system_gateway"}
+system_gateway = {git="https://github.com/aruntomar/system_gateway"}
+log = "0.4"
diff --git a/rs-tproxy-controller/src/cmd/command_line.rs b/rs-tproxy-controller/src/cmd/command_line.rs
@@ -2,9 +2,9 @@ use std::convert::TryInto;
 use std::path::PathBuf;
 
 use anyhow::{anyhow, Result};
+use log::Level;
 use structopt::StructOpt;
 use tokio::fs::read_to_string;
-use tracing_subscriber::filter::LevelFilter;
 
 use crate::proxy::config::Config;
 use crate::raw_config::RawConfig;
@@ -44,12 +44,12 @@ pub struct Opt {
 }
 
 impl Opt {
-    pub fn get_level_filter(&self) -> LevelFilter {
+    pub fn get_level(&self) -> Level {
         match self.verbose {
-            0 => LevelFilter::ERROR,
-            1 => LevelFilter::INFO,
-            2 => LevelFilter::DEBUG,
-            _ => LevelFilter::TRACE,
+            0 => Level::Error,
+            1 => Level::Info,
+            2 => Level::Debug,
+            _ => Level::Trace,
         }
     }
 

diff --git a/rs-tproxy-controller/src/cmd/interactive/handler.rs b/rs-tproxy-controller/src/cmd/interactive/handler.rs
@@ -96,7 +96,7 @@ impl ConfigService {
         raw_config.try_into()
     }
 
-    #[instrument]
+    #[instrument(skip(proxy))]
     async fn handle(proxy: &mut Proxy, request: Request<Body>) -> anyhow::Result<Response<Body>> {
         if request.method() != Method::PUT {
             return Ok(Response::builder()

diff --git a/rs-tproxy-controller/src/main.rs b/rs-tproxy-controller/src/main.rs
@@ -15,7 +15,10 @@ pub mod raw_config;
 async fn main() -> anyhow::Result<()> {
     let opt = Opt::from_args_checked()?;
     tracing_subscriber::fmt()
-        .with_max_level(opt.get_level_filter())
+        .with_env_filter(tracing_subscriber::EnvFilter::new(format!(
+            "rs_tproxy={}",
+            opt.get_level()
+        )))
         .with_writer(std::io::stderr)
         .try_init()
         .map_err(|err| anyhow!("{}", err))?;

diff --git a/rs-tproxy-controller/src/proxy/config.rs b/rs-tproxy-controller/src/proxy/config.rs
@@ -57,10 +57,12 @@ pub(crate) fn get_free_port(ports: Option<Vec<u16>>) -> anyhow::Result<u16> {
 
 #[cfg(test)]
 mod tests {
+    use std::convert::TryInto;
+
+    use rs_tproxy_proxy::raw_config::RawConfig as ProxyRawConfig;
+
     use crate::proxy::config::{get_free_port, Config};
     use crate::raw_config::RawConfig;
-    use rs_tproxy_proxy::raw_config::RawConfig as ProxyRawConfig;
-    use std::convert::TryInto;
 
     #[test]
     fn test_get_free_port() {

diff --git a/rs-tproxy-controller/src/proxy/exec.rs b/rs-tproxy-controller/src/proxy/exec.rs
@@ -8,6 +8,7 @@ use tokio::process::Command;
 use tokio::select;
 use tokio::sync::oneshot::{channel, Receiver, Sender};
 use tokio::task::JoinHandle;
+use tracing::instrument;
 use uuid::Uuid;
 
 use crate::proxy::net::bridge::NetEnv;
@@ -52,8 +53,9 @@ impl Proxy {
         }
     }
 
+    #[instrument(skip(self, config))]
     pub async fn exec(&mut self, config: ProxyRawConfig) -> anyhow::Result<()> {
-        tracing::info!(target : "transferring proxy raw config ", "{:?}" ,&config);
+        tracing::info!("transferring proxy raw config {:?}", &config);
         let uds_server = UdsDataServer::new(config.clone(), self.opt.ipc_path.clone());
         let listener = uds_server.bind()?;
 
@@ -76,7 +78,7 @@ impl Proxy {
             Ok(path) => path,
         };
 
-        tracing::info!(target: "Network device name", "{}", self.net_env.device.clone());
+        tracing::info!("network device name {}", self.net_env.device.clone());
         match config.interface {
             None => {}
             Some(interface) => {
@@ -105,10 +107,10 @@ impl Proxy {
 
         let rx = self.rx.take().unwrap();
         self.task = Some(tokio::spawn(async move {
-            tracing::info!(target : "Proxy executor", "Starting proxy.");
+            tracing::info!("starting proxy");
             let mut process = match proxy.stdin(Stdio::piped()).spawn() {
                 Ok(process) => {
-                    tracing::info!(target : "Proxy executor", "Proxy is running.");
+                    tracing::info!("proxy is running");
                     process
                 }
                 Err(e) => {
@@ -118,7 +120,7 @@ impl Proxy {
             select! {
                 _ = process.wait() => {}
                 _ = rx => {
-                    tracing::info!(target : "Proxy executor","killing sub process");
+                    tracing::info!("killing sub process");
                     let id = process.id().unwrap() as i32;
                     unsafe {
                         libc::kill(id, libc::SIGINT);

diff --git a/rs-tproxy-controller/src/proxy/net/bridge.rs b/rs-tproxy-controller/src/proxy/net/bridge.rs
@@ -1,13 +1,14 @@
+use std::net::Ipv4Addr;
 use std::process::Command;
 
-use crate::proxy::net::iptables::clear_ebtables;
 use anyhow::{anyhow, Result};
 use default_net;
 use pnet::datalink::NetworkInterface;
 use pnet::ipnetwork::{IpNetwork, Ipv4Network};
-use std::net::Ipv4Addr;
 use uuid::Uuid;
 
+use crate::proxy::net::iptables::clear_ebtables;
+
 #[derive(Debug, Clone)]
 pub struct NetEnv {
     pub netns: String,
@@ -161,18 +162,9 @@ impl NetEnv {
                 &self.netns,
                 vec!["sysctl", "-w", "net.ipv4.ip_nonlocal_bind=1"],
             ),
-            ip_netns(
-                &self.netns,
-                vec!["sysctl", "-w", &rp_filter_br2],
-            ),
-            ip_netns(
-                &self.netns,
-                vec!["sysctl", "-w", &rp_filter_v2],
-            ),
-            ip_netns(
-                &self.netns,
-                vec!["sysctl", "-w", &rp_filter_v3],
-            ),
+            ip_netns(&self.netns, vec!["sysctl", "-w", &rp_filter_br2]),
+            ip_netns(&self.netns, vec!["sysctl", "-w", &rp_filter_v2]),
+            ip_netns(&self.netns, vec!["sysctl", "-w", &rp_filter_v3]),
             ip_netns(
                 &self.netns,
                 vec!["sysctl", "-w", "net.ipv4.conf.lo.rp_filter=0"],

diff --git a/rs-tproxy-controller/src/proxy/uds_server.rs b/rs-tproxy-controller/src/proxy/uds_server.rs
@@ -15,7 +15,7 @@ impl<T: serde::ser::Serialize> UdsDataServer<T> {
     }
 
     pub fn bind(&self) -> anyhow::Result<UnixListener> {
-        tracing::info!(target : "Uds listener try binding", "{:?}", &self.path);
+        tracing::info!("uds listener try binding {:?}", &self.path);
         let listener = UnixListener::bind(self.path.clone())?;
         Ok(listener)
     }
@@ -26,29 +26,26 @@ impl<T: serde::ser::Serialize> UdsDataServer<T> {
     }
 
     pub async fn listen(&self, listener: UnixListener) -> anyhow::Result<()> {
-        tracing::info!(target : "Uds listener listening on", "{:?}", &self.path);
+        tracing::info!("uds listener listening on {:?}", &self.path);
         loop {
             match (&listener).accept().await {
                 Ok((mut stream, addr)) => {
-                    let buf = bincode::serialize(&self.data)?;
+                    let buf = serde_json::to_vec(&self.data)?;
                     tokio::spawn(async move {
                         return match stream.write_all(buf.as_slice()).await {
                             Ok(_) => {
-                                tracing::info!(target : "Uds server" ,"Config successfully transferred.");
+                                tracing::info!("uds server Config successfully transferred.");
                                 Ok(())
                             }
                             Err(e) => {
-                                tracing::error!(
-                                    "error : write_all raw config to {:?} failed",
-                                    addr
-                                );
+                                tracing::error!("write_all raw config to {:?} failed", addr);
                                 Err(anyhow::anyhow!("{}", e))
                             }
                         };
                     });
                 }
                 Err(e) => {
-                    tracing::error!("error : accept connection failed");
+                    tracing::error!("accept connection failed");
                     return Err(anyhow::anyhow!("{}", e));
                 }
             }

diff --git a/rs-tproxy-plugin/Cargo.toml b/rs-tproxy-plugin/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "rs-tproxy-plugin"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serde = {version = "1.0", features = ["derive"]}
+serde_json = "1.0"
+anyhow = "1.0"
+http = "0.2.3"
+log = "0.4"