warp-tech/warpgate
1
1
Fork 0
mirror of https://github.com/warp-tech/warpgate.git synced 2024-09-20 14:56:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

bumped russh: RSA-SHA1 support - fixes #139

Browse source
This commit is contained in:
Eugene Pankov 2022-06-18 21:31:09 +02:00
parent 543abe442f
commit 160301d8dc
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -2589,9 +2589,9 @@ dependencies = [
[[package]] [[package]]
name = "russh" name = "russh"
version = "0.34.0-beta.4" version = "0.34.0-beta.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "381859f0ff98e1fe35f1f6c0639579f0c4ac41cc437c975fb79bd51b1b600d06" checksum = "8cc30588f58cdf955a0834ac1868c7061f59f97b32cc64edaee6ed7610722e29"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"byteorder", "byteorder",
@ -2622,9 +2622,9 @@ dependencies = [
[[package]] [[package]]
name = "russh-keys" name = "russh-keys"
version = "0.22.0-beta.1" version = "0.22.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab150b6cf2ee69249e89449873d9b1104f871105ef852f6cd4c03587899aec6b" checksum = "8cead36ac2cc5b61c6774a47568117980d3df4ccf1e3dd504614809832c0781b"
dependencies = [ dependencies = [
"aes", "aes",
"bcrypt-pbkdf", "bcrypt-pbkdf",

2
warpgate-admin/Cargo.toml
View file

@ -14,7 +14,7 @@ hex = "0.4"
mime_guess = {version = "2.0", default_features = false} mime_guess = {version = "2.0", default_features = false}
poem = {version = "^1.3.24", features = ["cookie", "session", "anyhow", "rustls", "websocket", "embed"]} poem = {version = "^1.3.24", features = ["cookie", "session", "anyhow", "rustls", "websocket", "embed"]}
poem-openapi = {version = "^1.3.30", features = ["swagger-ui", "chrono", "uuid", "static-files"]} poem-openapi = {version = "^1.3.30", features = ["swagger-ui", "chrono", "uuid", "static-files"]}
russh-keys = {version = "0.22.0-beta.1", features = ["openssl"]} russh-keys = {version = "0.22.0-beta.2", features = ["openssl"]}
rust-embed = "6.3" rust-embed = "6.3"
sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false} sea-orm = {version = "^0.8", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"], default-features = false}
serde = "1.0" serde = "1.0"

4
warpgate-protocol-ssh/Cargo.toml
View file

@ -12,8 +12,8 @@ bimap = "0.6"
bytes = "1.1" bytes = "1.1"
dialoguer = "0.10" dialoguer = "0.10"
futures = "0.3" futures = "0.3"
russh = {version = "0.34.0-beta.4", features = ["openssl"]} russh = {version = "0.34.0-beta.5", features = ["openssl"]}
russh-keys = {version = "0.22.0-beta.1", features = ["openssl"]} russh-keys = {version = "0.22.0-beta.2", features = ["openssl"]}
sea-orm = {version = "^0.8", features = ["runtime-tokio-native-tls"], default-features = false} sea-orm = {version = "^0.8", features = ["runtime-tokio-native-tls"], default-features = false}
thiserror = "1.0" thiserror = "1.0"
time = "0.3" time = "0.3"

8
warpgate-protocol-ssh/src/client/mod.rs
View file

@ -13,8 +13,8 @@ use channel_session::SessionChannel;
use futures::pin_mut; use futures::pin_mut;
use handler::ClientHandler; use handler::ClientHandler;
use russh::client::Handle; use russh::client::Handle;
use russh::Sig; use russh::{Sig, Preferred};
use russh_keys::key::PublicKey; use russh_keys::key::{PublicKey, self};
use std::collections::HashMap; use std::collections::HashMap;
use std::net::ToSocketAddrs; use std::net::ToSocketAddrs;
use std::sync::Arc; use std::sync::Arc;
@ -327,6 +327,10 @@ impl RemoteClient {
info!(?address, username = &ssh_options.username[..], "Connecting"); info!(?address, username = &ssh_options.username[..], "Connecting");
let config = russh::client::Config { let config = russh::client::Config {
preferred: Preferred {
key: &[key::ED25519, key::RSA_SHA2_256, key::RSA_SHA2_512, key::SSH_RSA],
..<_>::default()
},
..Default::default() ..Default::default()
}; };
let config = Arc::new(config); let config = Arc::new(config);