merge refactor to crates

jmwample · Mar 6, 2024 · 093dfb4 · 093dfb4
2 parents 50b9cbf + 443455c
commit 093dfb4
Show file tree

Hide file tree

Showing 67 changed files with 506 additions and 89 deletions.
diff --git a/.github/disabled/rust.yml → .github/workflows/rust.yml b/.github/disabled/rust.yml → .github/workflows/rust.yml
@@ -78,9 +78,9 @@ jobs:
     - uses: dtolnay/rust-toolchain@stable
     - run: rustup target add ${{ matrix.target }}
     - run: ${{ matrix.deps }}
-    - run: cargo test --target ${{ matrix.target }} --no-default-features
-    - run: cargo test --target ${{ matrix.target }}
-    - run: cargo test --target ${{ matrix.target }} --all-features
+    - run: cargo test --target ${{ matrix.target }} --workspace --all-targets --no-default-features
+    - run: cargo test --target ${{ matrix.target }} --workspace --all-targets
+    - run: cargo test --target ${{ matrix.target }} --workspace --all-targets --all-features
     # - name: Test
     #   run: cargo test --verbose --workspace --all-features
     #   env:
@@ -94,7 +94,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: dtolnay/rust-toolchain@nightly
-    - run: cargo test
+    - run: cargo test --workspace --all-targets
 
   build:
     name: Build

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,85 +1,10 @@
-[package]
-name = "obfs"
-version = "0.1.0"
-edition = "2021"
+[workspace]
 
-[lib]
-name = "obfs"
-crate-type = ["cdylib", "rlib"]
 
-[[bin]]
-name = "fwd_proxy"
-test = false
-bench = false
+members = [
+    "crates/obfs4",
+    "crates/ptrs"
+]
 
-[[bin]]
-name = "lyrebird"
-test = false
-bench = false
+resolver = "2"
 
