From 8dd562b5523d5f0e3c6b4ca78dde901099d7d2f3 Mon Sep 17 00:00:00 2001 From: nullchinchilla Date: Fri, 6 Sep 2024 18:48:10 -0400 Subject: [PATCH] Update geph5 dependencies to stable 0.2 and refactor config.rs removing unused imports and adding BrokerKeys --- Cargo.lock | 88 +++++++++++++++++++++++++-------------------------- Cargo.toml | 4 +-- src/config.rs | 18 +++++------ 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index febd7b1e..fc5c6ca9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -224,9 +224,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "arbitrary" @@ -436,7 +436,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.35", + "rustix 0.38.36", "slab", "tracing", "windows-sys 0.59.0", @@ -512,7 +512,7 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.35", + "rustix 0.38.36", "windows-sys 0.48.0", ] @@ -531,7 +531,7 @@ dependencies = [ "cfg-if 1.0.0", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.35", + "rustix 0.38.36", "tracing", "windows-sys 0.59.0", ] @@ -548,7 +548,7 @@ dependencies = [ "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.35", + "rustix 0.38.36", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -556,20 +556,20 @@ dependencies = [ [[package]] name = "async-std" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" dependencies = [ "async-channel 1.9.0", "async-global-executor", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process 1.8.1", + "async-io 2.3.4", + "async-lock 3.4.0", + "async-process 2.2.4", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite 1.13.0", + "futures-lite 2.3.0", "gloo-timers", "kv-log-macro", "log", @@ -1246,9 +1246,9 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] @@ -1669,9 +1669,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1920,9 +1920,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -2858,9 +2858,9 @@ dependencies = [ [[package]] name = "geph5-broker-protocol" -version = "0.2.0-alpha.17" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e4fea7931d1e9bd6a3f7550d9955f3e1b790dc12e6fd6472480f6fafdbd608" +checksum = "fc01d7c720118e6831f55dd2535248b839909419fdb13897a8fc17ed72be834a" dependencies = [ "anyhow", "async-trait", @@ -2881,9 +2881,9 @@ dependencies = [ [[package]] name = "geph5-client" -version = "0.2.0-alpha.17" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "481db239519ceed8617379aff97e18899b211f34b2c32e1bab3d465f3e517580" +checksum = "60a076c3e5fc71f1ead11ccb3178a8cbc67ac8e0d7613c04a3c4a13e1299658d" dependencies = [ "anyctx", "anyhow", @@ -2903,7 +2903,7 @@ dependencies = [ "clap 4.5.17", "clone-macro", "crossbeam-queue", - "dashmap 6.0.1", + "dashmap 6.1.0", "dirs 5.0.1", "ed25519-dalek", "elevated-command", @@ -2964,9 +2964,9 @@ dependencies = [ [[package]] name = "geph5-misc-rpc" -version = "0.2.0-alpha.17" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a44fc6c21f9864d656d51b77777565a5bc47015f481e931aaebe9771d555fc" +checksum = "65862d08bdc64220168499403c9c9e0a48a5ab523a3203ce4eea03c66294b6cd" dependencies = [ "anyhow", "async-task", @@ -3040,9 +3040,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gloo-timers" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" dependencies = [ "futures-channel", "futures-core", @@ -3908,9 +3908,9 @@ dependencies = [ [[package]] name = "mizaru2" -version = "0.2.0-alpha.17" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f166eaaf47cc58bedfe148cd1bcccd106e6049937e4462fd0fa16fe1c6cae8ab" +checksum = "d60609e20f2533f3c041c8ba669451932d7afce4854874b2e3bd2c25a720b921" dependencies = [ "anyhow", "blake3", @@ -4416,7 +4416,7 @@ dependencies = [ "bipe", "bytemuck", "bytes", - "dashmap 6.0.1", + "dashmap 6.1.0", "fastrand 2.1.1", "futures-intrusive 0.5.0", "futures-lite 2.3.0", @@ -4646,7 +4646,7 @@ dependencies = [ "concurrent-queue 2.5.0", "hermit-abi 0.4.0", "pin-project-lite 0.2.14", - "rustix 0.38.35", + "rustix 0.38.36", "tracing", "windows-sys 0.59.0", ] @@ -5365,9 +5365,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ "bitflags 2.6.0", "errno", @@ -5599,9 +5599,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -5617,9 +5617,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -5875,9 +5875,9 @@ dependencies = [ [[package]] name = "sillad-sosistab3" -version = "0.2.0-alpha.17" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec1eb72fadec7e2c15fd6aa9906d4a0aa1660e2530ac120d8843a6197549234" +checksum = "eafecf23598b26c8af86d03e2b54c1280f2bcaaa87508d8d8531a5d319b61a00" dependencies = [ "anyhow", "arrayref", @@ -6205,9 +6205,9 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" dependencies = [ "nom", "unicode_categories", @@ -6675,7 +6675,7 @@ dependencies = [ "cfg-if 1.0.0", "fastrand 2.1.1", "once_cell", - "rustix 0.38.35", + "rustix 0.38.36", "windows-sys 0.59.0", ] @@ -6891,9 +6891,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite 0.2.14", diff --git a/Cargo.toml b/Cargo.toml index a6067954..e0249a3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,8 +75,8 @@ geph-nat = "0.1.6" mizaru = "0.1.3" geph4-aioutils = "0.1.5" # alloc_geiger = "0.1" -geph5-client = {version="0.2.0-alpha.17", features=["windivert"]} -geph5-broker-protocol = "0.2.0-alpha.17" +geph5-client = {version="0.2", features=["windivert"]} +geph5-broker-protocol = "0.2" sillad = "0.2.1" # socks2http tokio = { version = "1.33.0", features = ["rt", "net", "io-util"] } diff --git a/src/config.rs b/src/config.rs index c8d3d333..e0b6d10d 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,20 +1,15 @@ use std::{path::PathBuf, str::FromStr, sync::LazyLock}; use crate::fronts::parse_fronts; -use anyhow::Context; -use geph4_protocol::binder::protocol::{BinderClient, Credentials}; +use geph4_protocol::binder::protocol::BinderClient; -use geph5_client::{BridgeMode, BrokerSource, Config}; +use geph5_client::{BridgeMode, BrokerKeys, BrokerSource, Config}; use serde::{Deserialize, Serialize}; -use sqlx::{ - sqlite::{SqliteConnectOptions, SqliteJournalMode, SqliteSynchronous}, - SqlitePool, -}; + use std::net::{Ipv4Addr, SocketAddr}; -use stdcode::StdcodeSerializeExt; + use structopt::StructOpt; -use tmelcrypt::Ed25519SK; #[derive(Debug, StructOpt, Deserialize, Serialize, Clone)] #[allow(clippy::large_enum_variant)] @@ -298,6 +293,11 @@ pub static GEPH5_CONFIG_TEMPLATE: LazyLock = LazyLock::new(|| Config { .to_string(), }, ])), + broker_keys: Some(BrokerKeys { + master: "88c1d2d4197bed815b01a22cadfc6c35aa246dddb553682037a118aebfaa3954".into(), + mizaru_free: "0558216cbab7a9c46f298f4c26e171add9af87d0694988b8a8fe52ee932aa754".into(), + mizaru_plus: "cf6f58868c6d9459b3a63bc2bd86165631b3e916bad7f62b578cd9614e0bcb3b".into(), + }), vpn: false, spoof_dns: false, passthrough_china: false,