ZhenYi/gitdataai
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(git): downgrade russh to 0.50.4, remove flate2 feature, fix log format

Browse Source 
- Downgrade russh from 0.55.0 to 0.50.4
- Remove unused flate2 feature from russh dependency
- Use info!(logger, "{}", format!(...)) for channel lifecycle log messages
This commit is contained in:
ZhenYi 2026-04-16 20:58:01 +08:00
parent 1090359951
commit 02847ef1db
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -98,7 +98,7 @@ prost = "0.14.3"
prost-build = "0.14.3" prost-build = "0.14.3"
qdrant-client = "1.17.0" qdrant-client = "1.17.0"
rand = "0.10.0" rand = "0.10.0"
russh = { version = "0.55.0", default-features = false } russh = { version = "0.50.0", default-features = false, features = [] }
hmac = { version = "0.12.1", features = ["std"] } hmac = { version = "0.12.1", features = ["std"] }
sha1_smol = "1.0.1" sha1_smol = "1.0.1"
rsa = { version = "0.9.7", package = "rsa" } rsa = { version = "0.9.7", package = "rsa" }

2
libs/git/Cargo.toml
View File

@ -39,7 +39,7 @@ chrono = { workspace = true }
sysinfo = { workspace = true } sysinfo = { workspace = true }
num_cpus = { workspace = true } num_cpus = { workspace = true }
futures = { workspace = true } futures = { workspace = true }
russh = { workspace = true, features = ["flate2", "ring", "legacy-ed25519-pkcs8-parser"] } russh = { workspace = true, features = ["legacy-ed25519-pkcs8-parser"] }
anyhow = { workspace = true } anyhow = { workspace = true }
base64 = { workspace = true } base64 = { workspace = true }
sha1 = { workspace = true } sha1 = { workspace = true }

8
libs/git/ssh/handle.rs
View File

@ -423,7 +423,7 @@ impl russh::server::Handler for SSHandle {
.client_addr .client_addr
.map(|addr| format!("{}", addr)) .map(|addr| format!("{}", addr))
.unwrap_or_else(|| "unknown".to_string()); .unwrap_or_else(|| "unknown".to_string());
info!(self.logger, "channel_open_session"; "channel" => ?channel, "client" => %client_info); info!(self.logger, "{}", format!("channel_open_session channel={:?} client={}", channel, client_info));
let _ = session.flush().ok(); let _ = session.flush().ok();
Ok(true) Ok(true)
} }
@ -443,8 +443,7 @@ impl russh::server::Handler for SSHandle {
.client_addr .client_addr
.map(|addr| format!("{}", addr)) .map(|addr| format!("{}", addr))
.unwrap_or_else(|| "unknown".to_string()); .unwrap_or_else(|| "unknown".to_string());
warn!(self.logger, "pty_request (not supported)"; warn!(self.logger, "{}", format!("pty_request not supported channel={:?} term={} cols={} rows={} client={}", channel, term, col_width, row_height, client_info));
"channel" => ?channel, "term" => %term, "cols" => col_width, "rows" => row_height, "client" => %client_info);
let _ = session.flush().ok(); let _ = session.flush().ok();
Ok(()) Ok(())
} }
@ -459,8 +458,7 @@ impl russh::server::Handler for SSHandle {
.client_addr .client_addr
.map(|addr| format!("{}", addr)) .map(|addr| format!("{}", addr))
.unwrap_or_else(|| "unknown".to_string()); .unwrap_or_else(|| "unknown".to_string());
info!(self.logger, "subsystem_request"; info!(self.logger, "{}", format!("subsystem_request channel={:?} subsystem={} client={}", channel, name, client_info));
"channel" => ?channel, "subsystem" => %name, "client" => %client_info);
// git-clients may send "subsystem" for git protocol over ssh. // git-clients may send "subsystem" for git protocol over ssh.
// We don't use subsystem; exec_request handles it directly. // We don't use subsystem; exec_request handles it directly.
let _ = session.flush().ok(); let _ = session.flush().ok();