F8: distribution and GitHub-Releases self-update
- .github/workflows/release.yml: on tag v* build all 5 targets (macOS
arm64/x86_64, Linux arm64/x86_64 incl. free arm runners, Windows
x86_64) with the release-dist profile, archive kigi-<version>-<triple>
with LICENSE/NOTICE/THIRD-PARTY-NOTICES, generate SHA256SUMS, publish
the release (prerelease for tags containing '-'), with a tag↔workspace
version guard.
- install.sh / install.ps1 (repo root): platform detection, latest or
--version download from GitHub Releases, SHA-256 verification against
SHA256SUMS, install into the kigi home's downloads/ + bin/kigi symlink
(the same layout the self-updater manages), smoke test, PATH guidance.
- kigi-update rewritten onto the GitHub Releases API (documented wire
shape; stable=/latest, alpha=semver-max across the list, pinned=/tags):
SHA-256 gate before any binary swap, tar.gz/zip extraction per
platform, atomic bin/kigi symlink swap, channel/rollback semantics and
the KIGI_AUTO_UPDATE gate preserved verbatim; every x.ai/GCS/npm
endpoint deleted, npm/gh-release installers removed, legacy grok/agent
links retired on install. kigi-env owns the update base URL with a
KIGI_UPDATE_BASE_URL override (this is what the test artifact server
injects).
- .cargo/config.toml: removed the non-portable neoverse-v2 CPU pin on
Linux arm64 (fleet-specific); RELRO/NX hardening link-args now apply
to the gnu targets too, matching the release-dist profile's contract.
- THIRD-PARTY-NOTICES regenerated via cargo-about (about.toml +
template); the M0 hand-built file is dropped and README points at the
generated one. docs/RELEASE.md carries the release checklist.
- Deleted xAI-era leftovers: kigi-tui/scripts/install*.{sh,ps1} (x.ai
CDN) and the @xai-official/grok npm skeleton (PRD F8: no npm).
Gates: fmt clean; workspace check/clippy 0/0 (--locked, -D warnings);
kigi-update 58 lib + 86 integration tests green; deny ok;
release-dist build of kigi-bin succeeds and reports 'kigi 0.1.0'.
This commit is contained in:
@@ -1,27 +1,44 @@
|
||||
//! Controllable raw HTTP/1.1 artifact server shared by the blitz
|
||||
//! download/install tests and the concurrent-update convergence tests.
|
||||
//! Controllable raw HTTP/1.1 GitHub-Releases-shaped server shared by the
|
||||
//! blitz download/install tests and the concurrent-update convergence tests.
|
||||
//!
|
||||
//! Serves a real executable artifact and can truncate the body, close the
|
||||
//! connection early, serve a right-length-but-garbage body, or hang
|
||||
//! mid-transfer — for both the parallel byte-range path and the
|
||||
//! single-connection path. It also counts body-serving GETs (HEAD probes are
|
||||
//! excluded) so tests can assert how many downloads actually happened, and
|
||||
//! supports a "slow" mode that widens the race window so concurrent
|
||||
//! installers genuinely overlap in flight.
|
||||
//! Serves the three routes the updater consumes:
|
||||
//!
|
||||
//! - `GET /releases/latest` and `GET /releases/tags/v{version}` — release
|
||||
//! JSON in the real GitHub wire shape
|
||||
//! (<https://docs.github.com/en/rest/releases/releases>):
|
||||
//! `{"tag_name":"v0.1.0","assets":[{"name":"...","browser_download_url":"..."}]}`
|
||||
//! - `GET /dl/{version}/SHA256SUMS` — checksum manifest for the archive
|
||||
//! - `GET /dl/{version}/kigi-{version}-{triple}.tar.gz` — the archive itself
|
||||
//!
|
||||
//! The archive route can serve the real archive, truncate the body, serve a
|
||||
//! right-length-but-garbage body (defeated by the SHA-256 gate), serve a
|
||||
//! correctly-checksummed archive whose binary fails to run (defeated by the
|
||||
//! smoke test), or hang mid-transfer — for both the parallel byte-range path
|
||||
//! and the single-connection path. It also counts archive-serving GETs (HEAD
|
||||
//! probes and metadata routes are excluded) so tests can assert how many
|
||||
//! downloads actually happened, and supports a "slow" mode that widens the
|
||||
//! race window so concurrent installers genuinely overlap in flight.
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::io::{Read, Write};
|
||||
use std::net::{TcpListener, TcpStream};
|
||||
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::Duration;
|
||||
|
||||
/// How the server corrupts (or doesn't) the next download.
|
||||
use super::{archive_name, make_release_archive, sha256_hex};
|
||||
|
||||
/// How the server corrupts (or doesn't) the next archive download.
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub enum Mode {
|
||||
/// Serve the real artifact correctly.
|
||||
/// Serve the real archive correctly.
|
||||
Full,
|
||||
/// Serve a right-length body that exits non-zero (fails the smoke-test).
|
||||
/// Serve a right-length body of wrong bytes — SHA256SUMS still lists the
|
||||
/// GOOD archive's hash, so the checksum gate must reject it.
|
||||
Garbage,
|
||||
/// Serve a correctly-checksummed archive whose `kigi` binary exits
|
||||
/// non-zero — only the smoke test can reject it.
|
||||
BadBinary,
|
||||
/// Advertise the full length but send only `k` bytes then close the socket
|
||||
/// (silent truncation: premature EOF / short range chunk).
|
||||
Truncate(usize),
|
||||
@@ -29,11 +46,41 @@ pub enum Mode {
|
||||
Hang(usize),
|
||||
}
|
||||
|
||||
/// Precomputed per-version fixtures.
|
||||
struct VersionFixture {
|
||||
/// Real archive: tar.gz containing `kigi` = the good binary body.
|
||||
good_archive: Arc<Vec<u8>>,
|
||||
/// Same-shape archive whose `kigi` exits 1; its hash is served in
|
||||
/// SHA256SUMS while `Mode::BadBinary` is active.
|
||||
bad_archive: Arc<Vec<u8>>,
|
||||
}
|
||||
|
||||
struct ServerState {
|
||||
body: Arc<Vec<u8>>,
|
||||
versions: HashMap<String, VersionFixture>,
|
||||
/// The good binary body used to synthesize fixtures for versions
|
||||
/// requested but not yet registered.
|
||||
default_binary: Vec<u8>,
|
||||
latest: String,
|
||||
mode: Mode,
|
||||
}
|
||||
|
||||
impl ServerState {
|
||||
fn fixture(&mut self, version: &str) -> &VersionFixture {
|
||||
if !self.versions.contains_key(version) {
|
||||
let good = make_release_archive(&self.default_binary);
|
||||
let bad = make_release_archive(b"#!/bin/sh\nexit 1\n");
|
||||
self.versions.insert(
|
||||
version.to_string(),
|
||||
VersionFixture {
|
||||
good_archive: Arc::new(good),
|
||||
bad_archive: Arc::new(bad),
|
||||
},
|
||||
);
|
||||
}
|
||||
&self.versions[version]
|
||||
}
|
||||
}
|
||||
|
||||
pub struct ArtifactServer {
|
||||
addr: std::net::SocketAddr,
|
||||
state: Arc<Mutex<ServerState>>,
|
||||
@@ -43,12 +90,17 @@ pub struct ArtifactServer {
|
||||
}
|
||||
|
||||
impl ArtifactServer {
|
||||
pub fn start(body: Vec<u8>) -> Self {
|
||||
/// Start a server whose release archives contain `binary_body` as the
|
||||
/// `kigi` binary. `latest` starts as `0.0.0`; set it with
|
||||
/// [`ArtifactServer::set_latest`] before exercising latest-based flows.
|
||||
pub fn start(binary_body: Vec<u8>) -> Self {
|
||||
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
listener.set_nonblocking(true).unwrap();
|
||||
let addr = listener.local_addr().unwrap();
|
||||
let state = Arc::new(Mutex::new(ServerState {
|
||||
body: Arc::new(body),
|
||||
versions: HashMap::new(),
|
||||
default_binary: binary_body,
|
||||
latest: "0.0.0".to_string(),
|
||||
mode: Mode::Full,
|
||||
}));
|
||||
let shutdown = Arc::new(AtomicBool::new(false));
|
||||
@@ -86,30 +138,49 @@ impl ArtifactServer {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn uri(&self) -> String {
|
||||
format!("http://{}", self.addr)
|
||||
/// Base URL to hand the updater (`…/releases`, mirroring the production
|
||||
/// `https://api.github.com/repos/{owner}/{repo}/releases`).
|
||||
pub fn base(&self) -> String {
|
||||
format!("http://{}/releases", self.addr)
|
||||
}
|
||||
|
||||
/// Version served by `GET /releases/latest`.
|
||||
pub fn set_latest(&self, version: &str) {
|
||||
self.state.lock().unwrap().latest = version.to_string();
|
||||
}
|
||||
|
||||
pub fn set_mode(&self, mode: Mode) {
|
||||
self.state.lock().unwrap().mode = mode;
|
||||
}
|
||||
|
||||
/// Number of body-serving GET requests handled so far (HEAD probes from
|
||||
/// the parallel-download path are excluded). Tests use this to assert
|
||||
/// how many downloads actually happened — e.g. that a sequential updater
|
||||
/// converged onto an already-installed binary without re-downloading.
|
||||
/// One download may span multiple GETs when the parallel byte-range path
|
||||
/// splits it, so tests asserting exact counts use a small artifact
|
||||
/// (single-connection path, 1 GET per download).
|
||||
/// Length of the (good) archive for `version` — corruption offsets for
|
||||
/// [`Mode::Truncate`]/[`Mode::Hang`] are positions within this body.
|
||||
pub fn archive_len(&self, version: &str) -> usize {
|
||||
self.state
|
||||
.lock()
|
||||
.unwrap()
|
||||
.fixture(version)
|
||||
.good_archive
|
||||
.len()
|
||||
}
|
||||
|
||||
/// Number of archive-serving GET requests handled so far (HEAD probes
|
||||
/// from the parallel-download path and metadata/SHA256SUMS routes are
|
||||
/// excluded). Tests use this to assert how many downloads actually
|
||||
/// happened — e.g. that a sequential updater converged onto an
|
||||
/// already-installed binary without re-downloading. One download may span
|
||||
/// multiple GETs when the parallel byte-range path splits it, so tests
|
||||
/// asserting exact counts use a small artifact (single-connection path,
|
||||
/// 1 GET per download).
|
||||
pub fn request_count(&self) -> usize {
|
||||
self.gets.load(Ordering::Relaxed)
|
||||
}
|
||||
|
||||
/// When enabled, hold each Full/Garbage response open ~500ms before
|
||||
/// sending the body. This keeps an installer in flight long enough for
|
||||
/// concurrent installers to genuinely overlap even on a heavily loaded
|
||||
/// CI host — a too-short hold would let race tests run the installers
|
||||
/// back-to-back and never exercise the concurrent window.
|
||||
/// When enabled, hold each archive response open ~500ms before sending
|
||||
/// the body. This keeps an installer in flight long enough for concurrent
|
||||
/// installers to genuinely overlap even on a heavily loaded CI host — a
|
||||
/// too-short hold would let race tests run the installers back-to-back
|
||||
/// and never exercise the concurrent window.
|
||||
pub fn set_slow(&self, slow: bool) {
|
||||
self.slow.store(slow, Ordering::Relaxed);
|
||||
}
|
||||
@@ -134,6 +205,39 @@ fn parse_range(request: &str) -> Option<(usize, usize)> {
|
||||
None
|
||||
}
|
||||
|
||||
/// The request path, without query string.
|
||||
fn parse_path(request: &str) -> String {
|
||||
request
|
||||
.lines()
|
||||
.next()
|
||||
.and_then(|l| l.split_whitespace().nth(1))
|
||||
.unwrap_or("/")
|
||||
.split('?')
|
||||
.next()
|
||||
.unwrap_or("/")
|
||||
.to_string()
|
||||
}
|
||||
|
||||
/// Release JSON for `version` with asset URLs rooted at this server.
|
||||
fn release_json(addr: &std::net::SocketAddr, version: &str) -> String {
|
||||
let name = archive_name(version);
|
||||
format!(
|
||||
r#"{{"tag_name":"v{version}","draft":false,"prerelease":false,"assets":[{{"name":"{name}","browser_download_url":"http://{addr}/dl/{version}/{name}"}},{{"name":"SHA256SUMS","browser_download_url":"http://{addr}/dl/{version}/SHA256SUMS"}}]}}"#
|
||||
)
|
||||
}
|
||||
|
||||
fn write_simple_response(stream: &mut TcpStream, status: &str, body: &[u8], is_head: bool) {
|
||||
let head = format!(
|
||||
"HTTP/1.1 {status}\r\nContent-Length: {}\r\nConnection: close\r\n\r\n",
|
||||
body.len()
|
||||
);
|
||||
let _ = stream.write_all(head.as_bytes());
|
||||
if !is_head {
|
||||
let _ = stream.write_all(body);
|
||||
}
|
||||
let _ = stream.flush();
|
||||
}
|
||||
|
||||
fn handle_connection(
|
||||
mut stream: TcpStream,
|
||||
state: Arc<Mutex<ServerState>>,
|
||||
@@ -169,18 +273,74 @@ fn handle_connection(
|
||||
}
|
||||
let request = String::from_utf8_lossy(&buf).to_string();
|
||||
let is_head = request.starts_with("HEAD");
|
||||
let path = parse_path(&request);
|
||||
let range = parse_range(&request);
|
||||
let addr = stream.local_addr().unwrap();
|
||||
|
||||
// ── Metadata routes ─────────────────────────────────────────────────────
|
||||
if path == "/releases/latest" {
|
||||
let latest = state.lock().unwrap().latest.clone();
|
||||
let body = release_json(&addr, &latest);
|
||||
write_simple_response(&mut stream, "200 OK", body.as_bytes(), is_head);
|
||||
return;
|
||||
}
|
||||
if let Some(tag) = path.strip_prefix("/releases/tags/v") {
|
||||
let body = release_json(&addr, tag);
|
||||
write_simple_response(&mut stream, "200 OK", body.as_bytes(), is_head);
|
||||
return;
|
||||
}
|
||||
|
||||
// ── Asset routes: /dl/{version}/{name} ──────────────────────────────────
|
||||
let Some(rest) = path.strip_prefix("/dl/") else {
|
||||
write_simple_response(&mut stream, "404 Not Found", b"not found", is_head);
|
||||
return;
|
||||
};
|
||||
let Some((version, asset)) = rest.split_once('/') else {
|
||||
write_simple_response(&mut stream, "404 Not Found", b"not found", is_head);
|
||||
return;
|
||||
};
|
||||
|
||||
let (good, bad, mode) = {
|
||||
let mut st = state.lock().unwrap();
|
||||
let mode = st.mode;
|
||||
let fixture = st.fixture(version);
|
||||
(
|
||||
fixture.good_archive.clone(),
|
||||
fixture.bad_archive.clone(),
|
||||
mode,
|
||||
)
|
||||
};
|
||||
|
||||
if asset == "SHA256SUMS" {
|
||||
// BadBinary serves the bad archive WITH its correct hash (a release
|
||||
// whose binary is broken but whose checksums are fine); every other
|
||||
// mode lists the good archive's hash so in-transit corruption is
|
||||
// caught by the checksum gate.
|
||||
let hashed: &[u8] = match mode {
|
||||
Mode::BadBinary => &bad,
|
||||
_ => &good,
|
||||
};
|
||||
let body = format!("{} {}\n", sha256_hex(hashed), archive_name(version));
|
||||
write_simple_response(&mut stream, "200 OK", body.as_bytes(), is_head);
|
||||
return;
|
||||
}
|
||||
|
||||
if asset != archive_name(version) {
|
||||
write_simple_response(&mut stream, "404 Not Found", b"not found", is_head);
|
||||
return;
|
||||
}
|
||||
|
||||
// ── Archive body with corruption modes ──────────────────────────────────
|
||||
// Count only body-serving GETs; the parallel path's HEAD probe is excluded.
|
||||
if !is_head {
|
||||
gets.fetch_add(1, Ordering::Relaxed);
|
||||
}
|
||||
let range = parse_range(&request);
|
||||
|
||||
let (body, mode) = {
|
||||
let st = state.lock().unwrap();
|
||||
(st.body.clone(), st.mode)
|
||||
let body: &[u8] = match mode {
|
||||
Mode::BadBinary => &bad,
|
||||
_ => &good,
|
||||
};
|
||||
let total = body.len();
|
||||
let body: &[u8] = &body;
|
||||
|
||||
// Determine the byte slice this request is for, plus the length we will
|
||||
// claim in Content-Length.
|
||||
@@ -190,7 +350,7 @@ fn handle_connection(
|
||||
};
|
||||
let claimed_len = slice_end_excl - slice_start;
|
||||
|
||||
// For truncation/hang, `k` is a GLOBAL cutoff across the whole artifact:
|
||||
// For truncation/hang, `k` is a GLOBAL cutoff across the whole archive:
|
||||
// a slice that reaches past byte `k` is sent short, so the parallel path's
|
||||
// later chunk (or the single-connection body) is the one truncated.
|
||||
let send_end = match mode {
|
||||
@@ -201,9 +361,9 @@ fn handle_connection(
|
||||
// truncated modes it may be shorter than the advertised `claimed_len`.
|
||||
let payload: Vec<u8> = match mode {
|
||||
Mode::Garbage => {
|
||||
let mut bad = b"#!/bin/sh\nexit 1\n".to_vec();
|
||||
bad.resize(claimed_len, b'\n');
|
||||
bad
|
||||
let mut bad_bytes = b"not the archive you checksummed".to_vec();
|
||||
bad_bytes.resize(claimed_len, b'\n');
|
||||
bad_bytes
|
||||
}
|
||||
_ => body[slice_start..send_end].to_vec(),
|
||||
};
|
||||
@@ -236,7 +396,7 @@ fn handle_connection(
|
||||
}
|
||||
|
||||
match mode {
|
||||
Mode::Full | Mode::Garbage => {
|
||||
Mode::Full | Mode::Garbage | Mode::BadBinary => {
|
||||
// Hold the connection open longer so concurrent installers
|
||||
// genuinely overlap mid-download (see `set_slow`).
|
||||
if slow.load(Ordering::Relaxed) {
|
||||
|
||||
@@ -40,8 +40,7 @@ use std::sync::OnceLock;
|
||||
/// this directory for the lifetime of the process.
|
||||
///
|
||||
/// Also clears env vars that the auto-update code consults so a parent shell's
|
||||
/// values can't pollute the baseline (e.g. running tests from `npm run` would
|
||||
/// otherwise inherit `npm_config_user_agent` and `NPM_TOKEN`).
|
||||
/// values can't pollute the baseline.
|
||||
pub fn test_home() -> &'static PathBuf {
|
||||
static HOME: OnceLock<PathBuf> = OnceLock::new();
|
||||
HOME.get_or_init(|| {
|
||||
@@ -52,10 +51,9 @@ pub fn test_home() -> &'static PathBuf {
|
||||
unsafe {
|
||||
std::env::set_var("KIGI_SHARE_DIR", &path);
|
||||
std::env::remove_var("KIGI_TEST_VERSION");
|
||||
std::env::remove_var("NPM_TOKEN");
|
||||
std::env::remove_var("KIGI_INSTALLER");
|
||||
std::env::remove_var("KIGI_MANAGED_BY_NPM");
|
||||
std::env::remove_var("KIGI_MANAGED_BY_INTERNAL");
|
||||
std::env::remove_var(kigi_env::UPDATE_BASE_URL_ENV);
|
||||
}
|
||||
path
|
||||
})
|
||||
@@ -74,24 +72,32 @@ pub fn reset_home() {
|
||||
// SAFETY: tests using this helper must be `#[serial]`.
|
||||
unsafe {
|
||||
std::env::remove_var("KIGI_TEST_VERSION");
|
||||
std::env::remove_var("NPM_TOKEN");
|
||||
std::env::remove_var("KIGI_INSTALLER");
|
||||
std::env::remove_var(kigi_env::UPDATE_BASE_URL_ENV);
|
||||
}
|
||||
}
|
||||
|
||||
/// Override the version reported by `get_installed_grok_version()` for the
|
||||
/// Override the version reported by `get_installed_kigi_version()` for the
|
||||
/// duration of the test (until [`reset_home`] or process exit).
|
||||
pub fn set_test_version(v: &str) {
|
||||
// SAFETY: tests using this helper must be `#[serial]`.
|
||||
unsafe { std::env::set_var("KIGI_TEST_VERSION", v) };
|
||||
}
|
||||
|
||||
/// Point the production update flows (`check_update_status`,
|
||||
/// `ensure_latest_on_disk`, `run_update`) at a mock GitHub Releases API.
|
||||
/// Cleared by [`reset_home`].
|
||||
pub fn set_update_base(base: &str) {
|
||||
// SAFETY: tests using this helper must be `#[serial]`.
|
||||
unsafe { std::env::set_var(kigi_env::UPDATE_BASE_URL_ENV, base) };
|
||||
}
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────────
|
||||
// Install-test fixtures (shared by the blitz + convergence suites)
|
||||
// Install-test fixtures
|
||||
// ─────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
/// Host `{os}-{arch}` string matching the versioned binary naming scheme
|
||||
/// (`grok-{version}-{platform}`).
|
||||
/// (`kigi-{version}-{platform}`).
|
||||
pub fn host_platform() -> String {
|
||||
let os = if cfg!(target_os = "macos") {
|
||||
"macos"
|
||||
@@ -110,6 +116,27 @@ pub fn host_platform() -> String {
|
||||
format!("{os}-{arch}")
|
||||
}
|
||||
|
||||
/// Host Rust target triple, matching `auto_update::target_triple()` and the
|
||||
/// release-asset naming in `.github/workflows/release.yml`.
|
||||
pub fn host_triple() -> &'static str {
|
||||
if cfg!(all(target_os = "macos", target_arch = "aarch64")) {
|
||||
"aarch64-apple-darwin"
|
||||
} else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
|
||||
"x86_64-apple-darwin"
|
||||
} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
|
||||
"aarch64-unknown-linux-gnu"
|
||||
} else if cfg!(all(target_os = "linux", target_arch = "x86_64")) {
|
||||
"x86_64-unknown-linux-gnu"
|
||||
} else {
|
||||
panic!("unsupported test platform");
|
||||
}
|
||||
}
|
||||
|
||||
/// Release-archive asset name for `version` on the host platform.
|
||||
pub fn archive_name(version: &str) -> String {
|
||||
format!("kigi-{version}-{}.tar.gz", host_triple())
|
||||
}
|
||||
|
||||
/// Minimal [`kigi_update::UpdateConfig`] for install tests.
|
||||
pub fn make_update_config(channel: &str) -> kigi_update::UpdateConfig {
|
||||
kigi_update::UpdateConfig {
|
||||
@@ -118,7 +145,6 @@ pub fn make_update_config(channel: &str) -> kigi_update::UpdateConfig {
|
||||
deployment_key: None,
|
||||
alpha_test_key: None,
|
||||
channel: channel.to_string(),
|
||||
npm_registry: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -168,7 +194,113 @@ pub fn backdate_downloads() {
|
||||
}
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────────
|
||||
// PATH-override fake binary
|
||||
// GitHub Releases fixtures
|
||||
//
|
||||
// Wire shapes mirror the real GitHub REST API
|
||||
// (https://docs.github.com/en/rest/releases/releases):
|
||||
// GET /repos/{o}/{r}/releases/latest → release object
|
||||
// GET /repos/{o}/{r}/releases/tags/{tag} → release object
|
||||
// GET /repos/{o}/{r}/releases → array of release objects
|
||||
// Release object: {"tag_name":"v0.1.0","assets":[{"name":"...",
|
||||
// "browser_download_url":"..."}]}
|
||||
// ─────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
/// Build a tar.gz archive from `(name, bytes)` entries.
|
||||
#[cfg(unix)]
|
||||
pub fn make_tar_gz(entries: &[(&str, &[u8])]) -> Vec<u8> {
|
||||
let gz = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
|
||||
let mut builder = tar::Builder::new(gz);
|
||||
for (name, data) in entries {
|
||||
let mut header = tar::Header::new_gnu();
|
||||
header.set_size(data.len() as u64);
|
||||
header.set_mode(0o755);
|
||||
header.set_cksum();
|
||||
builder.append_data(&mut header, name, *data).unwrap();
|
||||
}
|
||||
builder.into_inner().unwrap().finish().unwrap()
|
||||
}
|
||||
|
||||
/// Release archive containing a single `kigi` entry with `binary` as its body.
|
||||
#[cfg(unix)]
|
||||
pub fn make_release_archive(binary: &[u8]) -> Vec<u8> {
|
||||
make_tar_gz(&[("kigi", binary)])
|
||||
}
|
||||
|
||||
/// Hex SHA-256 of `bytes` (as written into SHA256SUMS manifests).
|
||||
pub fn sha256_hex(bytes: &[u8]) -> String {
|
||||
use sha2::{Digest, Sha256};
|
||||
format!("{:x}", Sha256::digest(bytes))
|
||||
}
|
||||
|
||||
/// GitHub release JSON for `version`, with asset download URLs rooted at
|
||||
/// `{server_uri}/dl/v{version}/…`.
|
||||
pub fn release_json(server_uri: &str, version: &str) -> serde_json::Value {
|
||||
let name = archive_name(version);
|
||||
serde_json::json!({
|
||||
"tag_name": format!("v{version}"),
|
||||
"draft": false,
|
||||
"prerelease": !semver::Version::parse(version).unwrap().pre.is_empty(),
|
||||
"assets": [
|
||||
{
|
||||
"name": name,
|
||||
"browser_download_url": format!("{server_uri}/dl/v{version}/{name}"),
|
||||
},
|
||||
{
|
||||
"name": "SHA256SUMS",
|
||||
"browser_download_url": format!("{server_uri}/dl/v{version}/SHA256SUMS"),
|
||||
},
|
||||
],
|
||||
})
|
||||
}
|
||||
|
||||
/// Mount the per-release endpoints for `version` on a wiremock server:
|
||||
/// `GET /releases/tags/v{version}` plus the archive and SHA256SUMS asset
|
||||
/// downloads. Callers that need `latest` also call [`mount_latest`].
|
||||
///
|
||||
/// The base URL to hand the updater is `format!("{}/releases", server.uri())`.
|
||||
#[cfg(unix)]
|
||||
pub async fn mount_release(server: &wiremock::MockServer, version: &str, binary: &[u8]) {
|
||||
use wiremock::matchers::{method, path};
|
||||
use wiremock::{Mock, ResponseTemplate};
|
||||
|
||||
let archive = make_release_archive(binary);
|
||||
let sums = format!("{} {}\n", sha256_hex(&archive), archive_name(version));
|
||||
|
||||
Mock::given(method("GET"))
|
||||
.and(path(format!("/releases/tags/v{version}")))
|
||||
.respond_with(
|
||||
ResponseTemplate::new(200).set_body_json(release_json(&server.uri(), version)),
|
||||
)
|
||||
.mount(server)
|
||||
.await;
|
||||
Mock::given(method("GET"))
|
||||
.and(path(format!("/dl/v{version}/{}", archive_name(version))))
|
||||
.respond_with(ResponseTemplate::new(200).set_body_bytes(archive))
|
||||
.mount(server)
|
||||
.await;
|
||||
Mock::given(method("GET"))
|
||||
.and(path(format!("/dl/v{version}/SHA256SUMS")))
|
||||
.respond_with(ResponseTemplate::new(200).set_body_string(sums))
|
||||
.mount(server)
|
||||
.await;
|
||||
}
|
||||
|
||||
/// Mount `GET /releases/latest` returning `version`.
|
||||
pub async fn mount_latest(server: &wiremock::MockServer, version: &str) {
|
||||
use wiremock::matchers::{method, path};
|
||||
use wiremock::{Mock, ResponseTemplate};
|
||||
|
||||
Mock::given(method("GET"))
|
||||
.and(path("/releases/latest"))
|
||||
.respond_with(
|
||||
ResponseTemplate::new(200).set_body_json(release_json(&server.uri(), version)),
|
||||
)
|
||||
.mount(server)
|
||||
.await;
|
||||
}
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────────
|
||||
// PATH-override fake binary (used by the install.sh harness)
|
||||
// ─────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
/// RAII guard that places a sh-script with name `name` at the head of `PATH`.
|
||||
@@ -215,18 +347,8 @@ impl FakeBinGuard {
|
||||
}
|
||||
}
|
||||
|
||||
/// Install a fake `npm` using the standard [`fake_npm_script`] template.
|
||||
pub fn install_npm() -> Self {
|
||||
Self::install("npm", fake_npm_script)
|
||||
}
|
||||
|
||||
/// Install a fake `gh` using the standard [`fake_gh_script`] template.
|
||||
pub fn install_gh() -> Self {
|
||||
Self::install("gh", fake_gh_script)
|
||||
}
|
||||
|
||||
/// The tempdir backing this guard (where canned stdout/stderr/exit files
|
||||
/// can be written by tests, and where `<name>-args.log` is appended).
|
||||
/// The tempdir backing this guard (where canned response files can be
|
||||
/// written by tests, and where `<name>-args.log` is appended).
|
||||
pub fn dir(&self) -> PathBuf {
|
||||
self.tmp.path().to_path_buf()
|
||||
}
|
||||
@@ -239,46 +361,6 @@ impl FakeBinGuard {
|
||||
.map(String::from)
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn set_stdout(&self, content: &str) {
|
||||
std::fs::write(self.dir().join(format!("{}-stdout", self.name)), content).unwrap();
|
||||
}
|
||||
|
||||
pub fn set_stderr(&self, content: &str) {
|
||||
std::fs::write(self.dir().join(format!("{}-stderr", self.name)), content).unwrap();
|
||||
}
|
||||
|
||||
pub fn set_alpha_stdout(&self, content: &str) {
|
||||
std::fs::write(
|
||||
self.dir().join(format!("{}-alpha-stdout", self.name)),
|
||||
content,
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
pub fn set_stable_only_stdout(&self, content: &str) {
|
||||
std::fs::write(
|
||||
self.dir().join(format!("{}-stable-only-stdout", self.name)),
|
||||
content,
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
pub fn set_with_pre_stdout(&self, content: &str) {
|
||||
std::fs::write(
|
||||
self.dir().join(format!("{}-with-pre-stdout", self.name)),
|
||||
content,
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
pub fn set_exit_code(&self, code: i32) {
|
||||
std::fs::write(
|
||||
self.dir().join(format!("{}-exit", self.name)),
|
||||
code.to_string(),
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for FakeBinGuard {
|
||||
@@ -287,67 +369,3 @@ impl Drop for FakeBinGuard {
|
||||
unsafe { std::env::set_var("PATH", &self.prev_path) };
|
||||
}
|
||||
}
|
||||
|
||||
/// Single-quote a path for safe substitution into a sh script.
|
||||
fn single_quote_for_sh(p: &Path) -> String {
|
||||
let s = p.to_string_lossy();
|
||||
// Escape any embedded single quotes (paranoid — tempdir paths shouldn't
|
||||
// contain them, but defensively quote).
|
||||
let escaped = s.replace('\'', "'\\''");
|
||||
format!("'{escaped}'")
|
||||
}
|
||||
|
||||
/// sh script body for a fake `npm`. Logs argv to `<dir>/npm-args.log` and
|
||||
/// dispatches stdout based on the first matching argv pattern:
|
||||
///
|
||||
/// - argv contains `@alpha` → cat `<dir>/npm-alpha-stdout`
|
||||
/// - else → cat `<dir>/npm-stdout`
|
||||
///
|
||||
/// Always cats `<dir>/npm-stderr` to stderr (if exists). Exits with the integer
|
||||
/// in `<dir>/npm-exit` (default 0).
|
||||
pub fn fake_npm_script(dir: &Path) -> String {
|
||||
let dq = single_quote_for_sh(dir);
|
||||
format!(
|
||||
r#"#!/bin/sh
|
||||
echo "$@" >> {dq}/npm-args.log
|
||||
if echo "$@" | grep -q '@alpha'; then
|
||||
if [ -f {dq}/npm-alpha-stdout ]; then cat {dq}/npm-alpha-stdout; fi
|
||||
elif [ -f {dq}/npm-stdout ]; then
|
||||
cat {dq}/npm-stdout
|
||||
fi
|
||||
if [ -f {dq}/npm-stderr ]; then cat {dq}/npm-stderr >&2; fi
|
||||
exit_code=0
|
||||
if [ -f {dq}/npm-exit ]; then exit_code=$(cat {dq}/npm-exit); fi
|
||||
exit "$exit_code"
|
||||
"#
|
||||
)
|
||||
}
|
||||
|
||||
/// sh script body for a fake `gh`. Logs argv to `<dir>/gh-args.log` and
|
||||
/// dispatches stdout based on `release list` argv:
|
||||
///
|
||||
/// - argv contains `release list --exclude-pre-releases` → `<dir>/gh-stable-only-stdout`
|
||||
/// - argv contains `release list` (no exclude flag) → `<dir>/gh-with-pre-stdout`
|
||||
/// - else → `<dir>/gh-stdout`
|
||||
///
|
||||
/// Exits with `<dir>/gh-exit` (default 0).
|
||||
pub fn fake_gh_script(dir: &Path) -> String {
|
||||
let dq = single_quote_for_sh(dir);
|
||||
format!(
|
||||
r#"#!/bin/sh
|
||||
echo "$@" >> {dq}/gh-args.log
|
||||
if echo "$@" | grep -q 'release list'; then
|
||||
if echo "$@" | grep -q '\-\-exclude-pre-releases'; then
|
||||
if [ -f {dq}/gh-stable-only-stdout ]; then cat {dq}/gh-stable-only-stdout; fi
|
||||
else
|
||||
if [ -f {dq}/gh-with-pre-stdout ]; then cat {dq}/gh-with-pre-stdout; fi
|
||||
fi
|
||||
elif [ -f {dq}/gh-stdout ]; then
|
||||
cat {dq}/gh-stdout
|
||||
fi
|
||||
exit_code=0
|
||||
if [ -f {dq}/gh-exit ]; then exit_code=$(cat {dq}/gh-exit); fi
|
||||
exit "$exit_code"
|
||||
"#
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user