-[dependencies]
-getrandom = "0.2.11"
-rand = { version="0.8.5", features=["getrandom"]}
-rand_core = "0.6.4"
-
-digest = { version = "0.10.7", features=["mac"]}
-siphasher = "1.0.0"
-sha2 = "0.10.8"
-hmac = { version="0.12.1", features=["reset"]}
-hkdf = "0.12.3"
-
-crypto_secretbox = { version="0.1.1", features=["salsa20"]}
-subtle = "2.5.0"
-x25519-dalek = { version = "2", features = ["static_secrets", "getrandom", "reusable_secrets", "elligator2"],  git = "https://github.com/jmwample/curve25519-dalek.git", branch = "elligator2-ntor"}
-group = "0.13.0"
-
-lazy_static = "0.1.4"
-
-hex = "0.4.3"
-tracing = "0.1.40"
-colored = "2.0.4"
-
-pin-project = "1.1.3"
-futures = "0.3.29"
-tokio = { version = "1.33", features = ["io-util", "rt-multi-thread", "net", "rt", "macros", "sync", "signal", "time", "fs"] }
-tokio-util = { version = "0.7.10", features = ["codec", "io"]}
-bytes = "1.5.0"
-
-# forward proxy binary only
-anyhow = "1.0"
-tracing-subscriber = "0.3.18"
-clap = { version = "4.4.7", features = ["derive"]}
-async-compat = "0.2.3"
-safelog = { version = "0.3.5" }
-tor-rtcompat = { version = "0.10.0", features = ["tokio", "rustls"]}
-tor-socksproto = { version = "0.10.0" }
-arti-client = { package = "arti-client", version = "0.14.0", default-features = false }
-# tor-config = { version = "0.9.6" }
-# tor-hsrproxy = { version = "0.2.0", optional = true }
-# tor-hsservice = { version = "0.4.0", optional = true }
-# tor-rpcbase = { version = "0.1.2", optional = true }
-tor-ptmgr = { version = "0.10.0", features = ["full"] }
-
-# ntor_arti
-tor-cell = "0.16.0"
-tor-llcrypto = "0.7.0"
-tor-error = "0.6.1"
-tor-bytes = "0.10.0"
-tor-hscrypto = "0.6.0"
-cipher = "0.4.4"
-zeroize = "1.7.0"
-thiserror = "1.0.56"
-
-## lyrebird bin only
-fast-socks5 = "0.9.1"
-tokio-stream = "0.1.14"
-tor-linkspec = { version="0.11.1" }
-tor-chanmgr = { version="0.14.1", features = ["pt-client"] }
-
-[dev-dependencies]
-tracing-subscriber = "0.3.18"
-hex-literal = "0.4.1"
-tor-basic-utils = "0.8.0"
-
-# o5 pqc test
-pqc_kyber = {version="0.7.1", features=["kyber1024", "std"]}
diff --git a/crates/lyrebird/Cargo.toml b/crates/lyrebird/Cargo.toml
@@ -0,0 +1,76 @@
+[package]
+name = "obfs"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "obfs"
+crate-type = ["cdylib", "rlib"]
+
+[[bin]]
+name = "fwd_proxy"
+test = false
+bench = false
+
+[dependencies]
+getrandom = "0.2.11"
+rand = { version="0.8.5", fratures=["getrandom"]}
+rand_core = "0.6.4"
+
+digest = { version = "0.10.7", features=["mac"]}
+siphasher = "1.0.0"
+sha2 = "0.10.8"
+hmac = { version="0.12.1", features=["reset"]}
+hkdf = "0.12.3"
+
+crypto_secretbox = { version="0.1.1", features=["salsa20"]}
+subtle = "2.5.0"
+x25519-dalek = { version = "2", features = ["static_secrets", "getrandom", "reusable_secrets", "elligator2"],  git = "https://github.com/jmwample/curve25519-dalek.git", branch = "elligator2-ntor"}
+group = "0.13.0"
+
+lazy_static = "0.1.4"
+
+hex = "0.4.3"
+tracing = "0.1.40"
+colored = "2.0.4"
+
+pin-project = "1.1.3"
+futures = "0.3.29"
+tokio = { version = "1.33", features = ["io-util", "rt-multi-thread", "net", "rt", "macros", "sync", "signal", "time", "fs"] }
+tokio-util = { version = "0.7.10", features = ["codec", "io"]}
+bytes = "1.5.0"
+
+# forward proxy binary only
+anyhow = "1.0"
+tracing-subscriber = "0.3.18"
+clap = { version = "4.4.7", features = ["derive"]}
+async-compat = "0.2.3"
+safelog = { version = "0.3.5" }
+tor-rtcompat = { version = "0.10.0", features = ["tokio", "rustls"]}
+tor-socksproto = { version = "0.10.0" }
+arti-client = { package = "arti-client", version = "0.14.0", default-features = false }
+# tor-config = { version = "0.9.6" }
+# tor-hsrproxy = { version = "0.2.0", optional = true }
+# tor-hsservice = { version = "0.4.0", optional = true }
+# tor-rpcbase = { version = "0.1.2", optional = true }
+
+# ntor_arti
+tor-cell = "0.16.0"
+tor-llcrypto = "0.7.0"
+tor-error = "0.6.1"
+tor-bytes = "0.10.0"
+tor-hscrypto = "0.6.0"
+cipher = "0.4.4"
+zeroize = "1.7.0"
+thiserror = "1.0.56"
+
+# [build-dependencies]
+# cc = { version = "1.0.83", features = ["parallel"] }
+
+[dev-dependencies]
+tracing-subscriber = "0.3.18"
+hex-literal = "0.4.1"
+tor-basic-utils = "0.8.0"
+
+# o5 pqc test
+pqc_kyber = {version="0.7.1", features=["kyber1024", "std"]}
diff --git a/src/o5/README.md → crates/lyrebird/src/README.md b/src/o5/README.md → crates/lyrebird/src/README.md
diff --git a/src/o5/framing/mod.rs → crates/lyrebird/src/framing/mod.rs b/src/o5/framing/mod.rs → crates/lyrebird/src/framing/mod.rs
diff --git a/src/o5/framing/packet.rs → crates/lyrebird/src/framing/packet.rs b/src/o5/framing/packet.rs → crates/lyrebird/src/framing/packet.rs
diff --git a/src/o5/handshake/integration.rs → crates/lyrebird/src/handshake/integration.rs b/src/o5/handshake/integration.rs → crates/lyrebird/src/handshake/integration.rs
diff --git a/src/o5/handshake/mod.rs → crates/lyrebird/src/handshake/mod.rs b/src/o5/handshake/mod.rs → crates/lyrebird/src/handshake/mod.rs
diff --git a/src/o5/mod.rs → crates/lyrebird/src/mod.rs b/src/o5/mod.rs → crates/lyrebird/src/mod.rs
diff --git a/src/o5/transport.rs → crates/lyrebird/src/transport.rs b/src/o5/transport.rs → crates/lyrebird/src/transport.rs
diff --git a/crates/obfs4/Cargo.toml b/crates/obfs4/Cargo.toml
@@ -0,0 +1,84 @@
+[package]
+name = "obfs"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "obfs"
+crate-type = ["cdylib", "rlib"]
+
+[[bin]]
+name = "lyrebird"
+test = false
+bench = false
+
+[[bin]]
+name = "fwd_proxy"
+test = false
+bench = false
+
+[dependencies]
+getrandom = "0.2.11"
+rand = { version="0.8.5", features=["getrandom"]}
+rand_core = "0.6.4"
+
+digest = { version = "0.10.7", features=["mac"]}
+siphasher = "1.0.0"
+sha2 = "0.10.8"
+hmac = { version="0.12.1", features=["reset"]}
+hkdf = "0.12.3"
+
+crypto_secretbox = { version="0.1.1", features=["salsa20"]}
+subtle = "2.5.0"
+x25519-dalek = { version = "2", features = ["static_secrets", "getrandom", "reusable_secrets", "elligator2"],  git = "https://github.com/jmwample/curve25519-dalek.git", branch = "elligator2-ntor"}
+group = "0.13.0"
+
+lazy_static = "0.1.4"
+
+hex = "0.4.3"
+tracing = "0.1.40"
+colored = "2.0.4"
+
+pin-project = "1.1.3"
+futures = "0.3.29"
+tokio = { version = "1.33", features = ["io-util", "rt-multi-thread", "net", "rt", "macros", "sync", "signal", "time", "fs"] }
+tokio-util = { version = "0.7.10", features = ["codec", "io"]}
+bytes = "1.5.0"
+
+# forward proxy binary only
+anyhow = "1.0"
+tracing-subscriber = "0.3.18"
+clap = { version = "4.4.7", features = ["derive"]}
+async-compat = "0.2.3"
+safelog = { version = "0.3.5" }
+tor-rtcompat = { version = "0.10.0", features = ["tokio", "rustls"]}
+tor-socksproto = { version = "0.10.0" }
+arti-client = { package = "arti-client", version = "0.14.0", default-features = false }
+# tor-config = { version = "0.9.6" }
+# tor-hsrproxy = { version = "0.2.0", optional = true }
+# tor-hsservice = { version = "0.4.0", optional = true }
+# tor-rpcbase = { version = "0.1.2", optional = true }
+
+# ntor_arti
+tor-cell = "0.16.0"
+tor-llcrypto = "0.7.0"
+tor-error = "0.6.1"
+tor-bytes = "0.10.0"
+tor-hscrypto = "0.6.0"
+cipher = "0.4.4"
+zeroize = "1.7.0"
+thiserror = "1.0.56"
+
+## lyrebird bin only
+fast-socks5 = "0.9.1"
+tokio-stream = "0.1.14"
+tor-linkspec = { version="0.11.1" }
+tor-chanmgr = { version="0.14.1", features = ["pt-client"] }
+
+[dev-dependencies]
+tracing-subscriber = "0.3.18"
+hex-literal = "0.4.1"
+tor-basic-utils = "0.8.0"
+
+# o5 pqc test
+pqc_kyber = {version="0.7.1", features=["kyber1024", "std"]}
diff --git a/src/README.md → crates/obfs4/src/README.md b/src/README.md → crates/obfs4/src/README.md
diff --git a/src/bin/fwd_proxy/README.md → crates/obfs4/src/bin/fwd_proxy/README.md b/src/bin/fwd_proxy/README.md → crates/obfs4/src/bin/fwd_proxy/README.md
diff --git a/src/bin/fwd_proxy/config.rs → crates/obfs4/src/bin/fwd_proxy/config.rs b/src/bin/fwd_proxy/config.rs → crates/obfs4/src/bin/fwd_proxy/config.rs
diff --git a/src/bin/fwd_proxy/handler.rs → crates/obfs4/src/bin/fwd_proxy/handler.rs b/src/bin/fwd_proxy/handler.rs → crates/obfs4/src/bin/fwd_proxy/handler.rs
diff --git a/src/bin/fwd_proxy/main.rs → crates/obfs4/src/bin/fwd_proxy/main.rs b/src/bin/fwd_proxy/main.rs → crates/obfs4/src/bin/fwd_proxy/main.rs
diff --git a/src/bin/fwd_proxy/socks5.rs → crates/obfs4/src/bin/fwd_proxy/socks5.rs b/src/bin/fwd_proxy/socks5.rs → crates/obfs4/src/bin/fwd_proxy/socks5.rs
diff --git a/src/bin/lyrebird/README.md → crates/obfs4/src/bin/lyrebird/README.md b/src/bin/lyrebird/README.md → crates/obfs4/src/bin/lyrebird/README.md
diff --git a/src/bin/lyrebird/main.rs → crates/obfs4/src/bin/lyrebird/main.rs b/src/bin/lyrebird/main.rs → crates/obfs4/src/bin/lyrebird/main.rs
diff --git a/src/common/README.md → crates/obfs4/src/common/README.md b/src/common/README.md → crates/obfs4/src/common/README.md
diff --git a/src/common/ct.rs → crates/obfs4/src/common/ct.rs b/src/common/ct.rs → crates/obfs4/src/common/ct.rs
diff --git a/src/common/curve25519.rs → crates/obfs4/src/common/curve25519.rs b/src/common/curve25519.rs → crates/obfs4/src/common/curve25519.rs
diff --git a/src/common/drbg.rs → crates/obfs4/src/common/drbg.rs b/src/common/drbg.rs → crates/obfs4/src/common/drbg.rs
diff --git a/src/common/kdf.rs → crates/obfs4/src/common/kdf.rs b/src/common/kdf.rs → crates/obfs4/src/common/kdf.rs
diff --git a/src/common/mod.rs → crates/obfs4/src/common/mod.rs b/src/common/mod.rs → crates/obfs4/src/common/mod.rs
diff --git a/src/common/ntor_arti/mod.rs → crates/obfs4/src/common/ntor_arti/mod.rs b/src/common/ntor_arti/mod.rs → crates/obfs4/src/common/ntor_arti/mod.rs
diff --git a/src/common/probdist.rs → crates/obfs4/src/common/probdist.rs b/src/common/probdist.rs → crates/obfs4/src/common/probdist.rs
diff --git a/src/common/replay_filter.rs → crates/obfs4/src/common/replay_filter.rs b/src/common/replay_filter.rs → crates/obfs4/src/common/replay_filter.rs
diff --git a/src/common/skip.rs → crates/obfs4/src/common/skip.rs b/src/common/skip.rs → crates/obfs4/src/common/skip.rs
diff --git a/src/error.rs → crates/obfs4/src/error.rs b/src/error.rs → crates/obfs4/src/error.rs
diff --git a/src/lib.rs → crates/obfs4/src/lib.rs b/src/lib.rs → crates/obfs4/src/lib.rs
@@ -1,14 +1,11 @@
-#![doc = include_str!("../doc/crate.md")]
+#![doc = include_str!("../../../doc/crate.md")]
 #![feature(trait_alias)]
 #![feature(slice_flatten)]
 // #![feature(stdarch_x86_avx512)]
 
 // #![allow(dead_code)]
 // #![allow(warnings)]
 
