mirror of
https://github.com/warpdotdev/warp.git
synced 2026-05-06 15:22:21 +08:00
## Description [APP-3805](https://linear.app/warpdotdev/issue/APP-3805/client-server-version-skew) — handle client/server version skew for the SSH remote-server binary. Previously the remote binary lived at a single unversioned path. When a client updated but the remote still had an older binary, the two could silently go out of sync. This PR does three things: 1. **Version the installed path.** The binary is now written to `{dir}/{binary_name}-{version}`, so any client-server drift becomes a path miss and triggers a reinstall. The unversioned path is kept for `cargo run` / `deploy_remote_server` dev loops. 2. **Check versions on handshake.** `initialize()` now compares `server_version` against the client's release tag. On mismatch, the manager deletes the stale binary, tears the session down, and emits `SessionConnectionFailed` so the failed-banner path fires. 3. **Auto-update without a prompt.** When `check_binary()` misses but the remote already has an install directory, we skip the "Install Warp SSH tools?" modal and install directly with `is_update: true`. The shimmer reads "Updating Warp SSH Extension..." instead of "Installing...". Dev clients without a release tag fall through to the normal prompt so they don't accidentally CDN-install over a locally-deployed binary. ## Testing - `cargo test -p remote_server`, `cargo clippy -D warnings`, `cargo fmt` — all clean. - Manual against `alokedesai@136.107.29.130`: - Fresh install: modal → "Installing Warp SSH Extension..." → Ready. - Reconnect with a newer client tag: handshake mismatch detected, stale binary removed, reconnect reinstalls. - Reconnect with an older client tag while a newer versioned binary is on the remote: auto-update, no modal, "Updating..." shimmer. - Forced install failure on the update path: failed banner renders. ## Server API dependencies None — warp-server already supports `?version=` on `/download/cli` (#10284). --------- Co-authored-by: Oz <oz-agent@warp.dev>
303 lines
10 KiB
Rust
303 lines
10 KiB
Rust
use std::time::Duration;
|
|
|
|
use anyhow::{anyhow, Result};
|
|
use warp_core::channel::{Channel, ChannelState};
|
|
|
|
/// State machine for the remote server install → launch → initialize flow.
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub enum RemoteServerSetupState {
|
|
/// Checking if the binary exists on remote.
|
|
Checking,
|
|
/// Downloading and installing the binary for the first time on this host.
|
|
Installing { progress_percent: Option<u8> },
|
|
/// Replacing an existing install with a differently-versioned binary.
|
|
/// Rendered as "Updating..." in the UI so the user understands this
|
|
/// isn't a fresh install.
|
|
Updating,
|
|
/// Binary is launched, waiting for InitializeResponse.
|
|
Initializing,
|
|
/// Handshake complete. Ready.
|
|
Ready,
|
|
/// Something failed. Fall back to ControlMaster.
|
|
Failed { error: String },
|
|
}
|
|
|
|
impl RemoteServerSetupState {
|
|
pub fn is_ready(&self) -> bool {
|
|
matches!(self, Self::Ready)
|
|
}
|
|
|
|
pub fn is_failed(&self) -> bool {
|
|
matches!(self, Self::Failed { .. })
|
|
}
|
|
|
|
pub fn is_terminal(&self) -> bool {
|
|
self.is_ready() || self.is_failed()
|
|
}
|
|
|
|
pub fn is_in_progress(&self) -> bool {
|
|
matches!(
|
|
self,
|
|
Self::Checking | Self::Installing { .. } | Self::Updating | Self::Initializing
|
|
)
|
|
}
|
|
|
|
pub fn is_connecting(&self) -> bool {
|
|
matches!(
|
|
self,
|
|
Self::Installing { .. } | Self::Updating | Self::Initializing
|
|
)
|
|
}
|
|
}
|
|
|
|
/// Detected remote platform from `uname -sm` output.
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub struct RemotePlatform {
|
|
pub os: RemoteOs,
|
|
pub arch: RemoteArch,
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub enum RemoteOs {
|
|
Linux,
|
|
MacOs,
|
|
}
|
|
|
|
impl RemoteOs {
|
|
pub fn as_str(&self) -> &'static str {
|
|
match self {
|
|
Self::Linux => "linux",
|
|
Self::MacOs => "macos",
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub enum RemoteArch {
|
|
X86_64,
|
|
Aarch64,
|
|
}
|
|
|
|
impl RemoteArch {
|
|
pub fn as_str(&self) -> &'static str {
|
|
match self {
|
|
Self::X86_64 => "x86_64",
|
|
Self::Aarch64 => "aarch64",
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Parse `uname -sm` output into a `RemotePlatform`.
|
|
///
|
|
/// The expected format is `<os> <arch>`, e.g. `Linux x86_64` or `Darwin arm64`.
|
|
/// Takes the last line to skip any shell initialization output.
|
|
pub fn parse_uname_output(output: &str) -> Result<RemotePlatform> {
|
|
let line = output
|
|
.lines()
|
|
.last()
|
|
.ok_or_else(|| anyhow!("empty uname output"))?
|
|
.trim();
|
|
|
|
let mut parts = line.split_whitespace();
|
|
let os_str = parts
|
|
.next()
|
|
.ok_or_else(|| anyhow!("missing OS in uname output: {line}"))?;
|
|
let arch_str = parts
|
|
.next()
|
|
.ok_or_else(|| anyhow!("missing arch in uname output: {line}"))?;
|
|
|
|
let os = match os_str {
|
|
"Linux" => RemoteOs::Linux,
|
|
"Darwin" => RemoteOs::MacOs,
|
|
other => return Err(anyhow!("unsupported OS: {other}")),
|
|
};
|
|
|
|
let arch = match arch_str {
|
|
"x86_64" => RemoteArch::X86_64,
|
|
"aarch64" | "arm64" | "armv8l" => RemoteArch::Aarch64,
|
|
other => return Err(anyhow!("unsupported arch: {other}")),
|
|
};
|
|
|
|
Ok(RemotePlatform { os, arch })
|
|
}
|
|
|
|
/// Returns the remote directory where the binary is installed, keyed by channel.
|
|
///
|
|
/// - stable: `~/.warp/remote-server`
|
|
/// - preview: `~/.warp-preview/remote-server`
|
|
/// - dev: `~/.warp-dev/remote-server`
|
|
/// - local: `~/.warp-local/remote-server`
|
|
/// - integration: `~/.warp-dev/remote-server`
|
|
/// - warp-oss: `~/.warp-oss/remote-server`
|
|
pub fn remote_server_dir() -> String {
|
|
let warp_dir = match ChannelState::channel() {
|
|
Channel::Stable => ".warp",
|
|
Channel::Preview => ".warp-preview",
|
|
Channel::Dev | Channel::Integration => ".warp-dev",
|
|
Channel::Local => ".warp-local",
|
|
Channel::Oss => {
|
|
// TODO(alokedesai): need to figure out how remote server works with warp-oss
|
|
// For now, return what Dev returns.
|
|
".warp-dev"
|
|
}
|
|
};
|
|
format!("~/{warp_dir}/remote-server")
|
|
}
|
|
|
|
/// Returns a filesystem-safe directory name for a remote-server identity key.
|
|
///
|
|
/// The identity key is not secret, but it can contain bytes that are unsafe or
|
|
/// ambiguous in paths. Keep ASCII alphanumeric characters plus `-` and `_`;
|
|
/// percent-encode all other UTF-8 bytes.
|
|
pub fn remote_server_identity_dir_name(identity_key: &str) -> String {
|
|
if identity_key.is_empty() {
|
|
return "empty".to_string();
|
|
}
|
|
|
|
let mut encoded = String::with_capacity(identity_key.len());
|
|
for byte in identity_key.bytes() {
|
|
match byte {
|
|
b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'-' | b'_' => {
|
|
encoded.push(byte as char);
|
|
}
|
|
_ => encoded.push_str(&format!("%{byte:02X}")),
|
|
}
|
|
}
|
|
encoded
|
|
}
|
|
|
|
/// Returns the identity-scoped remote directory used for the daemon socket
|
|
/// and PID file.
|
|
pub fn remote_server_daemon_dir(identity_key: &str) -> String {
|
|
format!(
|
|
"{}/{}",
|
|
remote_server_dir(),
|
|
remote_server_identity_dir_name(identity_key)
|
|
)
|
|
}
|
|
|
|
/// Returns the binary name, keyed by channel.
|
|
///
|
|
/// Matches the CLI command names: `oz` (stable), `oz-preview`, `oz-dev`.
|
|
pub fn binary_name() -> &'static str {
|
|
ChannelState::channel().cli_command_name()
|
|
}
|
|
|
|
/// Returns the full remote binary path for the current channel and client
|
|
/// version.
|
|
///
|
|
/// The path-versioning rule is keyed strictly off [`Channel`]:
|
|
///
|
|
/// - [`Channel::Local`] and [`Channel::Oss`] always use the bare
|
|
/// `{binary_name}` path. For `Local` this is the slot
|
|
/// `script/deploy_remote_server` writes to; `Oss` is treated the
|
|
/// same way because it has no release-pinned CDN artifact and is
|
|
/// expected to be deployed/managed locally.
|
|
/// - Every other channel always uses `{binary_name}-{version}`, where
|
|
/// `version` is the baked-in `GIT_RELEASE_TAG` when present and falls
|
|
/// back to `CARGO_PKG_VERSION` otherwise. The fallback keeps the path
|
|
/// deterministic for misconfigured `cargo run --bin {dev,preview,...}`
|
|
/// builds; the resulting `&version=...` query is expected to 404 against
|
|
/// `/download/cli` and surface a clean `SetupFailed` rather than silently
|
|
/// writing to a path that doesn't follow the rule.
|
|
pub fn remote_server_binary() -> String {
|
|
let dir = remote_server_dir();
|
|
let name = binary_name();
|
|
match ChannelState::channel() {
|
|
Channel::Local | Channel::Oss => format!("{dir}/{name}"),
|
|
Channel::Stable | Channel::Preview | Channel::Dev | Channel::Integration => {
|
|
format!("{dir}/{name}-{}", pinned_version())
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Returns the shell command to check if the remote server binary exists and
|
|
/// is executable.
|
|
pub fn binary_check_command() -> String {
|
|
format!("test -x {}", remote_server_binary())
|
|
}
|
|
|
|
/// Returns the version string used to pin remote-server installs on
|
|
/// channels that take the versioned path (i.e. everything except
|
|
/// [`Channel::Local`] and [`Channel::Oss`]). Prefers the baked-in
|
|
/// `GIT_RELEASE_TAG` from [`ChannelState::app_version`]; falls back to
|
|
/// `CARGO_PKG_VERSION` so the path / install URL is deterministic even on
|
|
/// dev `cargo run` builds without a release tag. The `CARGO_PKG_VERSION`
|
|
/// fallback is not expected to map to a real `/download/cli` artifact —
|
|
/// it exists to produce a clean install-time failure rather than silently
|
|
/// fall through to the unversioned (Local/Oss-only) path.
|
|
fn pinned_version() -> &'static str {
|
|
ChannelState::app_version().unwrap_or(env!("CARGO_PKG_VERSION"))
|
|
}
|
|
|
|
/// The install script template, loaded from a standalone `.sh` file for
|
|
/// readability. Placeholders like `{download_base_url}` are substituted by
|
|
/// [`install_script`].
|
|
const INSTALL_SCRIPT_TEMPLATE: &str = include_str!("install_remote_server.sh");
|
|
|
|
/// Returns the install script that downloads and installs the CLI binary
|
|
/// at the current client version.
|
|
///
|
|
/// The script detects the remote architecture via `uname -m`, downloads
|
|
/// the correct Oz CLI tarball from the download URL, and installs it at
|
|
/// the path returned by [`remote_server_binary`] so repeat invocations
|
|
/// are idempotent. The `version_query` / `version_suffix` substitutions
|
|
/// follow the same rule as [`remote_server_binary`]: empty on
|
|
/// [`Channel::Local`] and [`Channel::Oss`] (so the install lands at
|
|
/// the unversioned path used by `script/deploy_remote_server`); pinned to
|
|
/// `&version={v}` / `-{v}` on every other channel, where `v` falls back
|
|
/// to `CARGO_PKG_VERSION` when no release tag is baked in.
|
|
pub fn install_script() -> String {
|
|
let (version_query, version_suffix) = match ChannelState::channel() {
|
|
Channel::Local | Channel::Oss => (String::new(), String::new()),
|
|
Channel::Stable | Channel::Preview | Channel::Dev | Channel::Integration => {
|
|
let v = pinned_version();
|
|
(format!("&version={v}"), format!("-{v}"))
|
|
}
|
|
};
|
|
INSTALL_SCRIPT_TEMPLATE
|
|
.replace("{download_base_url}", &download_url())
|
|
.replace("{channel}", download_channel())
|
|
.replace("{install_dir}", &remote_server_dir())
|
|
.replace("{binary_name}", binary_name())
|
|
.replace("{version_query}", &version_query)
|
|
.replace("{version_suffix}", &version_suffix)
|
|
}
|
|
|
|
/// Construct the download URL from the server root URL.
|
|
///
|
|
/// For example, given `https://app.warp.dev`, returns
|
|
/// `https://app.warp.dev/download/cli`.
|
|
fn download_url() -> String {
|
|
let base = ChannelState::server_root_url();
|
|
let base = base.trim_end_matches('/');
|
|
format!("{base}/download/cli")
|
|
}
|
|
|
|
/// Maps the client's [`Channel`] to the server's download channel parameter.
|
|
///
|
|
/// The server recognises `"stable"`, `"preview"`, and `"dev"`. Local and
|
|
/// Integration builds map to `"dev"` so they fetch dogfood artifacts.
|
|
fn download_channel() -> &'static str {
|
|
match ChannelState::channel() {
|
|
Channel::Stable => "stable",
|
|
Channel::Preview => "preview",
|
|
Channel::Dev | Channel::Local | Channel::Integration => "dev",
|
|
Channel::Oss => {
|
|
// TODO(alokedesai): need to figure out how remote server works with warp-oss
|
|
// For now, return what Dev returns.
|
|
"dev"
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Timeout for the binary existence check.
|
|
pub const CHECK_TIMEOUT: Duration = Duration::from_secs(10);
|
|
|
|
/// Timeout for the install script.
|
|
pub const INSTALL_TIMEOUT: Duration = Duration::from_secs(60);
|
|
|
|
#[cfg(test)]
|
|
#[path = "setup_tests.rs"]
|
|
mod tests;
|