bumped russh to fix CVE-2023-28113

warp-tech · Mar 17, 2023 · 6b3b49a · 6b3b49a
1 parent 2636019
commit 6b3b49a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/warpgate-admin/Cargo.toml b/warpgate-admin/Cargo.toml
@@ -24,7 +24,7 @@ poem-openapi = { version = "2.0.21", features = [
     "uuid",
     "static-files",
 ] }
-russh-keys = { version = "0.23.0-beta.1", features = ["openssl"] }
+russh-keys = { version = "0.37.1", features = ["openssl"] }
 # russh-keys = { version = "0.23.0-beta.1", features = ["openssl"], path = "../../russh/russh-keys" }
 rust-embed = "6.3"
 sea-orm = { version = "0.10.6", features = [

diff --git a/warpgate-protocol-ssh/Cargo.toml b/warpgate-protocol-ssh/Cargo.toml
@@ -12,9 +12,9 @@ bimap = "0.6"
 bytes = "1.3"
 dialoguer = "0.10"
 futures = "0.3"
-russh = { version = "0.35.0-beta.9", features = ["vendored-openssl"] }
+russh = { version = "0.37.1", features = ["vendored-openssl"] }
 # russh = { version = "0.35.0-beta.6", features = ["vendored-openssl"], path = "../../russh/russh"}
-russh-keys = { version = "0.23.0-beta.1", features = ["vendored-openssl"] }
+russh-keys = { version = "0.37.1", features = ["vendored-openssl"] }
 # russh-keys = { version = "0.23.0-beta.1", features = ["vendored-openssl"], path = "../../russh/russh-keys" }
 sea-orm = { version = "0.10.6", features = [
     "runtime-tokio-native-tls",

diff --git a/warpgate-protocol-ssh/src/client/mod.rs b/warpgate-protocol-ssh/src/client/mod.rs
@@ -514,7 +514,7 @@ impl RemoteClient {
 
     async fn open_shell(&mut self, channel_id: Uuid) -> Result<(), SshClientError> {
         if let Some(session) = &self.session {
-            let mut session = session.lock().await;
+            let session = session.lock().await;
             let channel = session.channel_open_session().await?;
 
             let (tx, rx) = unbounded_channel();
@@ -536,7 +536,7 @@ impl RemoteClient {
         params: DirectTCPIPParams,
     ) -> Result<(), SshClientError> {
         if let Some(session) = &self.session {
-            let mut session = session.lock().await;
+            let session = session.lock().await;
             let channel = session
                 .channel_open_direct_tcpip(
                     params.host_to_connect,
@@ -577,7 +577,7 @@ impl RemoteClient {
         port: u32,
     ) -> Result<bool, SshClientError> {
         if let Some(session) = &self.session {
-            let mut session = session.lock().await;
+            let session = session.lock().await;
             Ok(session.cancel_tcpip_forward(address, port).await?)
         } else {
             self.pending_forwards