-// pub mod ident;
-pub mod o5;
-// pub mod o7;
 pub mod obfs4;
 
 pub mod common;

diff --git a/src/obfs4/client.rs → crates/obfs4/src/obfs4/client.rs b/src/obfs4/client.rs → crates/obfs4/src/obfs4/client.rs
diff --git a/src/obfs4/constants.rs → crates/obfs4/src/obfs4/constants.rs b/src/obfs4/constants.rs → crates/obfs4/src/obfs4/constants.rs
diff --git a/src/obfs4/framing/codecs.rs → crates/obfs4/src/obfs4/framing/codecs.rs b/src/obfs4/framing/codecs.rs → crates/obfs4/src/obfs4/framing/codecs.rs
diff --git a/src/obfs4/framing/frame_builder.rs → .../obfs4/src/obfs4/framing/frame_builder.rs b/src/obfs4/framing/frame_builder.rs → .../obfs4/src/obfs4/framing/frame_builder.rs
diff --git a/src/obfs4/framing/generic_test.rs → ...s/obfs4/src/obfs4/framing/generic_test.rs b/src/obfs4/framing/generic_test.rs → ...s/obfs4/src/obfs4/framing/generic_test.rs
diff --git a/src/obfs4/framing/handshake.rs → crates/obfs4/src/obfs4/framing/handshake.rs b/src/obfs4/framing/handshake.rs → crates/obfs4/src/obfs4/framing/handshake.rs
diff --git a/src/obfs4/framing/messages_base.rs → .../obfs4/src/obfs4/framing/messages_base.rs b/src/obfs4/framing/messages_base.rs → .../obfs4/src/obfs4/framing/messages_base.rs
diff --git a/src/obfs4/framing/messages_v1/crypto.rs → ...4/src/obfs4/framing/messages_v1/crypto.rs b/src/obfs4/framing/messages_v1/crypto.rs → ...4/src/obfs4/framing/messages_v1/crypto.rs
diff --git a/src/obfs4/framing/messages_v1/mod.rs → ...bfs4/src/obfs4/framing/messages_v1/mod.rs b/src/obfs4/framing/messages_v1/mod.rs → ...bfs4/src/obfs4/framing/messages_v1/mod.rs
diff --git a/src/obfs4/framing/mod.rs → crates/obfs4/src/obfs4/framing/mod.rs b/src/obfs4/framing/mod.rs → crates/obfs4/src/obfs4/framing/mod.rs
diff --git a/src/obfs4/framing/testing.rs → crates/obfs4/src/obfs4/framing/testing.rs b/src/obfs4/framing/testing.rs → crates/obfs4/src/obfs4/framing/testing.rs
diff --git a/src/obfs4/handshake/README.md → crates/obfs4/src/obfs4/handshake/README.md b/src/obfs4/handshake/README.md → crates/obfs4/src/obfs4/handshake/README.md
diff --git a/src/obfs4/handshake/handshake_client.rs → ...4/src/obfs4/handshake/handshake_client.rs b/src/obfs4/handshake/handshake_client.rs → ...4/src/obfs4/handshake/handshake_client.rs
diff --git a/src/obfs4/handshake/handshake_server.rs → ...4/src/obfs4/handshake/handshake_server.rs b/src/obfs4/handshake/handshake_server.rs → ...4/src/obfs4/handshake/handshake_server.rs
diff --git a/src/obfs4/handshake/integration.rs → .../obfs4/src/obfs4/handshake/integration.rs b/src/obfs4/handshake/integration.rs → .../obfs4/src/obfs4/handshake/integration.rs
diff --git a/src/obfs4/handshake/mod.rs → crates/obfs4/src/obfs4/handshake/mod.rs b/src/obfs4/handshake/mod.rs → crates/obfs4/src/obfs4/handshake/mod.rs
@@ -23,6 +23,7 @@ use std::borrow::Borrow;
 use bytes::BytesMut;
 use digest::Mac;
 use hmac::Hmac;
