+6 -1

knot2/crates/knot-ssh/src/lib.rs

View file Reviewed

··· 2 2 mod roster; 3 3 mod server; 4 4 5 5 + use std::borrow::Cow; 5 6 use std::collections::BTreeSet; 6 7 use std::net::SocketAddr; 7 8 use std::path::Path; ··· 20 21 use russh::keys::ssh_key::rand_core; 21 22 use russh::keys::{Algorithm, PrivateKey, ssh_key}; 22 23 use russh::server::{Config, Server as _}; 23 23 - use russh::{MethodKind, MethodSet}; 24 24 + use russh::{MethodKind, MethodSet, Preferred, compression}; 24 25 use tokio::sync::Semaphore; 25 26 use tokio_util::sync::CancellationToken; 26 27 use tokio_util::task::TaskTracker; ··· 153 154 inactivity_timeout: Some(INACTIVITY_TIMEOUT), 154 155 keepalive_interval: Some(KEEPALIVE_INTERVAL), 155 156 auth_rejection_time: AUTH_REJECTION_TIME, 157 157 + preferred: Preferred { 158 158 + compression: Cow::Borrowed(&[compression::NONE]), 159 159 + ..Preferred::DEFAULT 160 160 + }, 156 161 ..Config::default() 157 162 }) 158 163 }

+42

knot2/crates/knot-ssh/tests/ssh_push.rs

View file Reviewed

··· 653 653 } 654 654 655 655 #[tokio::test(flavor = "multi_thread", worker_threads = 4)] 656 656 + async fn a_client_requesting_ssh_compression_clones_an_incompressible_pack() { 657 657 + let fx = fixture().await; 658 658 + std::fs::create_dir_all(&fx.work).unwrap(); 659 659 + git(&fx.work, &[], &["init", "-q", "-b", "main"]); 660 660 + let mut state = 0x9e3779b97f4a7c15u64; 661 661 + let payload: Vec<u8> = std::iter::repeat_with(|| { 662 662 + state ^= state << 13; 663 663 + state ^= state >> 7; 664 664 + state ^= state << 17; 665 665 + state.to_le_bytes() 666 666 + }) 667 667 + .take(32 * 1024) 668 668 + .flatten() 669 669 + .collect(); 670 670 + std::fs::write(fx.work.join("noise.bin"), &payload).unwrap(); 671 671 + git(&fx.work, &[], &["add", "-A"]); 672 672 + git(&fx.work, &[], &["commit", "-q", "-m", "noise"]); 673 673 + 674 674 + let (ok, out) = push(&fx.work, &fx.url, &fx.key_path, &["main"]).await; 675 675 + assert!(ok, "push must succeed:\n{out}"); 676 676 + 677 677 + let dest = fx.scratch.path().join("compressed-clone"); 678 678 + let ssh = format!("{} -o Compression=yes", ssh_command(&fx.key_path)); 679 679 + let url = fx.url.clone(); 680 680 + let dest_arg = dest.to_str().unwrap().to_string(); 681 681 + let (ok, out) = tokio::task::spawn_blocking(move || { 682 682 + git( 683 683 + Path::new("/tmp"), 684 684 + &[("GIT_SSH_COMMAND", &ssh)], 685 685 + &["clone", "-q", &url, &dest_arg], 686 686 + ) 687 687 + }) 688 688 + .await 689 689 + .unwrap(); 690 690 + assert!( 691 691 + ok, 692 692 + "clone with ssh compression requested must succeed:\n{out}" 693 693 + ); 694 694 + assert_eq!(std::fs::read(dest.join("noise.bin")).unwrap(), payload); 695 695 + } 696 696 + 697 697 + #[tokio::test(flavor = "multi_thread", worker_threads = 4)] 656 698 async fn an_oversized_push_is_refused_at_the_ssh_boundary() { 657 699 let scratch = tempfile::tempdir().unwrap(); 658 700 let (key_path, public_line) = keygen(scratch.path(), "client");