Add native remote port forwarding
This commit is contained in:
@@ -33,6 +33,17 @@ fn write_server_config(dir: &tempfile::TempDir, port: u16) -> std::path::PathBuf
|
||||
write_server_config_with_timeout(dir, port, 30)
|
||||
}
|
||||
|
||||
fn write_server_config_with_remote_forwarding(
|
||||
dir: &tempfile::TempDir,
|
||||
port: u16,
|
||||
) -> std::path::PathBuf {
|
||||
let config = write_server_config(dir, port);
|
||||
let mut raw = fs::read_to_string(&config).unwrap();
|
||||
raw.push_str("allow_remote_forwarding = true\n");
|
||||
fs::write(&config, raw).unwrap();
|
||||
config
|
||||
}
|
||||
|
||||
fn write_server_config_with_timeout(
|
||||
dir: &tempfile::TempDir,
|
||||
port: u16,
|
||||
@@ -596,6 +607,58 @@ fn native_local_forward_echo_smoke() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn native_remote_forward_echo_smoke() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let port = free_udp_port();
|
||||
let config = write_server_config_with_remote_forwarding(&dir, port);
|
||||
write_native_client_auth(&dir, &config);
|
||||
let echo_port = start_echo_server();
|
||||
let remote_port = free_tcp_port();
|
||||
let mut server = start_server(&dir, &config);
|
||||
let client_bin = env!("CARGO_BIN_EXE_dosh-client");
|
||||
let mut client = Command::new(client_bin)
|
||||
.arg("--auth")
|
||||
.arg("native")
|
||||
.arg("--no-cache")
|
||||
.arg("-N")
|
||||
.arg("-R")
|
||||
.arg(format!("{remote_port}:127.0.0.1:{echo_port}"))
|
||||
.arg("--session")
|
||||
.arg("default")
|
||||
.arg("--dosh-host")
|
||||
.arg("127.0.0.1")
|
||||
.arg("--dosh-port")
|
||||
.arg(port.to_string())
|
||||
.arg("local")
|
||||
.env("HOME", dir.path())
|
||||
.stdin(Stdio::null())
|
||||
.stdout(Stdio::null())
|
||||
.stderr(Stdio::piped())
|
||||
.spawn()
|
||||
.unwrap();
|
||||
|
||||
let mut stream = connect_with_retry(remote_port, Duration::from_secs(5), &mut client);
|
||||
stream
|
||||
.set_read_timeout(Some(Duration::from_secs(3)))
|
||||
.unwrap();
|
||||
stream.write_all(b"dosh-remote-forward-ping").unwrap();
|
||||
let mut buf = [0u8; 64];
|
||||
let n = stream.read(&mut buf).unwrap();
|
||||
|
||||
let _ = client.kill();
|
||||
let client_output = client.wait_with_output().unwrap();
|
||||
let _ = server.kill();
|
||||
let _ = server.wait();
|
||||
|
||||
assert_eq!(&buf[..n], b"dosh-remote-forward-ping");
|
||||
assert!(
|
||||
client_output.status.success() || client_output.status.code().is_none(),
|
||||
"stderr={}",
|
||||
String::from_utf8_lossy(&client_output.stderr)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ticket_attach_after_server_restart_smoke() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
|
||||
Reference in New Issue
Block a user