+use rand::{RngCore, CryptoRng};
 use subtle::ConstantTimeEq;
 use tor_bytes::{EncodeResult, SecretBuf, Writer};
 use tor_error::into_internal;

diff --git a/src/obfs4/handshake/utils.rs → crates/obfs4/src/obfs4/handshake/utils.rs b/src/obfs4/handshake/utils.rs → crates/obfs4/src/obfs4/handshake/utils.rs
diff --git a/src/obfs4/mod.rs → crates/obfs4/src/obfs4/mod.rs b/src/obfs4/mod.rs → crates/obfs4/src/obfs4/mod.rs
diff --git a/src/obfs4/proto.rs → crates/obfs4/src/obfs4/proto.rs b/src/obfs4/proto.rs → crates/obfs4/src/obfs4/proto.rs
diff --git a/src/obfs4/server.rs → crates/obfs4/src/obfs4/server.rs b/src/obfs4/server.rs → crates/obfs4/src/obfs4/server.rs
diff --git a/src/obfs4/sessions.rs → crates/obfs4/src/obfs4/sessions.rs b/src/obfs4/sessions.rs → crates/obfs4/src/obfs4/sessions.rs
diff --git a/src/obfs4/testing.rs → crates/obfs4/src/obfs4/testing.rs b/src/obfs4/testing.rs → crates/obfs4/src/obfs4/testing.rs
diff --git a/src/stream.rs → crates/obfs4/src/stream.rs b/src/stream.rs → crates/obfs4/src/stream.rs
diff --git a/src/test_utils/fake_prng.rs → crates/obfs4/src/test_utils/fake_prng.rs b/src/test_utils/fake_prng.rs → crates/obfs4/src/test_utils/fake_prng.rs
diff --git a/src/test_utils/mod.rs → crates/obfs4/src/test_utils/mod.rs b/src/test_utils/mod.rs → crates/obfs4/src/test_utils/mod.rs
diff --git a/src/test_utils/tests.rs → crates/obfs4/src/test_utils/tests.rs b/src/test_utils/tests.rs → crates/obfs4/src/test_utils/tests.rs
diff --git a/src/traits.rs → crates/obfs4/src/traits.rs b/src/traits.rs → crates/obfs4/src/traits.rs
diff --git a/src/tunnel_mgr/metrics.rs → crates/obfs4/src/tunnel_mgr/metrics.rs b/src/tunnel_mgr/metrics.rs → crates/obfs4/src/tunnel_mgr/metrics.rs
diff --git a/src/tunnel_mgr/mod.rs → crates/obfs4/src/tunnel_mgr/mod.rs b/src/tunnel_mgr/mod.rs → crates/obfs4/src/tunnel_mgr/mod.rs
diff --git a/crates/ptrs/Cargo.toml b/crates/ptrs/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "ptrs_dev"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+futures = "0.3.30"
+tokio = { version = "1", features = ["full"] }
+
+[dev-dependencies]
+tracing = "0.1.40"
+tracing-subscriber = "0.3.18"
diff --git a/src/ident/dialer.rs → crates/ptrs/src/ident/dialer.rs b/src/ident/dialer.rs → crates/ptrs/src/ident/dialer.rs
diff --git a/src/ident/handler.rs → crates/ptrs/src/ident/handler.rs b/src/ident/handler.rs → crates/ptrs/src/ident/handler.rs
diff --git a/src/ident/listener.rs → crates/ptrs/src/ident/listener.rs b/src/ident/listener.rs → crates/ptrs/src/ident/listener.rs
diff --git a/src/ident/mod.rs → crates/ptrs/src/ident/mod.rs b/src/ident/mod.rs → crates/ptrs/src/ident/mod.rs
diff --git a/src/ident/wrapper.rs → crates/ptrs/src/ident/wrapper.rs b/src/ident/wrapper.rs → crates/ptrs/src/ident/wrapper.rs