From b8be805aed91c8400ff699d26b4d4676e95d0f74 Mon Sep 17 00:00:00 2001 From: Alexey <247128645+axkurcom@users.noreply.github.com> Date: Mon, 6 Jul 2026 20:12:36 +0300 Subject: [PATCH] Rustfmt --- src/config/tests/load_basic_tests.rs | 22 +++++++++++++++---- ..._relay_d2c_flush_padding_security_tests.rs | 8 ++++--- src/proxy/traffic_limiter.rs | 4 +--- src/synlimit_control/iptables.rs | 18 ++++----------- src/synlimit_control/mod.rs | 4 +--- src/synlimit_control/model.rs | 5 ++++- src/synlimit_control/nftables.rs | 3 +-- src/transport/middle_proxy/handshake.rs | 9 ++++++-- 8 files changed, 41 insertions(+), 32 deletions(-) diff --git a/src/config/tests/load_basic_tests.rs b/src/config/tests/load_basic_tests.rs index 342fe62..26daf59 100644 --- a/src/config/tests/load_basic_tests.rs +++ b/src/config/tests/load_basic_tests.rs @@ -340,9 +340,21 @@ fn cidr_rate_limits_accept_auto_templates_in_strict_config() { "#, ); - assert!(cfg.access.cidr_rate_limits.contains_key(&CidrRateLimitKey::AutoDual(24))); - assert!(cfg.access.cidr_rate_limits.contains_key(&CidrRateLimitKey::AutoV4(30))); - assert!(cfg.access.cidr_rate_limits.contains_key(&CidrRateLimitKey::AutoV6(64))); + assert!( + cfg.access + .cidr_rate_limits + .contains_key(&CidrRateLimitKey::AutoDual(24)) + ); + assert!( + cfg.access + .cidr_rate_limits + .contains_key(&CidrRateLimitKey::AutoV4(30)) + ); + assert!( + cfg.access + .cidr_rate_limits + .contains_key(&CidrRateLimitKey::AutoV6(64)) + ); } #[test] @@ -1774,7 +1786,9 @@ fn client_mss_bulk_out_of_range_is_rejected() { "# ); let dir = std::env::temp_dir(); - let path = dir.join(format!("telemt_client_mss_bulk_out_of_range_{value}_test.toml")); + let path = dir.join(format!( + "telemt_client_mss_bulk_out_of_range_{value}_test.toml" + )); std::fs::write(&path, toml).unwrap(); let err = ProxyConfig::load(&path).unwrap_err().to_string(); diff --git a/src/proxy/tests/middle_relay_d2c_flush_padding_security_tests.rs b/src/proxy/tests/middle_relay_d2c_flush_padding_security_tests.rs index 12a0ca7..69cff02 100644 --- a/src/proxy/tests/middle_relay_d2c_flush_padding_security_tests.rs +++ b/src/proxy/tests/middle_relay_d2c_flush_padding_security_tests.rs @@ -101,9 +101,11 @@ async fn write_secure_payload(payload_len: usize) -> (MeD2cWriteMode, Vec) { fn assert_secure_payload_with_tail_padding(cleartext: &[u8], payload_len: usize) { let wire_len = secure_wire_len(cleartext); assert_eq!(cleartext.len(), 4 + wire_len); - assert!(cleartext[4..4 + payload_len] - .iter() - .all(|byte| *byte == 0xa5)); + assert!( + cleartext[4..4 + payload_len] + .iter() + .all(|byte| *byte == 0xa5) + ); let padding_len = wire_len .checked_sub(payload_len) diff --git a/src/proxy/traffic_limiter.rs b/src/proxy/traffic_limiter.rs index 6550e38..9d5d977 100644 --- a/src/proxy/traffic_limiter.rs +++ b/src/proxy/traffic_limiter.rs @@ -453,9 +453,7 @@ impl PolicySnapshot { fn match_auto_cidr(&self, ip: IpAddr) -> Option> { let rule = match ip { IpAddr::V4(_) => self.cidr_auto_rules_v4.first()?, - IpAddr::V6(_) => self - .cidr_auto_rules_v6 - .first()?, + IpAddr::V6(_) => self.cidr_auto_rules_v6.first()?, }; let key = auto_cidr_bucket_key(ip, rule.prefix_len)?; Some(CidrPolicyMatch::Auto { diff --git a/src/synlimit_control/iptables.rs b/src/synlimit_control/iptables.rs index e39097f..bb37044 100644 --- a/src/synlimit_control/iptables.rs +++ b/src/synlimit_control/iptables.rs @@ -68,13 +68,9 @@ async fn apply_rules_for_binary( let chain = namespace.iptables_chain.as_str(); let _ = run_command(binary, &["-t", "filter", "-N", chain], None).await; run_command(binary, &["-t", "filter", "-F", chain], None).await?; - if run_command( - binary, - &["-t", "filter", "-C", "INPUT", "-j", chain], - None, - ) - .await - .is_err() + if run_command(binary, &["-t", "filter", "-C", "INPUT", "-j", chain], None) + .await + .is_err() { run_command( binary, @@ -260,13 +256,7 @@ pub(super) async fn clear_rules_for_binary( let mut removed = false; let chain = namespace.iptables_chain.as_str(); for _ in 0..8 { - match run_command( - binary, - &["-t", "filter", "-D", "INPUT", "-j", chain], - None, - ) - .await - { + match run_command(binary, &["-t", "filter", "-D", "INPUT", "-j", chain], None).await { Ok(()) => { removed = true; } diff --git a/src/synlimit_control/mod.rs b/src/synlimit_control/mod.rs index fb6c0c1..448a57a 100644 --- a/src/synlimit_control/mod.rs +++ b/src/synlimit_control/mod.rs @@ -97,9 +97,7 @@ pub(crate) async fn clear_synlimit_rules_all_backends() -> Result clear_synlimit_rules_for_namespace(&namespace).await } -async fn clear_synlimit_rules_for_namespace( - namespace: &SynLimitNamespace, -) -> Result { +async fn clear_synlimit_rules_for_namespace(namespace: &SynLimitNamespace) -> Result { if !has_cap_net_admin() { return Ok(false); } diff --git a/src/synlimit_control/model.rs b/src/synlimit_control/model.rs index 193f1a5..45c6bf3 100644 --- a/src/synlimit_control/model.rs +++ b/src/synlimit_control/model.rs @@ -319,7 +319,10 @@ mod tests { targets.iptables_v4[0].ip, Some(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 1))) ); - assert_eq!(targets.iptables_v6[0].ip, Some(IpAddr::V6(Ipv6Addr::LOCALHOST))); + assert_eq!( + targets.iptables_v6[0].ip, + Some(IpAddr::V6(Ipv6Addr::LOCALHOST)) + ); assert_eq!( targets.nft_v4[0].ip, Some(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 2))) diff --git a/src/synlimit_control/nftables.rs b/src/synlimit_control/nftables.rs index 826e328..d82a2c2 100644 --- a/src/synlimit_control/nftables.rs +++ b/src/synlimit_control/nftables.rs @@ -199,8 +199,7 @@ pub(super) async fn clear_rules_all_families( let mut removed = false; let table = namespace.nft_table.as_str(); for family in [NftFamily::Inet, NftFamily::Ip, NftFamily::Ip6] { - match run_command("nft", &["delete", "table", family.as_str(), table], None).await - { + match run_command("nft", &["delete", "table", family.as_str(), table], None).await { Ok(()) => { removed = true; } diff --git a/src/transport/middle_proxy/handshake.rs b/src/transport/middle_proxy/handshake.rs index 4cde68d..181bae1 100644 --- a/src/transport/middle_proxy/handshake.rs +++ b/src/transport/middle_proxy/handshake.rs @@ -729,7 +729,10 @@ mod tests { assert_eq!( MePool::select_socks_bound_addr( IpFamily::V4, - Some(upstream_egress(UpstreamRouteKind::Socks5, Some(bogon_bound))) + Some(upstream_egress( + UpstreamRouteKind::Socks5, + Some(bogon_bound) + )) ), None ); @@ -776,7 +779,9 @@ mod tests { ); assert_eq!( KdfClientPortSource::from_socks_bound_port( - Some(zero_port_bound).filter(|addr| addr.port() != 0).map(|addr| addr.port()) + Some(zero_port_bound) + .filter(|addr| addr.port() != 0) + .map(|addr| addr.port()) ), KdfClientPortSource::LocalSocket );