A: Code quality improvements - fix clippy warnings

- Remove unused imports in server.rs (Body, HeaderValue, RwLock)
- Remove unused imports in forward_acl.rs (tests still need Ipv4Addr)
- Remove unused imports in host_key.rs (Read, Write)
- Remove unused imports in kex_exchange.rs (HostKeyType)
- Remove unused imports in known_hosts.rs (tests need Ipv4Addr)
- Remove unused imports in multiplex.rs (Arc)
- Auto-fix other unused imports via clippy --fix

Tests: 303 passed, 0 failed (4 new tests added)
This commit is contained in:
Warren
2026-06-21 23:08:07 +08:00
parent 02d98419e1
commit 9b02bbac27
24 changed files with 383 additions and 89 deletions

View File

@@ -320,7 +320,7 @@ impl ChannelManager {
// 解析forwarded-tcpip参数
let mut port_forward_manager = PortForwardManager::new();
let forwarded_tcpip =
let _forwarded_tcpip =
port_forward_manager.handle_forwarded_tcpip_channel(&packet.payload)?;
let server_channel = self.next_channel_id;
@@ -398,7 +398,7 @@ direct_tcpip: None,
// 创建 X11ForwardContext从 DISPLAY 环境变量)
let display = std::env::var("DISPLAY").unwrap_or_else(|_| ":0".to_string());
let x11_ctx = super::x11_forward::X11ForwardContext::new(&display)?;
let _x11_ctx = super::x11_forward::X11ForwardContext::new(&display)?;
let server_channel = self.next_channel_id;
self.next_channel_id += 1;
@@ -1503,7 +1503,7 @@ direct_tcpip: None,
let auth_protocol = read_ssh_string(cursor)?;
// auth_cookie: SSH string (hex-encoded cookie)
let auth_cookie_hex = read_ssh_string(cursor)?;
let _auth_cookie_hex = read_ssh_string(cursor)?;
// screen_number: u32
let screen_number = cursor.read_u32::<BigEndian>()?;

View File

@@ -175,7 +175,7 @@ impl ForwardAcl {
.write()
.unwrap()
.entry(rule.direction)
.or_insert_with(Vec::new)
.or_default()
.push(rule);
}

View File

@@ -3,7 +3,6 @@ use ed25519_dalek::{Signer, SigningKey};
use log::{info, warn};
use rand::rngs::OsRng;
use std::fs;
use std::io::{Read, Write};
use std::path::{Path, PathBuf};
use std::time::{Duration, SystemTime};
@@ -153,7 +152,7 @@ impl HostKeyManager {
self.ensure_keys_dir()?;
let signing_key = SigningKey::generate(&mut OsRng);
let verifying_key = signing_key.verifying_key();
let _verifying_key = signing_key.verifying_key();
self.save_ed25519_private_key(&signing_key, &key_path)?;
self.save_ed25519_public_key(&signing_key, &pub_path)?;
@@ -227,7 +226,7 @@ impl HostKeyManager {
fn save_ed25519_private_key(&self, key: &SigningKey, path: &Path) -> Result<()> {
let key_bytes = key.to_bytes();
fs::write(path, &key_bytes)?;
fs::write(path, key_bytes)?;
#[cfg(unix)]
{

View File

@@ -2,7 +2,7 @@
// 参考OpenSSH kex.c: kex_input_kex_init(), kex_send_kex_reply()
use crate::ssh_server::crypto::{Curve25519Kex, SessionKeys};
use crate::ssh_server::host_key::{HostKey, HostKeyManager, HostKeyType};
use crate::ssh_server::host_key::{HostKey, HostKeyManager};
use crate::ssh_server::kex::KexResult;
use crate::ssh_server::packet::{PacketType, SshPacket};
use anyhow::{anyhow, Result};

View File

@@ -1,6 +1,5 @@
use anyhow::{anyhow, Result};
use log::{info, warn};
use std::collections::HashMap;
use std::fs;
use std::io::{BufRead, BufReader};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
@@ -48,18 +47,17 @@ impl KnownHostEntry {
return true;
}
if let Some(ip_addr) = ip {
if part == &ip_addr.to_string() {
if part == ip_addr.to_string() {
return true;
}
}
}
}
if host.starts_with('|') {
if self.matches_pattern_host(host, hostname) {
if host.starts_with('|')
&& self.matches_pattern_host(host, hostname) {
return true;
}
}
}
false
@@ -154,6 +152,12 @@ pub struct KnownHostsParser {
entries: Vec<KnownHostEntry>,
}
impl Default for KnownHostsParser {
fn default() -> Self {
Self::new()
}
}
impl KnownHostsParser {
pub fn new() -> Self {
Self {
@@ -214,7 +218,7 @@ impl KnownHostsParser {
(parts[0], parts[1], parts[2], &parts[3..])
};
let comment = if rest_parts.len() > 0 {
let comment = if !rest_parts.is_empty() {
Some(rest_parts.join(" "))
} else {
None
@@ -325,14 +329,14 @@ impl KnownHostsParser {
let salt: [u8; 20] = rand::rngs::OsRng.gen();
let mut hasher = Sha256::new();
hasher.update(&salt);
hasher.update(salt);
hasher.update(hostname.as_bytes());
let hash = hasher.finalize();
Ok(format!(
"|1|{}|{}|{}",
STANDARD.encode(&salt),
STANDARD.encode(&hash),
STANDARD.encode(salt),
STANDARD.encode(hash),
hostname
))
}

View File

@@ -1,6 +1,5 @@
use std::collections::HashMap;
use std::net::SocketAddr;
use std::sync::Arc;
use std::time::{Duration, Instant};
use tokio::sync::RwLock;
@@ -195,7 +194,7 @@ impl MultiplexManager {
pub async fn add_channel_to_session(&self, session_id: u64) -> Result<(), MultiplexError> {
let mut connections = self.connections.write().await;
for connection in connections.values_mut() {
if let Some(connection) = connections.values_mut().next() {
let session = connection
.sessions
.get_mut(&session_id)
@@ -216,7 +215,7 @@ impl MultiplexManager {
pub async fn remove_channel_from_session(&self, session_id: u64) -> Result<(), MultiplexError> {
let mut connections = self.connections.write().await;
for connection in connections.values_mut() {
if let Some(connection) = connections.values_mut().next() {
let session = connection
.sessions
.get_mut(&session_id)

View File

@@ -1,6 +1,5 @@
use std::collections::HashMap;
use std::net::IpAddr;
use std::sync::Arc;
use std::time::{Duration, Instant};
use tokio::sync::RwLock;

View File

@@ -1,9 +1,6 @@
use serde::Serialize;
use std::net::IpAddr;
use std::time::SystemTime;
use tracing::{Event, Level, Subscriber};
use tracing_subscriber::fmt::FormatEvent;
use tracing_subscriber::fmt::format::{Format, Json};
use tracing::Subscriber;
use tracing_subscriber::layer::Layer;
pub struct SshAuditLog;

View File

@@ -7,7 +7,7 @@ use anyhow::{Result, anyhow};
use log::info;
use std::path::PathBuf;
use std::net::TcpStream;
use std::io::{Read, Write};
use std::io::Read;
/// X11 authentication cookie type (RFC 4254 §7.2).
#[derive(Debug, Clone)]