diff --git a/src/algorithm/public_key/ed25519.rs b/src/algorithm/public_key/ed25519.rs index 62d0a28..85e1226 100644 --- a/src/algorithm/public_key/ed25519.rs +++ b/src/algorithm/public_key/ed25519.rs @@ -1,5 +1,5 @@ use crate::algorithm::public_key::PublicKey; -use crate::data::Data; +use crate::model::Data; use crate::SshError; use ring::signature; diff --git a/src/algorithm/public_key/rsa.rs b/src/algorithm/public_key/rsa.rs index 93531dc..a3dab17 100644 --- a/src/algorithm/public_key/rsa.rs +++ b/src/algorithm/public_key/rsa.rs @@ -1,5 +1,5 @@ use crate::algorithm::public_key::PublicKey as PubK; -use crate::data::Data; +use crate::model::Data; use crate::SshError; use rsa::PublicKey; diff --git a/src/channel/channel.rs b/src/channel/channel.rs index 1c91c10..fa76b86 100644 --- a/src/channel/channel.rs +++ b/src/channel/channel.rs @@ -3,8 +3,8 @@ use super::channel_scp::ChannelScp; use super::channel_shell::ChannelShell; use crate::client::Client; use crate::constant::ssh_msg_code; -use crate::data::Data; use crate::error::{SshError, SshResult}; +use crate::model::Data; use crate::slog::log; use crate::window_size::WindowSize; use std::cell::RefCell; diff --git a/src/channel/channel_exec.rs b/src/channel/channel_exec.rs index 171c1a6..067f193 100644 --- a/src/channel/channel_exec.rs +++ b/src/channel/channel_exec.rs @@ -1,7 +1,7 @@ use super::channel::Channel; use crate::constant::{ssh_msg_code, ssh_str}; -use crate::data::Data; use crate::error::SshResult; +use crate::model::Data; use std::io::{Read, Write}; pub struct ChannelExec(pub(crate) Channel); diff --git a/src/channel/channel_scp.rs b/src/channel/channel_scp.rs index 481e82f..15d5cb3 100644 --- a/src/channel/channel_scp.rs +++ b/src/channel/channel_scp.rs @@ -1,6 +1,6 @@ use crate::constant::{scp, ssh_msg_code, ssh_str}; -use crate::data::Data; use crate::error::{SshError, SshResult}; +use crate::model::Data; use crate::Channel; use std::path::{Path, PathBuf}; use std::{ diff --git a/src/channel/channel_shell.rs b/src/channel/channel_shell.rs index 8b555c7..bed6c8a 100644 --- a/src/channel/channel_shell.rs +++ b/src/channel/channel_shell.rs @@ -1,7 +1,7 @@ use super::channel::Channel; use crate::constant::{ssh_msg_code, ssh_str}; -use crate::data::Data; use crate::error::SshResult; +use crate::model::Data; use std::io::{Read, Write}; pub struct ChannelShell(pub(crate) Channel); diff --git a/src/channel/mod.rs b/src/channel/mod.rs index 82415a8..b360ed2 100644 --- a/src/channel/mod.rs +++ b/src/channel/mod.rs @@ -1,3 +1,4 @@ +#[allow(clippy::module_inception)] pub mod channel; pub mod channel_exec; pub mod channel_scp; diff --git a/src/client/client_r.rs b/src/client/client_r.rs index e3a47cd..6f44996 100644 --- a/src/client/client_r.rs +++ b/src/client/client_r.rs @@ -4,9 +4,8 @@ use crate::algorithm::{ }; use crate::client::Client; use crate::constant::{size, ssh_msg_code}; -use crate::data::Data; use crate::h::H; -use crate::packet::Packet; +use crate::model::{Data, Packet}; use crate::window_size::WindowSize; use crate::{algorithm::hash, config::version::SshVersion}; use crate::{algorithm::key_exchange::KeyExchange, config::algorithm::AlgList}; diff --git a/src/client/client_w.rs b/src/client/client_w.rs index b5eb645..fe083dc 100644 --- a/src/client/client_w.rs +++ b/src/client/client_w.rs @@ -1,5 +1,5 @@ -use crate::data::Data; -use crate::packet::Packet; +use crate::model::Data; +use crate::model::Packet; use crate::window_size::WindowSize; use crate::{client::Client, config::version::SshVersion}; use crate::{constant, h::H, kex, SshError, SshResult}; diff --git a/src/client/mod.rs b/src/client/mod.rs index d976571..096b0c5 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -1,3 +1,4 @@ +#[allow(clippy::module_inception)] pub(crate) mod client; pub(crate) mod client_r; pub(crate) mod client_w; diff --git a/src/config/algorithm.rs b/src/config/algorithm.rs index 4038552..d9f53fd 100644 --- a/src/config/algorithm.rs +++ b/src/config/algorithm.rs @@ -1,7 +1,7 @@ use crate::{ constant::algorithms as constant, - data::Data, error::{SshError, SshResult}, + model::Data, util, }; diff --git a/src/config/auth.rs b/src/config/auth.rs index 868a1f2..9758f75 100644 --- a/src/config/auth.rs +++ b/src/config/auth.rs @@ -1,6 +1,6 @@ use crate::algorithm::hash::HashType; -use crate::data::Data; use crate::h::H; +use crate::model::Data; use crate::{algorithm::hash, constant::algorithms}; use crate::{SshError, SshResult}; use rsa::pkcs1::DecodeRsaPrivateKey; diff --git a/src/config/version.rs b/src/config/version.rs index b5bb2a1..3d3fa1a 100644 --- a/src/config/version.rs +++ b/src/config/version.rs @@ -2,9 +2,9 @@ use std::io::{Read, Write}; use crate::{ constant::CLIENT_VERSION, - data::Data, error::{SshError, SshResult}, h::H, + model::Data, }; type OurVer = String; diff --git a/src/h.rs b/src/h.rs index 34ff43c..59d75b6 100644 --- a/src/h.rs +++ b/src/h.rs @@ -1,4 +1,4 @@ -use crate::data::Data; +use crate::model::Data; /// 密钥交换产生两个值:一个共享秘密 K,以及一个交换哈希 H。加密和验证密钥来自它们。第一 /// 次密钥交换的交换哈希 H 也被用作会话标识,它是一个对该连接的唯一标识。它是验证方法中 diff --git a/src/kex.rs b/src/kex.rs index 2414ca6..36b8770 100644 --- a/src/kex.rs +++ b/src/kex.rs @@ -7,8 +7,8 @@ use crate::algorithm::{ public_key::{self, PublicKey}, }; use crate::constant::ssh_msg_code; -use crate::data::Data; use crate::error::{SshError, SshResult}; +use crate::model::Data; use crate::slog::log; use crate::window_size::WindowSize; use crate::{algorithm::hash, config::algorithm::AlgList}; diff --git a/src/lib.rs b/src/lib.rs index 8474ef9..428a515 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -252,9 +252,8 @@ mod channel; mod client; mod config; mod constant; -mod data; mod kex; -mod packet; +mod model; mod session; mod slog; mod timeout; diff --git a/src/data.rs b/src/model/data.rs similarity index 100% rename from src/data.rs rename to src/model/data.rs diff --git a/src/model/mod.rs b/src/model/mod.rs new file mode 100644 index 0000000..6449e17 --- /dev/null +++ b/src/model/mod.rs @@ -0,0 +1,5 @@ +pub(crate) mod data; +pub(crate) mod packet; + +pub(crate) use data::Data; +pub(crate) use packet::Packet; diff --git a/src/packet.rs b/src/model/packet.rs similarity index 99% rename from src/packet.rs rename to src/model/packet.rs index cebc908..aacf200 100644 --- a/src/packet.rs +++ b/src/model/packet.rs @@ -1,5 +1,5 @@ use crate::algorithm::encryption::Encryption; -use crate::data::Data; +use crate::model::Data; /// ## 数据包整体结构 /// diff --git a/src/session/mod.rs b/src/session/mod.rs index 373aad6..71f83c5 100644 --- a/src/session/mod.rs +++ b/src/session/mod.rs @@ -1,3 +1,4 @@ +#[allow(clippy::module_inception)] pub mod session; mod session_auth; diff --git a/src/session/session.rs b/src/session/session.rs index a06f2c2..38e6201 100644 --- a/src/session/session.rs +++ b/src/session/session.rs @@ -1,8 +1,8 @@ use crate::client::Client; use crate::constant::{size, ssh_msg_code, ssh_str}; -use crate::data::Data; use crate::h::H; use crate::kex; +use crate::model::Data; use crate::slog::log; use crate::window_size::WindowSize; use crate::{algorithm::hash::HashType, config::Config}; diff --git a/src/session/session_auth.rs b/src/session/session_auth.rs index df751f1..324ecb2 100644 --- a/src/session/session_auth.rs +++ b/src/session/session_auth.rs @@ -1,6 +1,6 @@ use crate::constant::{ssh_msg_code, ssh_str}; -use crate::data::Data; use crate::h::H; +use crate::model::Data; use crate::{algorithm::hash::HashType, config::auth::AuthInfo}; use crate::{Session, SshResult}; use std::io::{Read, Write}; diff --git a/src/window_size.rs b/src/window_size.rs index ab3458c..ad769c0 100644 --- a/src/window_size.rs +++ b/src/window_size.rs @@ -3,8 +3,8 @@ use std::io::{Read, Write}; use crate::client::Client; use crate::constant::size::LOCAL_WINDOW_SIZE; use crate::constant::ssh_msg_code; -use crate::data::Data; use crate::error::SshResult; +use crate::model::Data; pub struct WindowSize { pub(crate) server_channel_no: u32,