Skip to content

fix(cli,tui): escape and validate SSH session response fields #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johntmyers wants to merge 1 commit into
base: main
Choose a base branch
from
+446 −32
Open

fix(cli,tui): escape and validate SSH session response fields #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions crates/openshell-cli/src/ssh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ use miette::{IntoDiagnostic, Result, WrapErr};
#[cfg(unix)]
use nix::sys::signal::{SaFlags, SigAction, SigHandler, SigSet, Signal, sigaction};
use openshell_core::forward::{
find_ssh_forward_pid, resolve_ssh_gateway, shell_escape, write_forward_pid,
build_proxy_command, find_ssh_forward_pid, resolve_ssh_gateway, shell_escape,
validate_ssh_session_response, write_forward_pid,
};
use openshell_core::proto::{CreateSshSessionRequest, GetSandboxRequest};
use owo_colors::OwoColorize;
Expand Down Expand Up @@ -86,11 +87,13 @@ async fn ssh_session_config(
.await
.into_diagnostic()?;
let session = response.into_inner();
validate_ssh_session_response(&session)
.map_err(|err| miette::miette!("gateway returned invalid SSH session response: {err}"))?;

let exe = std::env::current_exe()
.into_diagnostic()
.wrap_err("failed to resolve OpenShell executable")?;
let exe_command = shell_escape(&exe.to_string_lossy());
let exe_command = exe.to_string_lossy().into_owned();

// When using Cloudflare bearer auth, the SSH CONNECT must go through the
// external tunnel endpoint (the cluster URL), not the server's internal
Expand All @@ -114,12 +117,12 @@ async fn ssh_session_config(
let gateway_name = tls
.gateway_name()
.ok_or_else(|| miette::miette!("gateway name is required to build SSH proxy command"))?;
let proxy_command = format!(
"{exe_command} ssh-proxy --gateway {} --sandbox-id {} --token {} --gateway-name {}",
gateway_url,
session.sandbox_id,
session.token,
shell_escape(gateway_name),
let proxy_command = build_proxy_command(
&exe_command,
&gateway_url,
&session.sandbox_id,
&session.token,
gateway_name,
);

Ok(SshSessionConfig {
Expand Down Expand Up @@ -867,7 +870,11 @@ fn render_ssh_config(gateway: &str, name: &str) -> String {
let exe = std::env::current_exe().expect("failed to resolve OpenShell executable");
let exe = shell_escape(&exe.to_string_lossy());

let proxy_cmd = format!("{exe} ssh-proxy --gateway-name {gateway} --name {name}");
let proxy_cmd = format!(
"{exe} ssh-proxy --gateway-name {} --name {}",
shell_escape(gateway),
shell_escape(name),
);
let host_alias = host_alias(name);
format!(
"Host {host_alias}\n User sandbox\n StrictHostKeyChecking no\n UserKnownHostsFile /dev/null\n GlobalKnownHostsFile /dev/null\n LogLevel ERROR\n ProxyCommand {proxy_cmd}\n"
Expand Down
Loading
Loading