Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff872f34a1 | ||
|
|
73eb507cfe | ||
|
|
67b80f73c3 | ||
|
|
90fae8451f | ||
|
|
a93a8135be | ||
|
|
614e89bef4 | ||
|
|
b62f472d79 | ||
|
|
5b23dc1aec | ||
|
|
381158cca0 | ||
|
|
cb28d1da39 | ||
|
|
39f502dcdf | ||
|
|
05ac6b3e8c |
No files matched your search
@@ -334,7 +334,9 @@ jobs:
|
||||
run: npx vitest run
|
||||
|
||||
# `--locked`: test against the committed Cargo.lock, never a re-resolved
|
||||
# one, for the same reason the frontend uses `npm ci`.
|
||||
# one, for the same reason the frontend uses `npm ci`. No plugin fetch
|
||||
# here: a debug build gets a placeholder for the session-manager-plugin
|
||||
# sidecar from build.rs, so tests never build Go or download anything.
|
||||
- name: Backend tests (cargo test)
|
||||
working-directory: ./app/src-tauri
|
||||
run: |
|
||||
@@ -468,6 +470,14 @@ jobs:
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
npx tauri --version || npm install @tauri-apps/cli
|
||||
|
||||
# The AWS Session Manager plugin, bundled as a sidecar (bundle.externalBin)
|
||||
# so AWS workspaces work without the user installing it. Built here from
|
||||
# AWS's Apache-2.0 source (pinned commit + archive SHA-256) with a pinned,
|
||||
# hash-checked Go; the output must match a pinned SHA-256 (reproducible
|
||||
# build). A release build refuses to start without it (build.rs).
|
||||
- name: Build the AWS Session Manager plugin
|
||||
run: bash scripts/build-ssm-plugin.sh x86_64-unknown-linux-gnu
|
||||
|
||||
- name: Build Tauri app
|
||||
working-directory: ./app
|
||||
env:
|
||||
@@ -597,6 +607,15 @@ jobs:
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
npx tauri --version || npm install @tauri-apps/cli
|
||||
|
||||
# The AWS Session Manager plugin sidecar (bundle.externalBin), built from
|
||||
# source (see build-ssm-plugin.sh): both thin slices (tauri-build checks
|
||||
# each arch it compiles) and the lipo'd universal one the bundler copies
|
||||
# into Contents/MacOS. Each must match its pinned SHA-256. Signed exactly
|
||||
# like the app: Go ad-hoc signs the arm64 slice, and with APPLE_* signing
|
||||
# configured Tauri would sign the sidecar with the app's identity.
|
||||
- name: Build the AWS Session Manager plugin
|
||||
run: bash scripts/build-ssm-plugin.sh universal-apple-darwin
|
||||
|
||||
- name: Build Tauri app (universal)
|
||||
working-directory: ./app
|
||||
env:
|
||||
@@ -606,6 +625,21 @@ jobs:
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
npx tauri build --target universal-apple-darwin
|
||||
|
||||
# The sidecar and its notices must be in the bundle Tauri made: the
|
||||
# plugin in Contents/MacOS with both slices, THIRD_PARTY_NOTICES in
|
||||
# Contents/Resources (bundle.resources).
|
||||
- name: Check the bundled Session Manager plugin
|
||||
run: |
|
||||
app_dir="$(ls -d app/src-tauri/target/universal-apple-darwin/release/bundle/macos/*.app | head -n1)"
|
||||
[ -n "$app_dir" ] || { echo "no .app bundle"; exit 1; }
|
||||
plugin="$app_dir/Contents/MacOS/session-manager-plugin"
|
||||
[ -x "$plugin" ] || { echo "missing $plugin"; exit 1; }
|
||||
archs="$(lipo -archs "$plugin")"
|
||||
case " $archs " in *" x86_64 "*) ;; *) echo "plugin lacks x86_64 ($archs)"; exit 1 ;; esac
|
||||
case " $archs " in *" arm64 "*) ;; *) echo "plugin lacks arm64 ($archs)"; exit 1 ;; esac
|
||||
"$plugin" --version
|
||||
[ -f "$app_dir/Contents/Resources/THIRD_PARTY_NOTICES" ] || { echo "missing Contents/Resources/THIRD_PARTY_NOTICES"; exit 1; }
|
||||
|
||||
- name: Collect artifacts
|
||||
run: |
|
||||
mkdir -p artifacts
|
||||
@@ -729,6 +763,13 @@ jobs:
|
||||
set "PATH=%USERPROFILE%\.cargo\bin;C:\Program Files\nodejs;%PATH%"
|
||||
npm run build
|
||||
|
||||
# The AWS Session Manager plugin sidecar (bundle.externalBin), built from
|
||||
# source (see build-ssm-plugin.ps1); must match its pinned SHA-256. It
|
||||
# comes out unsigned, so it ships unsigned in previews, like the
|
||||
# app (releases sign it: see build-app.yml).
|
||||
- name: Build the AWS Session Manager plugin
|
||||
run: powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File scripts\build-ssm-plugin.ps1
|
||||
|
||||
- name: Build Tauri app
|
||||
working-directory: ./app
|
||||
# Previews are not code-signed: signing is metered, previews are built
|
||||
|
||||
@@ -227,6 +227,14 @@ jobs:
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
npx tauri --version || npm install @tauri-apps/cli
|
||||
|
||||
# The AWS Session Manager plugin, bundled as a sidecar (bundle.externalBin)
|
||||
# so AWS workspaces work without the user installing it. Built here from
|
||||
# AWS's Apache-2.0 source (pinned commit + archive SHA-256) with a pinned,
|
||||
# hash-checked Go; the output must match a pinned SHA-256 (reproducible
|
||||
# build). A release build refuses to start without it (build.rs).
|
||||
- name: Build the AWS Session Manager plugin
|
||||
run: bash scripts/build-ssm-plugin.sh x86_64-unknown-linux-gnu
|
||||
|
||||
- name: Build Tauri app
|
||||
working-directory: ./app
|
||||
run: |
|
||||
@@ -417,12 +425,36 @@ jobs:
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
npx tauri --version || npm install @tauri-apps/cli
|
||||
|
||||
# The AWS Session Manager plugin sidecar (bundle.externalBin), built from
|
||||
# source (see build-ssm-plugin.sh): both thin slices (tauri-build checks
|
||||
# each arch it compiles) and the lipo'd universal one the bundler copies
|
||||
# into Contents/MacOS. Each must match its pinned SHA-256. Signed exactly
|
||||
# like the app: Go ad-hoc signs the arm64 slice, and with APPLE_* signing
|
||||
# configured Tauri would sign the sidecar with the app's identity.
|
||||
- name: Build the AWS Session Manager plugin
|
||||
run: bash scripts/build-ssm-plugin.sh universal-apple-darwin
|
||||
|
||||
- name: Build Tauri app (universal)
|
||||
working-directory: ./app
|
||||
run: |
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
npx tauri build --target universal-apple-darwin
|
||||
|
||||
# The sidecar and its notices must be in the bundle Tauri made: the
|
||||
# plugin in Contents/MacOS with both slices, THIRD_PARTY_NOTICES in
|
||||
# Contents/Resources (bundle.resources).
|
||||
- name: Check the bundled Session Manager plugin
|
||||
run: |
|
||||
app_dir="$(ls -d app/src-tauri/target/universal-apple-darwin/release/bundle/macos/*.app | head -n1)"
|
||||
[ -n "$app_dir" ] || { echo "no .app bundle"; exit 1; }
|
||||
plugin="$app_dir/Contents/MacOS/session-manager-plugin"
|
||||
[ -x "$plugin" ] || { echo "missing $plugin"; exit 1; }
|
||||
archs="$(lipo -archs "$plugin")"
|
||||
case " $archs " in *" x86_64 "*) ;; *) echo "plugin lacks x86_64 ($archs)"; exit 1 ;; esac
|
||||
case " $archs " in *" arm64 "*) ;; *) echo "plugin lacks arm64 ($archs)"; exit 1 ;; esac
|
||||
"$plugin" --version
|
||||
[ -f "$app_dir/Contents/Resources/THIRD_PARTY_NOTICES" ] || { echo "missing Contents/Resources/THIRD_PARTY_NOTICES"; exit 1; }
|
||||
|
||||
- name: Collect artifacts
|
||||
run: |
|
||||
mkdir -p artifacts
|
||||
@@ -656,6 +688,13 @@ jobs:
|
||||
set "PATH=%USERPROFILE%\.cargo\bin;C:\Program Files\nodejs;%PATH%"
|
||||
npm run build
|
||||
|
||||
# The AWS Session Manager plugin sidecar (bundle.externalBin), built from
|
||||
# source (see build-ssm-plugin.ps1); must match its pinned SHA-256. It
|
||||
# comes out unsigned, so Tauri hands it to the sign command and
|
||||
# "Verify signatures" requires our signature on it in both installers.
|
||||
- name: Build the AWS Session Manager plugin
|
||||
run: powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -File scripts\build-ssm-plugin.ps1
|
||||
|
||||
# Releases are signed with Azure Artifact Signing (scripts/windows-*.ps1).
|
||||
# The setup fetches the signing client and a job-local .NET runtime, and
|
||||
# writes the Tauri config holding the sign command, which "Build Tauri
|
||||
|
||||
@@ -27,3 +27,7 @@ screenshot_for_fix/
|
||||
*.tfstate
|
||||
*.tfstate.*
|
||||
.terraform.tfstate.lock.info
|
||||
|
||||
# The bundled AWS session-manager-plugin sidecar (scripts/build-ssm-plugin.*, built from source) and the
|
||||
# debug-build placeholder build.rs writes there. Never committed.
|
||||
app/src-tauri/binaries/
|
||||
@@ -14,7 +14,8 @@ All frontend/tauri commands run from the `app/` directory:
|
||||
cd app
|
||||
npm ci # Install dependencies (required first time)
|
||||
npx tauri dev # Launch app in dev mode with hot reload (Vite on port 1420)
|
||||
npx tauri build # Production build (outputs to src-tauri/target/release/bundle/)
|
||||
npx tauri build # Production build (outputs to src-tauri/target/release/bundle/);
|
||||
# run ../scripts/build-ssm-plugin.sh first (bundled AWS plugin, see Packaging)
|
||||
npm run build # Frontend-only build (tsc + vite)
|
||||
npm run test # Run Vitest once
|
||||
npm run test:watch # Run Vitest in watch mode
|
||||
@@ -309,7 +310,11 @@ docker exec stdout → tokio task → emit("terminal-output-{sessionId}") → li
|
||||
that would be refused is skipped with a warning at connect. Opens are serialised per project and
|
||||
re-read the stored mappings under that lock; unchanged forwards are kept with their connections.
|
||||
Opened after every connect and on a save while connected; closed by every `tunnels::close*`
|
||||
path. A failing mapping is a `workspace-warning` (`topic: "ports"`). An idle listener makes no
|
||||
path. A failing mapping is a `workspace-warning` (`topic: "ports"`), and so is a Running project
|
||||
whose mappings could not be opened at all (no tunnel / tunnel replaced) — never silent. In the
|
||||
workspace each connection picks `127.0.0.1` or `[::1]` from `/proc/net/tcp{,6}`
|
||||
(`tunnel::mapping_command`; no probe connection), and the first socat "Connection refused" per
|
||||
mapping is a `ports` warning ("nothing is listening on port N"). An idle listener makes no
|
||||
agent request; a connection carrying traffic is activity (keeps the workspace from idling).
|
||||
`agent.rs` reuses `docker/exec.rs`'s `OneshotOutput`, host-file reader and uid probe so the two
|
||||
variants cannot drift; an `Agent` target's token never appears in `Debug` or error text.
|
||||
@@ -1225,10 +1230,77 @@ verbatim copy yields a launcher entry that starts nothing. It keeps `StartupWMCl
|
||||
the bundle sets it, which is what lets the shell match the window to the entry. Extraction uses
|
||||
`--appimage-extract`, which needs no FUSE, so the script works before `fuse2` is installed.
|
||||
|
||||
### The bundled AWS Session Manager plugin
|
||||
|
||||
AWS workspaces connect through AWS's `session-manager-plugin` (`host/ssm.rs`), and the app
|
||||
**bundles it as a Tauri sidecar** (`bundle.externalBin: binaries/session-manager-plugin`) so users
|
||||
need not install it. Tauri copies it beside the app binary with the `-<target-triple>` suffix
|
||||
stripped — `usr/bin/session-manager-plugin` in the AppImage, `Contents/MacOS/` on macOS, the
|
||||
install directory on Windows (`session-manager-plugin.exe`), and `target/<profile>/` under
|
||||
`tauri dev`. `find_plugin()` resolves `TRIPLEC_SSM_PLUGIN` → **that sidecar (beside
|
||||
`current_exe()`)** → `PATH` → AWS's install locations → the install hint; the order is
|
||||
unit-tested (`host/ssm/tests.rs`, `plugin_resolution`).
|
||||
|
||||
- **We build it from source; we never ship AWS's binaries.** AWS distributes its prebuilt plugin
|
||||
as "AWS Content" under the AWS Customer Agreement; the source (github.com/aws/session-manager-plugin)
|
||||
is Apache-2.0. `scripts/build-ssm-plugin.sh <triple>…` (Linux/macOS; any triple, it
|
||||
cross-compiles) and `scripts/build-ssm-plugin.ps1` (the Windows runner, which has no bash) take
|
||||
the tag's **commit** as GitHub's archive (pinned SHA-256, checked before extraction; the
|
||||
vendored SDK's Java `codegen/` and test `snapshot/` trees are not extracted — they reach 258
|
||||
characters, past Windows' MAX_PATH, so the `.ps1` also works under a short `C:\ssm-<8hex>` root)
|
||||
and a
|
||||
**pinned Go** from go.dev (go.dev's published SHA-256), and run the repo's own build — GOPATH
|
||||
mode over its vendored deps, `-ldflags "-s -w"`, `sessionmanagerplugin-main` — with `VERSION`
|
||||
stamped to the tag (the repo's file says `1.3.0.0`; AWS's pipeline stamps the real one, so
|
||||
`--version` would otherwise lie), plus `-trimpath`, no VCS stamp, empty build id, `CGO_ENABLED=0`
|
||||
and a scrubbed Go environment. **The output must equal a pinned SHA-256 per target**: Go builds
|
||||
are reproducible across hosts, so every runner must produce the exact bytes recorded in the
|
||||
scripts (verified locally: Linux-hosted builds of every target, repeated in fresh directories,
|
||||
and the `.ps1` flow, are identical). A mismatch fails the build and means the source, toolchain
|
||||
or flags changed — never "update the hash" without knowing which.
|
||||
- **Each platform job builds its own targets** before `tauri build` (Linux: `x86_64-unknown-linux-gnu`;
|
||||
macOS: `universal-apple-darwin`, i.e. both thin slices — tauri-build checks the arch it compiles —
|
||||
plus the `lipo`'d universal file the bundler wants, whose slices must thin back out byte-identical
|
||||
to the pins; Windows: the `.ps1`). Not one Linux job feeding the others: workflow artifacts do
|
||||
not work on this Gitea (see `build-app-preview.yml`'s header), and with reproducible output and
|
||||
pinned hashes nothing is gained by building once.
|
||||
- **Bumping** the plugin or Go: new pins in **both** scripts, rebuild every target, record the new
|
||||
output hashes, and update `app/src-tauri/THIRD_PARTY_NOTICES` (the scripts refuse to run unless
|
||||
its `Version:`/`Commit:` lines match) including its dependency licences.
|
||||
- **Debug builds get a placeholder; release builds refuse one.** tauri-build fails *any* build
|
||||
whose externalBin file is missing, `cargo test` included. `build.rs` (`ensure_ssm_sidecar`)
|
||||
writes a marked placeholder (`src/sidecar_placeholder.rs`) for a missing file when
|
||||
`PROFILE=debug`, so `cargo test`/`cargo check`/`tauri dev` and CI's `test` job need neither Go
|
||||
nor the network, and `find_plugin()` skips it (falling back to an installed plugin). With
|
||||
`PROFILE=release` a missing file **or** a placeholder stops the build, so a local `cargo build
|
||||
--release` needs the build script first. **build.rs rejects only a missing file or the
|
||||
placeholder, not a stale or wrong binary**: re-run `scripts/build-ssm-plugin.sh` before every
|
||||
local release build (it is a no-op when the file already matches the pin, and rebuilds it
|
||||
otherwise — e.g. after a pin bump, or after a Windows release build signed it in place). `finalize-appimage.sh` asserts the shipped
|
||||
`usr/bin/session-manager-plugin` is an ELF that runs `--version`.
|
||||
- **Windows: our build is unsigned, so the release signs it with our certificate.** Tauri runs
|
||||
`signtool verify /pa` on each sidecar and hands the unsigned one to the sign command, in place
|
||||
under `app\src-tauri\binaries` before any bundle (both MSI and NSIS pack that file);
|
||||
`windows-sign.ps1`'s allowlist includes it (one more metered signature per release: 6).
|
||||
`windows-verify-signatures.ps1` requires exactly one `session-manager-plugin.exe` in the MSI and
|
||||
the file NSIS packed to be validly signed, timestamped, **by the same signing identity
|
||||
(subject + issuer) as the installer** — not the thumbprint: Artifact Signing certificates are
|
||||
short-lived and rotate — and the signing log to show it. The MSI must also carry
|
||||
`THIRD_PARTY_NOTICES`; on macOS a workflow step checks the `.app` holds the two-slice plugin in
|
||||
`Contents/MacOS` and the notices in `Contents/Resources`. Previews ship it unsigned, like the app.
|
||||
- **macOS: signed exactly like the app.** The app is not code-signed (no `APPLE_*`/`signingIdentity`
|
||||
in the workflows); Go's linker ad-hoc signs the arm64 slice (needed to run on Apple Silicon). If
|
||||
signing is ever configured, Tauri signs externalBin with the app's identity, inside-out.
|
||||
- **Licence:** `app/src-tauri/THIRD_PARTY_NOTICES` (bundled as a resource; `usr/lib/Triple-C/` in
|
||||
the AppImage, asserted by `finalize-appimage.sh`) carries the plugin's Apache-2.0 LICENSE and
|
||||
NOTICE, the commit we build, the repo's own `THIRD-PARTY` file verbatim, the licence of every
|
||||
vendored module linked in (`go list -deps` for linux/darwin/windows) and Go's own. Note that the
|
||||
repo's `THIRD-PARTY` file opens with the same "AWS Content" sentence as the binary packages.
|
||||
|
||||
### Windows code signing
|
||||
|
||||
Windows **releases** (`build-app.yml`) are signed with **Azure Artifact Signing**: the app binary,
|
||||
the MSI, the NSIS installer and its uninstaller. Three scripts do it, and "Verify signatures"
|
||||
the bundled `session-manager-plugin`, the MSI, the NSIS installer and its uninstaller. Three scripts do it, and "Verify signatures"
|
||||
fails the job if any of them is unsigned or untimestamped, so an unsigned installer cannot ship
|
||||
quietly. **PR previews are deliberately not signed**, and `build-app-preview.yml` must not
|
||||
reference the signing secrets. Two reasons: signing is metered (about 1000 signatures a month,
|
||||
@@ -1246,12 +1318,13 @@ without releasing (see Releases above).
|
||||
- `scripts/windows-sign.ps1` is the sign command: `signtool sign /dlib` with SHA-256 and the
|
||||
Microsoft timestamp server, retried. Credentials never reach a command line — the dlib reads
|
||||
`AZURE_TENANT_ID` / `AZURE_CLIENT_ID` / `AZURE_CLIENT_SECRET` from the environment.
|
||||
**It signs only an allowlist of what ships**: 5 signatures per release (the app binary twice,
|
||||
**It signs only an allowlist of what ships**: 6 signatures per release (the app binary twice,
|
||||
because Tauri re-patches it between the MSI and NSIS bundles; the MSI; the NSIS installer;
|
||||
and its uninstaller). Tauri also presents build-time tools, the WiX extension DLLs and NSIS
|
||||
its uninstaller; and the `session-manager-plugin` sidecar we build from source). Tauri also presents build-time tools, the WiX extension DLLs and NSIS
|
||||
plugins, and signing those would more than double the metered count for no user-visible
|
||||
benefit. If the app ever ships resource DLLs or sidecars, extend the
|
||||
allowlist, or they will go out unsigned. Tauri reports a failed sign command only as
|
||||
allowlist, or they will go out unsigned (as `session-manager-plugin`'s entry does; see the
|
||||
section above). Tauri reports a failed sign command only as
|
||||
"failed to run powershell", so the script keeps a transcript (`.code-signing/sign-output.log`,
|
||||
`signtool /debug` included), and the job prints it on failure.
|
||||
- `scripts/windows-verify-signatures.ps1` checks `signtool verify /pa` plus a timestamp on the
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -14,6 +14,8 @@
|
||||
|
||||
#[path = "src/command_census.rs"]
|
||||
mod command_census;
|
||||
#[path = "src/sidecar_placeholder.rs"]
|
||||
mod sidecar_placeholder;
|
||||
|
||||
use std::path::Path;
|
||||
|
||||
@@ -79,6 +81,7 @@ fn main() {
|
||||
}
|
||||
|
||||
prune_permissions(&commands);
|
||||
ensure_ssm_sidecar();
|
||||
|
||||
// `AppManifest::commands` takes `&'static [&'static str]` and the struct is `Copy`, so
|
||||
// there is no owned form; leaking is fine in a process that exits right after.
|
||||
@@ -206,3 +209,50 @@ fn check_tauri_config() {
|
||||
fail("capabilities declared outside capabilities/", &problems, LAYOUT_HINT);
|
||||
}
|
||||
}
|
||||
|
||||
/// `bundle.externalBin` names `binaries/session-manager-plugin`, and tauri-build stops on a
|
||||
/// missing `binaries/session-manager-plugin-<target-triple>[.exe]` for every build, tests
|
||||
/// included. The real one is built from AWS's source by `scripts/build-ssm-plugin.sh` (`.ps1` on
|
||||
/// Windows), which CI runs before `tauri build`.
|
||||
///
|
||||
/// - **Release profile:** the real plugin is required. A missing file or a placeholder stops
|
||||
/// the build here, so a placeholder can never ship.
|
||||
/// - **Debug profile** (`cargo test`, `cargo check`, `tauri dev`): a missing file is replaced
|
||||
/// by a placeholder (`src/sidecar_placeholder.rs`) so no test run needs Go or the network. The app's
|
||||
/// `find_plugin` skips a placeholder and falls back to an installed plugin.
|
||||
fn ensure_ssm_sidecar() {
|
||||
let target = std::env::var("TARGET").expect("cargo sets TARGET");
|
||||
let ext = if target.contains("windows") { ".exe" } else { "" };
|
||||
let path = Path::new("binaries").join(format!("session-manager-plugin-{target}{ext}"));
|
||||
println!("cargo:rerun-if-changed={}", path.display());
|
||||
let release = std::env::var("PROFILE").as_deref() == Ok("release");
|
||||
let head = std::fs::read(&path).ok().map(|b| sidecar_placeholder::is_placeholder(&b));
|
||||
let build = if target.contains("windows") {
|
||||
"scripts\\build-ssm-plugin.ps1"
|
||||
} else {
|
||||
"scripts/build-ssm-plugin.sh"
|
||||
};
|
||||
match (head, release) {
|
||||
(Some(false), _) => {}
|
||||
(state, true) => fail(
|
||||
"the AWS Session Manager plugin sidecar is missing",
|
||||
&[format!(
|
||||
"{} is {} (release builds bundle the real plugin)",
|
||||
path.display(),
|
||||
if state.is_some() { "a debug-build placeholder" } else { "missing" }
|
||||
)],
|
||||
&format!("Run {build} {target} from the repository root first."),
|
||||
),
|
||||
(None, false) => {
|
||||
std::fs::create_dir_all("binaries").expect("create src-tauri/binaries");
|
||||
std::fs::write(&path, sidecar_placeholder::contents())
|
||||
.unwrap_or_else(|e| panic!("cannot write {}: {e}", path.display()));
|
||||
println!(
|
||||
"cargo:warning=no {} - wrote a placeholder (debug only; AWS workspaces use an \
|
||||
installed plugin). Run {build} to build the real one.",
|
||||
path.display()
|
||||
);
|
||||
}
|
||||
(Some(true), false) => {}
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@
|
||||
"dialog:allow-open",
|
||||
"dialog:allow-save",
|
||||
"allow-check-docker",
|
||||
"allow-check-docker-status",
|
||||
"allow-check-image-exists",
|
||||
"allow-build-image",
|
||||
"allow-get-container-info",
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"__app-acl__":{"default_permission":null,"permissions":{"allow-acquire-claude-token":{"identifier":"allow-acquire-claude-token","description":"Enables the acquire_claude_token command without any pre-configured scope.","commands":{"allow":["acquire_claude_token"],"deny":[]}},"allow-add-aws-keys-connection":{"identifier":"allow-add-aws-keys-connection","description":"Enables the add_aws_keys_connection command without any pre-configured scope.","commands":{"allow":["add_aws_keys_connection"],"deny":[]}},"allow-add-aws-profile-connection":{"identifier":"allow-add-aws-profile-connection","description":"Enables the add_aws_profile_connection command without any pre-configured scope.","commands":{"allow":["add_aws_profile_connection"],"deny":[]}},"allow-add-marketplace":{"identifier":"allow-add-marketplace","description":"Enables the add_marketplace command without any pre-configured scope.","commands":{"allow":["add_marketplace"],"deny":[]}},"allow-add-marketplace-gh-host-account":{"identifier":"allow-add-marketplace-gh-host-account","description":"Enables the add_marketplace_gh_host_account command without any pre-configured scope.","commands":{"allow":["add_marketplace_gh_host_account"],"deny":[]}},"allow-add-marketplace-token-account":{"identifier":"allow-add-marketplace-token-account","description":"Enables the add_marketplace_token_account command without any pre-configured scope.","commands":{"allow":["add_marketplace_token_account"],"deny":[]}},"allow-add-project":{"identifier":"allow-add-project","description":"Enables the add_project command without any pre-configured scope.","commands":{"allow":["add_project"],"deny":[]}},"allow-add-scheduled-task":{"identifier":"allow-add-scheduled-task","description":"Enables the add_scheduled_task command without any pre-configured scope.","commands":{"allow":["add_scheduled_task"],"deny":[]}},"allow-apply-marketplace-now":{"identifier":"allow-apply-marketplace-now","description":"Enables the apply_marketplace_now command without any pre-configured scope.","commands":{"allow":["apply_marketplace_now"],"deny":[]}},"allow-apply-settings-import":{"identifier":"allow-apply-settings-import","description":"Enables the apply_settings_import command without any pre-configured scope.","commands":{"allow":["apply_settings_import"],"deny":[]}},"allow-aws-connection-identity":{"identifier":"allow-aws-connection-identity","description":"Enables the aws_connection_identity command without any pre-configured scope.","commands":{"allow":["aws_connection_identity"],"deny":[]}},"allow-aws-connection-sso-login":{"identifier":"allow-aws-connection-sso-login","description":"Enables the aws_connection_sso_login command without any pre-configured scope.","commands":{"allow":["aws_connection_sso_login"],"deny":[]}},"allow-aws-cost-estimate":{"identifier":"allow-aws-cost-estimate","description":"Enables the aws_cost_estimate command without any pre-configured scope.","commands":{"allow":["aws_cost_estimate"],"deny":[]}},"allow-aws-ec2-capacity":{"identifier":"allow-aws-ec2-capacity","description":"Enables the aws_ec2_capacity command without any pre-configured scope.","commands":{"allow":["aws_ec2_capacity"],"deny":[]}},"allow-aws-environment-max-hours":{"identifier":"allow-aws-environment-max-hours","description":"Enables the aws_environment_max_hours command without any pre-configured scope.","commands":{"allow":["aws_environment_max_hours"],"deny":[]}},"allow-aws-policy-document":{"identifier":"allow-aws-policy-document","description":"Enables the aws_policy_document command without any pre-configured scope.","commands":{"allow":["aws_policy_document"],"deny":[]}},"allow-aws-sso-refresh":{"identifier":"allow-aws-sso-refresh","description":"Enables the aws_sso_refresh command without any pre-configured scope.","commands":{"allow":["aws_sso_refresh"],"deny":[]}},"allow-aws-task-log":{"identifier":"allow-aws-task-log","description":"Enables the aws_task_log command without any pre-configured scope.","commands":{"allow":["aws_task_log"],"deny":[]}},"allow-aws-workspace-status":{"identifier":"allow-aws-workspace-status","description":"Enables the aws_workspace_status command without any pre-configured scope.","commands":{"allow":["aws_workspace_status"],"deny":[]}},"allow-build-gateway-image":{"identifier":"allow-build-gateway-image","description":"Enables the build_gateway_image command without any pre-configured scope.","commands":{"allow":["build_gateway_image"],"deny":[]}},"allow-build-image":{"identifier":"allow-build-image","description":"Enables the build_image command without any pre-configured scope.","commands":{"allow":["build_image"],"deny":[]}},"allow-build-stt-image":{"identifier":"allow-build-stt-image","description":"Enables the build_stt_image command without any pre-configured scope.","commands":{"allow":["build_stt_image"],"deny":[]}},"allow-cancel-aws-deployment":{"identifier":"allow-cancel-aws-deployment","description":"Enables the cancel_aws_deployment command withoutLine truncated
|
||||
{"__app-acl__":{"default_permission":null,"permissions":{"allow-acquire-claude-token":{"identifier":"allow-acquire-claude-token","description":"Enables the acquire_claude_token command without any pre-configured scope.","commands":{"allow":["acquire_claude_token"],"deny":[]}},"allow-add-aws-keys-connection":{"identifier":"allow-add-aws-keys-connection","description":"Enables the add_aws_keys_connection command without any pre-configured scope.","commands":{"allow":["add_aws_keys_connection"],"deny":[]}},"allow-add-aws-profile-connection":{"identifier":"allow-add-aws-profile-connection","description":"Enables the add_aws_profile_connection command without any pre-configured scope.","commands":{"allow":["add_aws_profile_connection"],"deny":[]}},"allow-add-marketplace":{"identifier":"allow-add-marketplace","description":"Enables the add_marketplace command without any pre-configured scope.","commands":{"allow":["add_marketplace"],"deny":[]}},"allow-add-marketplace-gh-host-account":{"identifier":"allow-add-marketplace-gh-host-account","description":"Enables the add_marketplace_gh_host_account command without any pre-configured scope.","commands":{"allow":["add_marketplace_gh_host_account"],"deny":[]}},"allow-add-marketplace-token-account":{"identifier":"allow-add-marketplace-token-account","description":"Enables the add_marketplace_token_account command without any pre-configured scope.","commands":{"allow":["add_marketplace_token_account"],"deny":[]}},"allow-add-project":{"identifier":"allow-add-project","description":"Enables the add_project command without any pre-configured scope.","commands":{"allow":["add_project"],"deny":[]}},"allow-add-scheduled-task":{"identifier":"allow-add-scheduled-task","description":"Enables the add_scheduled_task command without any pre-configured scope.","commands":{"allow":["add_scheduled_task"],"deny":[]}},"allow-apply-marketplace-now":{"identifier":"allow-apply-marketplace-now","description":"Enables the apply_marketplace_now command without any pre-configured scope.","commands":{"allow":["apply_marketplace_now"],"deny":[]}},"allow-apply-settings-import":{"identifier":"allow-apply-settings-import","description":"Enables the apply_settings_import command without any pre-configured scope.","commands":{"allow":["apply_settings_import"],"deny":[]}},"allow-aws-connection-identity":{"identifier":"allow-aws-connection-identity","description":"Enables the aws_connection_identity command without any pre-configured scope.","commands":{"allow":["aws_connection_identity"],"deny":[]}},"allow-aws-connection-sso-login":{"identifier":"allow-aws-connection-sso-login","description":"Enables the aws_connection_sso_login command without any pre-configured scope.","commands":{"allow":["aws_connection_sso_login"],"deny":[]}},"allow-aws-cost-estimate":{"identifier":"allow-aws-cost-estimate","description":"Enables the aws_cost_estimate command without any pre-configured scope.","commands":{"allow":["aws_cost_estimate"],"deny":[]}},"allow-aws-ec2-capacity":{"identifier":"allow-aws-ec2-capacity","description":"Enables the aws_ec2_capacity command without any pre-configured scope.","commands":{"allow":["aws_ec2_capacity"],"deny":[]}},"allow-aws-environment-max-hours":{"identifier":"allow-aws-environment-max-hours","description":"Enables the aws_environment_max_hours command without any pre-configured scope.","commands":{"allow":["aws_environment_max_hours"],"deny":[]}},"allow-aws-policy-document":{"identifier":"allow-aws-policy-document","description":"Enables the aws_policy_document command without any pre-configured scope.","commands":{"allow":["aws_policy_document"],"deny":[]}},"allow-aws-sso-refresh":{"identifier":"allow-aws-sso-refresh","description":"Enables the aws_sso_refresh command without any pre-configured scope.","commands":{"allow":["aws_sso_refresh"],"deny":[]}},"allow-aws-task-log":{"identifier":"allow-aws-task-log","description":"Enables the aws_task_log command without any pre-configured scope.","commands":{"allow":["aws_task_log"],"deny":[]}},"allow-aws-workspace-status":{"identifier":"allow-aws-workspace-status","description":"Enables the aws_workspace_status command without any pre-configured scope.","commands":{"allow":["aws_workspace_status"],"deny":[]}},"allow-build-gateway-image":{"identifier":"allow-build-gateway-image","description":"Enables the build_gateway_image command without any pre-configured scope.","commands":{"allow":["build_gateway_image"],"deny":[]}},"allow-build-image":{"identifier":"allow-build-image","description":"Enables the build_image command without any pre-configured scope.","commands":{"allow":["build_image"],"deny":[]}},"allow-build-stt-image":{"identifier":"allow-build-stt-image","description":"Enables the build_stt_image command without any pre-configured scope.","commands":{"allow":["build_stt_image"],"deny":[]}},"allow-cancel-aws-deployment":{"identifier":"allow-cancel-aws-deployment","description":"Enables the cancel_aws_deployment command withoutLine truncated
|
||||
@@ -1 +1 @@
|
||||
{"default":{"identifier":"default","description":"Default capabilities for Triple-C. Every entry here is an IPC command a compromised webview can call directly, so the set is an enumeration of what `app/src` actually invokes — plugin and core grants verified against tauri 2.11.0's `PLUGINS` table in tauri's own `build.rs` rather than assumed from a plugin's `default` set, app-command grants (the bare `allow-*` entries) cross-checked by this crate's `build.rs` against `generate_handler!`. `core:default` in particular is NOT used: it is an alias for `core:{path,event,window,webview,app,image,resources,menu,tray}:default`, and `core:image:default` carries `allow-from-path`, whose handler (`tauri-2.11.0/src/image/plugin.rs:41` → `src/image/mod.rs:96`) is a bare `std::fs::read(path)` with no scope mechanism of any kind. Nothing imports `@tauri-apps/api/image`, so the whole plugin is dropped rather than scoped — there is nothing to scope it with. `core:menu` and `core:tray` are dropped for the same reason (no menu, no tray icon); `core:window` and `core:path` because nothing imports them; `core:resources:allow-close` because no frontend value is a `Resource`; and `core:event`'s `allow-emit`/`allow-emit-to` because the frontend only ever *listens* — every emit in this app originates in Rust. Three notes on what is deliberately kept or accepted: (1) `core:webview:allow-internal-toggle-devtools` is not called by `app/src` at all — it is called by Tauri's own injected `toggle-devtools.js`, which binds Ctrl/Cmd+Shift+I. Both that script and the command behind it are `#[cfg(any(debug_assertions, feature = \"devtools\"))]`, so this grant is a `tauri dev` convenience that does not exist in a release bundle. (2) `opener:allow-open-url` is **gone**. It could not be narrowed by host — `TerminalView`'s `WebLinksAddon` opens links Claude printed inside the container, which are arbitrary by construction, so a host allowlist would have deleted the feature rather than bounded it — and it was carried here as an accepted residual risk: a compromised webview could make the OS open an attacker-chosen http(s) URL, an outbound channel. That risk is now closed rather than recorded. Every host-browser open in the app goes through the `open_url_external` command in `url_open.rs`, which exists because the AppImage environment leaks into a cold-launched browser on Linux (triple-c#34) and which re-validates the URL in Rust — scheme allowlist, no embedded credentials, no control characters, length cap, ASCII asserted before `execvp`. On macOS and Windows that command reaches the same plugin as before, via `OpenerExt::open_url`, whose desktop implementation calls `crate::open::open` directly and is therefore not gated by this file at all (`tauri-plugin-opener-2.5.3/src/lib.rs:60`). The plugin stays a dependency for exactly that reason; what is removed is the webview's ability to reach it without passing the Rust validation. (3) `drag:allow-start-drag` is **gone**, together with the OS drag-out it existed for. It could not be scoped — `tauri-plugin-drag` takes the item paths from the caller and has no scope mechanism, so a compromised webview could call `startDrag({ item: ['~/.ssh/id_rsa'] })` against any host path the user can read — and it was carried as an accepted residual risk for one gesture. Drag-out was held back for separate hardening (see branch `hold/disk-and-dragout`) and the plugin is no longer a dependency. Getting a file *out* of a container is either \"Back up container\" on the project's Overview tab, which archives a tree through the Docker API, or the Files tab's per-row \"Save to host…\", which copies one file; getting one *in* is a drop on the Terminal or the Files tab's \"Upload…\". None of the four touches this permission. The Files tab's two are worth separating out here, because they are the only host-path commands in the app whose dialog is opened by **Rust** rather than by the webview — `pick_save_path` and `pick_files_to_upload` in `commands/file_commands.rs` drive `tauri-plugin-dialog` from the backend, so a compromised webview can ask for a picker and nothing more: it cannot name a host path as an *input* to either command. Be precise about the limit of that claim — host paths do still travel outward in error text (`Failed to create /home/j/Documents/x.txt.triple-c-part-1a2b3c4d: Permission denied`), including canonicalized ones, which disclose symlink targets. That is accepted; the app already hands the webview the project paths. What is closed is the direction that mattered — the webview naming where bytes go. That is the shape an earlier revision of this file named as the honest one if the Files tab ever regained host I/O, and it is the shape it regained it in. The `dialog:allow-open` / `dialog:allow-save` grants below are therefore *not* what those two use; they remain for the frontend pickers in Add Project, the Config tab's workspace and access sections, the CA-certificate fielLine truncated
|
||||
{"default":{"identifier":"default","description":"Default capabilities for Triple-C. Every entry here is an IPC command a compromised webview can call directly, so the set is an enumeration of what `app/src` actually invokes — plugin and core grants verified against tauri 2.11.0's `PLUGINS` table in tauri's own `build.rs` rather than assumed from a plugin's `default` set, app-command grants (the bare `allow-*` entries) cross-checked by this crate's `build.rs` against `generate_handler!`. `core:default` in particular is NOT used: it is an alias for `core:{path,event,window,webview,app,image,resources,menu,tray}:default`, and `core:image:default` carries `allow-from-path`, whose handler (`tauri-2.11.0/src/image/plugin.rs:41` → `src/image/mod.rs:96`) is a bare `std::fs::read(path)` with no scope mechanism of any kind. Nothing imports `@tauri-apps/api/image`, so the whole plugin is dropped rather than scoped — there is nothing to scope it with. `core:menu` and `core:tray` are dropped for the same reason (no menu, no tray icon); `core:window` and `core:path` because nothing imports them; `core:resources:allow-close` because no frontend value is a `Resource`; and `core:event`'s `allow-emit`/`allow-emit-to` because the frontend only ever *listens* — every emit in this app originates in Rust. Three notes on what is deliberately kept or accepted: (1) `core:webview:allow-internal-toggle-devtools` is not called by `app/src` at all — it is called by Tauri's own injected `toggle-devtools.js`, which binds Ctrl/Cmd+Shift+I. Both that script and the command behind it are `#[cfg(any(debug_assertions, feature = \"devtools\"))]`, so this grant is a `tauri dev` convenience that does not exist in a release bundle. (2) `opener:allow-open-url` is **gone**. It could not be narrowed by host — `TerminalView`'s `WebLinksAddon` opens links Claude printed inside the container, which are arbitrary by construction, so a host allowlist would have deleted the feature rather than bounded it — and it was carried here as an accepted residual risk: a compromised webview could make the OS open an attacker-chosen http(s) URL, an outbound channel. That risk is now closed rather than recorded. Every host-browser open in the app goes through the `open_url_external` command in `url_open.rs`, which exists because the AppImage environment leaks into a cold-launched browser on Linux (triple-c#34) and which re-validates the URL in Rust — scheme allowlist, no embedded credentials, no control characters, length cap, ASCII asserted before `execvp`. On macOS and Windows that command reaches the same plugin as before, via `OpenerExt::open_url`, whose desktop implementation calls `crate::open::open` directly and is therefore not gated by this file at all (`tauri-plugin-opener-2.5.3/src/lib.rs:60`). The plugin stays a dependency for exactly that reason; what is removed is the webview's ability to reach it without passing the Rust validation. (3) `drag:allow-start-drag` is **gone**, together with the OS drag-out it existed for. It could not be scoped — `tauri-plugin-drag` takes the item paths from the caller and has no scope mechanism, so a compromised webview could call `startDrag({ item: ['~/.ssh/id_rsa'] })` against any host path the user can read — and it was carried as an accepted residual risk for one gesture. Drag-out was held back for separate hardening (see branch `hold/disk-and-dragout`) and the plugin is no longer a dependency. Getting a file *out* of a container is either \"Back up container\" on the project's Overview tab, which archives a tree through the Docker API, or the Files tab's per-row \"Save to host…\", which copies one file; getting one *in* is a drop on the Terminal or the Files tab's \"Upload…\". None of the four touches this permission. The Files tab's two are worth separating out here, because they are the only host-path commands in the app whose dialog is opened by **Rust** rather than by the webview — `pick_save_path` and `pick_files_to_upload` in `commands/file_commands.rs` drive `tauri-plugin-dialog` from the backend, so a compromised webview can ask for a picker and nothing more: it cannot name a host path as an *input* to either command. Be precise about the limit of that claim — host paths do still travel outward in error text (`Failed to create /home/j/Documents/x.txt.triple-c-part-1a2b3c4d: Permission denied`), including canonicalized ones, which disclose symlink targets. That is accepted; the app already hands the webview the project paths. What is closed is the direction that mattered — the webview naming where bytes go. That is the shape an earlier revision of this file named as the honest one if the Files tab ever regained host I/O, and it is the shape it regained it in. The `dialog:allow-open` / `dialog:allow-save` grants below are therefore *not* what those two use; they remain for the frontend pickers in Add Project, the Config tab's workspace and access sections, the CA-certificate fielLine truncated
|
||||
@@ -512,6 +512,12 @@
|
||||
"const": "allow-check-docker",
|
||||
"markdownDescription": "Enables the check_docker command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Enables the check_docker_status command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
"const": "allow-check-docker-status",
|
||||
"markdownDescription": "Enables the check_docker_status command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Enables the check_for_updates command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
@@ -1502,6 +1508,12 @@
|
||||
"const": "deny-check-docker",
|
||||
"markdownDescription": "Denies the check_docker command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Denies the check_docker_status command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
"const": "deny-check-docker-status",
|
||||
"markdownDescription": "Denies the check_docker_status command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Denies the check_for_updates command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
|
||||
@@ -512,6 +512,12 @@
|
||||
"const": "allow-check-docker",
|
||||
"markdownDescription": "Enables the check_docker command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Enables the check_docker_status command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
"const": "allow-check-docker-status",
|
||||
"markdownDescription": "Enables the check_docker_status command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Enables the check_for_updates command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
@@ -1502,6 +1508,12 @@
|
||||
"const": "deny-check-docker",
|
||||
"markdownDescription": "Denies the check_docker command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Denies the check_docker_status command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
"const": "deny-check-docker-status",
|
||||
"markdownDescription": "Denies the check_docker_status command without any pre-configured scope."
|
||||
},
|
||||
{
|
||||
"description": "Denies the check_for_updates command without any pre-configured scope.",
|
||||
"type": "string",
|
||||
|
||||
@@ -54,6 +54,8 @@
|
||||
//! ([`IDLE_TIMEOUT`]).
|
||||
|
||||
use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::host::{AttachedExec, ContainerTarget, ExecChunk};
|
||||
@@ -158,19 +160,25 @@ impl PortForward {
|
||||
container_port: u16,
|
||||
family: PortFamily,
|
||||
) -> Result<Self, std::io::Error> {
|
||||
Self::bind_with(container, host_port, container_port, family, Gate::SignInCallback).await
|
||||
Self::bind_with(container, host_port, container_port, family, Gate::SignInCallback, None).await
|
||||
}
|
||||
|
||||
/// As [`bind`](Self::bind), for a project's port mapping on a host with
|
||||
/// no Docker port publishing (AWS): every connection is carried as is
|
||||
/// (see [`Gate::None`]).
|
||||
///
|
||||
/// Inside the workspace each connection goes to whichever loopback
|
||||
/// family has a listener on `container_port` ([`mapping_command`]), so a
|
||||
/// server bound to `[::1]` only is reached as well as one on
|
||||
/// `127.0.0.1`/`0.0.0.0`. `on_refused` is called (once per forward) the
|
||||
/// first time a connection finds nothing listening there.
|
||||
pub async fn bind_mapping(
|
||||
container: ContainerTarget,
|
||||
host_port: u16,
|
||||
container_port: u16,
|
||||
family: PortFamily,
|
||||
on_refused: Option<RefusedNotice>,
|
||||
) -> Result<Self, std::io::Error> {
|
||||
Self::bind_with(container, host_port, container_port, family, Gate::None).await
|
||||
Self::bind_with(container, host_port, container_port, PortFamily::Dual, Gate::None, on_refused).await
|
||||
}
|
||||
|
||||
async fn bind_with(
|
||||
@@ -179,6 +187,7 @@ impl PortForward {
|
||||
container_port: u16,
|
||||
family: PortFamily,
|
||||
gate: Gate,
|
||||
on_refused: Option<RefusedNotice>,
|
||||
) -> Result<Self, std::io::Error> {
|
||||
// SECURITY BOUNDARY: the host side binds loopback ONLY — 127.0.0.1 and
|
||||
// ::1, never 0.0.0.0 / ::. Everything reachable through this socket is
|
||||
@@ -222,8 +231,12 @@ impl PortForward {
|
||||
}
|
||||
};
|
||||
|
||||
let target = family.socat_target(container_port);
|
||||
let task = tokio::spawn(accept_loop(container, port, target, v4, v6, gate));
|
||||
let cmd = match gate {
|
||||
Gate::SignInCallback => socat_command(&family.socat_target(container_port)),
|
||||
Gate::None => mapping_command(container_port),
|
||||
};
|
||||
let refused = on_refused.map(|f| Arc::new(RefusedOnce { notice: f, fired: AtomicBool::new(false) }));
|
||||
let task = tokio::spawn(accept_loop(container, port, cmd, v4, v6, gate, refused));
|
||||
|
||||
Ok(Self {
|
||||
port,
|
||||
@@ -273,10 +286,11 @@ impl Gate {
|
||||
async fn accept_loop(
|
||||
container: ContainerTarget,
|
||||
port: u16,
|
||||
target: String,
|
||||
cmd: Vec<String>,
|
||||
v4: TcpListener,
|
||||
v6: Option<TcpListener>,
|
||||
gate: Gate,
|
||||
refused: Option<Arc<RefusedOnce>>,
|
||||
) {
|
||||
let mut conns: JoinSet<()> = JoinSet::new();
|
||||
|
||||
@@ -313,17 +327,18 @@ async fn accept_loop(
|
||||
match gate {
|
||||
Gate::SignInCallback => conns.spawn(tunnel_connection(
|
||||
container.clone(),
|
||||
target.clone(),
|
||||
cmd.clone(),
|
||||
stream,
|
||||
port,
|
||||
)),
|
||||
Gate::None => conns.spawn(tunnel_labelled(
|
||||
gate.label(),
|
||||
container.clone(),
|
||||
target.clone(),
|
||||
cmd.clone(),
|
||||
stream,
|
||||
port,
|
||||
Vec::new(),
|
||||
refused.clone(),
|
||||
)),
|
||||
};
|
||||
}
|
||||
@@ -353,7 +368,7 @@ async fn accept_optional(
|
||||
/// reaches the container at all — not even a `docker exec`.
|
||||
async fn tunnel_connection(
|
||||
container: ContainerTarget,
|
||||
target: String,
|
||||
cmd: Vec<String>,
|
||||
mut stream: TcpStream,
|
||||
port: u16,
|
||||
) {
|
||||
@@ -387,7 +402,7 @@ async fn tunnel_connection(
|
||||
}
|
||||
|
||||
// The bytes already off the socket go back on the wire first, byte-exact.
|
||||
tunnel_connection_with_prelude(container, target, stream, port, head.into_buffer()).await
|
||||
tunnel_labelled("Auth bridge", container, cmd, stream, port, head.into_buffer(), None).await
|
||||
}
|
||||
|
||||
/// What the first bytes of an accepted connection turned out to be.
|
||||
@@ -586,19 +601,20 @@ pub async fn tunnel_connection_with_prelude(
|
||||
port: u16,
|
||||
prelude: Vec<u8>,
|
||||
) {
|
||||
tunnel_labelled("Auth bridge", container, target, stream, port, prelude).await
|
||||
tunnel_labelled("Auth bridge", container, socat_command(&target), stream, port, prelude, None).await
|
||||
}
|
||||
|
||||
/// [`tunnel_connection_with_prelude`], logging under `label`.
|
||||
async fn tunnel_labelled(
|
||||
label: &'static str,
|
||||
container: ContainerTarget,
|
||||
target: String,
|
||||
cmd: Vec<String>,
|
||||
stream: TcpStream,
|
||||
port: u16,
|
||||
prelude: Vec<u8>,
|
||||
refused: Option<Arc<RefusedOnce>>,
|
||||
) {
|
||||
let cmd = vec!["socat".to_string(), "-".to_string(), target.clone()];
|
||||
let target = cmd.last().cloned().unwrap_or_default();
|
||||
|
||||
let AttachedExec {
|
||||
mut output,
|
||||
@@ -673,6 +689,12 @@ async fn tunnel_labelled(
|
||||
}
|
||||
}
|
||||
Ok(ExecChunk::StdErr(message)) => {
|
||||
if let Some(r) = &refused {
|
||||
if is_connection_refused(&message) {
|
||||
log::warn!("{}: host port {}: nothing is listening in the workspace", label, port);
|
||||
r.fire();
|
||||
}
|
||||
}
|
||||
log::debug!(
|
||||
"{}: socat stderr for port {}: {}", label,
|
||||
port,
|
||||
@@ -692,10 +714,113 @@ async fn tunnel_labelled(
|
||||
drop(upstream);
|
||||
}
|
||||
|
||||
/// Called the first time a port mapping's connection finds nothing
|
||||
/// listening on its workspace port.
|
||||
pub type RefusedNotice = Arc<dyn Fn() + Send + Sync>;
|
||||
|
||||
/// A [`RefusedNotice`] that fires once per forward.
|
||||
struct RefusedOnce {
|
||||
notice: RefusedNotice,
|
||||
fired: AtomicBool,
|
||||
}
|
||||
|
||||
impl RefusedOnce {
|
||||
fn fire(&self) {
|
||||
if !self.fired.swap(true, Ordering::SeqCst) {
|
||||
(self.notice)();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `socat` relaying stdio to `target`.
|
||||
fn socat_command(target: &str) -> Vec<String> {
|
||||
vec!["socat".to_string(), "-".to_string(), target.to_string()]
|
||||
}
|
||||
|
||||
/// Whether socat's stderr says the connect was refused (nothing listening).
|
||||
fn is_connection_refused(stderr: &[u8]) -> bool {
|
||||
String::from_utf8_lossy(stderr).contains("Connection refused")
|
||||
}
|
||||
|
||||
/// The in-workspace command of one port-mapping connection.
|
||||
///
|
||||
/// Docker publishes to the container's interface; a mapping reaches its
|
||||
/// loopback instead, where a server may listen on either family (Vite, or
|
||||
/// Node's `localhost` where it resolves to `::1`, listen on `[::1]` only).
|
||||
/// So the command picks, from `/proc/net/tcp{,6}` (the image has no `ss`),
|
||||
/// the family with a listener on `port`: `127.0.0.1` when one listens on
|
||||
/// `127.0.0.1` or `0.0.0.0`, else `[::1]` when one listens on `::1` or `::`.
|
||||
/// Nothing found: `127.0.0.1` anyway, and socat's "Connection refused" is
|
||||
/// what tells the host nothing listens. Reading `/proc` rather than trying
|
||||
/// a connect first means a server never sees a probe connection.
|
||||
pub(crate) fn mapping_command(port: u16) -> Vec<String> {
|
||||
// `port` is a u16: interpolating it into the script is safe.
|
||||
let script = format!(
|
||||
"h=$(printf ':%04X' {port}); \
|
||||
l() {{ awk -v a=\"$2$h\" -v b=\"$3$h\" '$4==\"0A\" && ($2==a || $2==b) {{f=1}} END {{exit !f}}' \"$1\" 2>/dev/null; }}; \
|
||||
if l /proc/net/tcp 0100007F 00000000; then exec socat - TCP:127.0.0.1:{port}; fi; \
|
||||
if l /proc/net/tcp6 00000000000000000000000001000000 00000000000000000000000000000000; \
|
||||
then exec socat - TCP6:[::1]:{port}; fi; \
|
||||
exec socat - TCP:127.0.0.1:{port}"
|
||||
);
|
||||
vec!["sh".to_string(), "-c".to_string(), script]
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn a_mapping_command_names_only_its_port_and_both_loopbacks() {
|
||||
let cmd = mapping_command(8080);
|
||||
assert_eq!(&cmd[..2], ["sh", "-c"]);
|
||||
let s = &cmd[2];
|
||||
assert!(s.contains("printf ':%04X' 8080"), "{s}");
|
||||
assert!(s.contains("TCP:127.0.0.1:8080") && s.contains("TCP6:[::1]:8080"), "{s}");
|
||||
// v4 first; the last resort is v4 too.
|
||||
assert!(s.find("TCP:127.0.0.1").unwrap() < s.find("TCP6:[::1]").unwrap());
|
||||
assert!(s.trim_end().ends_with("exec socat - TCP:127.0.0.1:8080"), "{s}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn socats_refusal_is_recognised() {
|
||||
assert!(is_connection_refused(
|
||||
b"2026/11/17 10:00:00 socat[42] E connect(5, AF=2 127.0.0.1:8080, 16): Connection refused\n"
|
||||
));
|
||||
assert!(!is_connection_refused(b"socat[42] N exiting with status 0"));
|
||||
}
|
||||
|
||||
/// The command picks the family from `/proc/net/tcp{,6}`: run it against
|
||||
/// real listeners where `sh`, `awk` and `socat` exist (skipped elsewhere).
|
||||
#[tokio::test]
|
||||
async fn a_mapping_command_reaches_a_v4_or_a_v6_only_listener() {
|
||||
let have = |b: &str| std::process::Command::new("sh").args(["-c", &format!("command -v {b}")]).output()
|
||||
.is_ok_and(|o| o.status.success());
|
||||
if !(have("awk") && have("socat") && std::path::Path::new("/proc/net/tcp").exists()) {
|
||||
eprintln!("skipped: needs sh, awk, socat and /proc/net");
|
||||
return;
|
||||
}
|
||||
for addr in ["127.0.0.1:0", "[::1]:0"] {
|
||||
let Ok(l) = TcpListener::bind(addr).await else { continue };
|
||||
let port = l.local_addr().unwrap().port();
|
||||
tokio::spawn(async move {
|
||||
if let Ok((mut s, _)) = l.accept().await {
|
||||
let _ = s.write_all(b"hello").await;
|
||||
}
|
||||
});
|
||||
let cmd = mapping_command(port);
|
||||
let out = tokio::process::Command::new(&cmd[0]).args(&cmd[1..])
|
||||
.stdin(std::process::Stdio::null()).output().await.unwrap();
|
||||
assert_eq!(String::from_utf8_lossy(&out.stdout), "hello", "{addr}: {}", String::from_utf8_lossy(&out.stderr));
|
||||
}
|
||||
// Nothing listening: refused, in socat's words.
|
||||
let port = std::net::TcpListener::bind("127.0.0.1:0").unwrap().local_addr().unwrap().port();
|
||||
let cmd = mapping_command(port);
|
||||
let out = tokio::process::Command::new(&cmd[0]).args(&cmd[1..])
|
||||
.stdin(std::process::Stdio::null()).output().await.unwrap();
|
||||
assert!(is_connection_refused(&out.stderr), "{}", String::from_utf8_lossy(&out.stderr));
|
||||
}
|
||||
|
||||
fn head(lines: &[&str]) -> String {
|
||||
format!("{}\r\n\r\n", lines.join("\r\n"))
|
||||
}
|
||||
|
||||
@@ -9,6 +9,12 @@ pub async fn check_docker() -> Result<bool, String> {
|
||||
docker::check_docker_available().await
|
||||
}
|
||||
|
||||
/// Like `check_docker`, but says *why* Docker is unavailable.
|
||||
#[tauri::command]
|
||||
pub async fn check_docker_status() -> Result<docker::status::DockerStatus, String> {
|
||||
Ok(docker::client::docker_status().await)
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn check_image_exists(state: State<'_, AppState>) -> Result<bool, String> {
|
||||
let settings = state.settings_store.get();
|
||||
|
||||
@@ -374,9 +374,10 @@ pub(crate) fn ec2_collision_refusal(
|
||||
/// Everything a self-onboarding apply needs settled before it starts: the
|
||||
/// caller's record, the capacity ([`resolve_ec2`]), the module variables
|
||||
/// and, with EC2 capacity, the name check ([`ec2_collision_refusal`]).
|
||||
/// Check-then-apply leaves a narrow race (another admin creating the same
|
||||
/// names in between); only admins apply, and the module would then fail on
|
||||
/// create rather than adopt.
|
||||
/// Check-then-apply leaves a narrow race (someone else creating the same
|
||||
/// names in between); the module would then fail on create rather than
|
||||
/// adopt. Anyone may start this: there is no tier check in the app, and AWS
|
||||
/// refuses (mapped to `AccessDenied`) what the caller isn't permitted.
|
||||
pub(crate) async fn prepare_onboarding<A: OnboardApi>(
|
||||
api: &A,
|
||||
env: &str,
|
||||
|
||||
@@ -1159,7 +1159,8 @@ pub async fn update_project(
|
||||
// AWS (Q6): a connected workspace's forwards follow the saved mappings
|
||||
// now — there is no container to recreate. Nothing when not connected.
|
||||
if saved.is_aws() && mappings_changed {
|
||||
if let Some(detail) = crate::host::port_forwards::open_for_project(&state.projects_store, &saved.id).await {
|
||||
let warn = ports_warner(&app_handle, &saved.id, &saved.name);
|
||||
if let Some(detail) = crate::host::port_forwards::open_for_project(&state.projects_store, &saved.id, Some(warn)).await {
|
||||
emit_ports_warning(&app_handle, &saved.id, &saved.name, &detail);
|
||||
}
|
||||
}
|
||||
@@ -1551,7 +1552,8 @@ async fn start_project_container_locked(
|
||||
// AWS (Q6): the project's port mappings become loopback forwards into
|
||||
// the workspace; a mapping that can't open is a warning, the rest work.
|
||||
if project.is_aws() {
|
||||
if let Some(detail) = crate::host::port_forwards::open_for_project(&state.projects_store, &project_id).await {
|
||||
let warn = ports_warner(&app_handle, &project_id, &project.name);
|
||||
if let Some(detail) = crate::host::port_forwards::open_for_project(&state.projects_store, &project_id, Some(warn)).await {
|
||||
emit_ports_warning(&app_handle, &project_id, &project.name, &detail);
|
||||
}
|
||||
}
|
||||
@@ -1628,12 +1630,23 @@ fn connect_warning_payload(project_id: &str, name: &str, detail: &str) -> serde_
|
||||
/// Port mappings that could not be forwarded to a connected AWS workspace
|
||||
/// (Q6): a busy host port, a host port mapped twice. Same `workspace-warning`
|
||||
/// event, with its own `topic` so it does not replace the other warnings.
|
||||
/// Where a port mapping's later notices ("nothing is listening") go: the
|
||||
/// same `ports` warning toast.
|
||||
fn ports_warner(app_handle: &tauri::AppHandle, project_id: &str, name: &str) -> crate::host::port_forwards::PortsWarn {
|
||||
let (handle, id, name) = (app_handle.clone(), project_id.to_string(), name.to_string());
|
||||
std::sync::Arc::new(move |detail: String| emit_ports_warning(&handle, &id, &name, &detail))
|
||||
}
|
||||
|
||||
fn emit_ports_warning(app_handle: &tauri::AppHandle, project_id: &str, name: &str, detail: &str) {
|
||||
let _ = app_handle.emit(
|
||||
"workspace-warning",
|
||||
serde_json::json!({
|
||||
"project_id": project_id,
|
||||
"message": format!("“{name}”: some port mappings could not be opened"),
|
||||
"message": if detail.contains("nothing is listening") {
|
||||
format!("“{name}”: a port mapping found nothing listening in the workspace")
|
||||
} else {
|
||||
format!("“{name}”: some port mappings could not be opened")
|
||||
},
|
||||
"detail": detail,
|
||||
"topic": "ports",
|
||||
}),
|
||||
@@ -3344,20 +3357,21 @@ mod tests {
|
||||
let start = fn_body(src, "start_project_container_locked");
|
||||
let running = start.find("update_status(&project_id, ProjectStatus::Running)").unwrap();
|
||||
let open = start
|
||||
.find("port_forwards::open_for_project(&state.projects_store, &project_id)")
|
||||
.find("port_forwards::open_for_project(&state.projects_store, &project_id, Some(warn))")
|
||||
.expect("the start opens them");
|
||||
assert!(open > running);
|
||||
let guard = start[..open].rfind("if project.is_aws() {").expect("AWS-only");
|
||||
assert!(start[guard..open].lines().count() <= 2);
|
||||
assert!(start[guard..open].lines().count() <= 3);
|
||||
assert!(start[guard..open].contains("let warn = ports_warner(&app_handle, &project_id, &project.name);"));
|
||||
assert!(start[open..].lines().nth(1).unwrap().contains("emit_ports_warning("));
|
||||
let update = fn_body(src, "update_project");
|
||||
assert!(update.contains("port_forwards::open_for_project(&state.projects_store, &saved.id)"));
|
||||
assert!(update.contains("port_forwards::open_for_project(&state.projects_store, &saved.id, Some(warn))"));
|
||||
let reconcile = fn_body(src, "reconcile_aws_projects");
|
||||
assert!(reconcile.contains("on_ports_warning,"));
|
||||
assert!(reconcile.contains("emit_ports_warning(&ports_handle, &ports_id, &ports_name, &detail)"));
|
||||
let aws_host = include_str!("../host/aws_host.rs");
|
||||
let reattached = aws_host.find("Ok(true) => {").unwrap();
|
||||
let opened = aws_host.find("port_forwards::open_for_project(&store, &project.id)").unwrap();
|
||||
let opened = aws_host.find("port_forwards::open_for_project(&store, &project.id, Some(warn.clone()))").unwrap();
|
||||
let pushed = aws_host[reattached..].find("connect::apply_connect(").unwrap() + reattached;
|
||||
assert!(reattached < opened && opened < pushed);
|
||||
}
|
||||
|
||||
@@ -15,16 +15,35 @@ pub fn get_docker() -> Result<Docker, String> {
|
||||
}
|
||||
|
||||
pub async fn check_docker_available() -> Result<bool, String> {
|
||||
let docker = get_docker()?;
|
||||
match docker.ping().await {
|
||||
Ok(_) => Ok(true),
|
||||
Err(_) => {
|
||||
// Connection object exists but daemon not responding — clear cache
|
||||
let mut guard = DOCKER.lock().map_err(|e| format!("Lock poisoned: {}", e))?;
|
||||
*guard = None;
|
||||
Ok(false)
|
||||
}
|
||||
}
|
||||
Ok(docker_status().await.state == super::status::DockerState::Running)
|
||||
}
|
||||
|
||||
/// Ping the daemon and, when it does not answer, say why: not installed, installed
|
||||
/// but not running, or running but refusing us. See `docker/status.rs`.
|
||||
pub async fn docker_status() -> super::status::DockerStatus {
|
||||
use super::status::{self, PingOutcome};
|
||||
let docker_host = std::env::var("DOCKER_HOST").ok();
|
||||
let os = status::current_os();
|
||||
let endpoint = status::endpoint(docker_host.as_deref());
|
||||
|
||||
let (ping, detail) = match get_docker() {
|
||||
Err(e) => (PingOutcome::Unreachable, Some(e)),
|
||||
Ok(docker) => match docker.ping().await {
|
||||
Ok(_) => (PingOutcome::Ok, None),
|
||||
Err(e) => {
|
||||
// Connection object exists but daemon not responding — clear cache
|
||||
if let Ok(mut guard) = DOCKER.lock() {
|
||||
*guard = None;
|
||||
}
|
||||
(status::ping_outcome_from_error(&e), Some(e.to_string()))
|
||||
}
|
||||
},
|
||||
};
|
||||
let installed = ping == PingOutcome::Unreachable
|
||||
&& (status::docker_installed(os, docker_host.as_deref())
|
||||
// An explicit DOCKER_HOST means the user has a daemon somewhere.
|
||||
|| docker_host.as_deref().is_some_and(|h| !h.trim().is_empty()));
|
||||
status::DockerStatus { state: status::classify(ping, installed), endpoint, detail, os }
|
||||
}
|
||||
|
||||
/// The daemon socket a project container gets bind-mounted when Docker access
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
pub mod ca_certs;
|
||||
pub mod client;
|
||||
pub mod status;
|
||||
pub mod events;
|
||||
pub mod container;
|
||||
pub mod workspace_env;
|
||||
|
||||
@@ -0,0 +1,282 @@
|
||||
//! Why Docker is unavailable, not just whether it is.
|
||||
//!
|
||||
//! A daemon that failed to start (systemd `start-limit-hit`, Docker Desktop
|
||||
//! still booting) and a socket the user may not open both used to surface as
|
||||
//! "Docker not detected — install it", which sends people to reinstall
|
||||
//! something they already have. This module tells the cases apart from the
|
||||
//! ping's error and a few cheap filesystem probes. It never runs a process
|
||||
//! (no `systemctl`, no `docker info`).
|
||||
|
||||
use serde::Serialize;
|
||||
use std::error::Error as StdError;
|
||||
use std::io;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
/// Mirrors `DockerStatus` in `src/lib/types.ts`.
|
||||
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||
pub struct DockerStatus {
|
||||
/// `running` | `not_running` | `no_permission` | `not_installed`
|
||||
pub state: DockerState,
|
||||
/// The endpoint that was tried — `DOCKER_HOST` when set, else the default socket/pipe.
|
||||
pub endpoint: String,
|
||||
/// The connection error, for the "details" line. `None` when running.
|
||||
pub detail: Option<String>,
|
||||
/// `linux` | `macos` | `windows` | `unknown` — picks the guidance to show.
|
||||
pub os: &'static str,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, Serialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum DockerState {
|
||||
Running,
|
||||
NotRunning,
|
||||
NoPermission,
|
||||
NotInstalled,
|
||||
}
|
||||
|
||||
/// What the ping told us, reduced to what matters for the classification.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum PingOutcome {
|
||||
Ok,
|
||||
/// The socket/pipe exists but the OS refused to let us open it.
|
||||
PermissionDenied,
|
||||
/// Nothing answered: socket missing, connection refused, timeout, other.
|
||||
Unreachable,
|
||||
}
|
||||
|
||||
/// The pure decision. `installed` is true when any installed-ness probe hit.
|
||||
pub fn classify(ping: PingOutcome, installed: bool) -> DockerState {
|
||||
match ping {
|
||||
PingOutcome::Ok => DockerState::Running,
|
||||
// Getting EACCES means something is listening on a socket we can't
|
||||
// open — Docker is there; the user lacks access.
|
||||
PingOutcome::PermissionDenied => DockerState::NoPermission,
|
||||
PingOutcome::Unreachable if installed => DockerState::NotRunning,
|
||||
PingOutcome::Unreachable => DockerState::NotInstalled,
|
||||
}
|
||||
}
|
||||
|
||||
/// Walk an error's `source()` chain for an `io::Error` and map its kind.
|
||||
/// Falls back to the rendered message, since some layers (hyper-util's
|
||||
/// connect errors, named pipes) only keep the OS error as text.
|
||||
pub fn ping_outcome_from_error(err: &(dyn StdError + 'static)) -> PingOutcome {
|
||||
let mut cur: Option<&(dyn StdError + 'static)> = Some(err);
|
||||
let mut text = String::new();
|
||||
while let Some(e) = cur {
|
||||
if let Some(ioe) = e.downcast_ref::<io::Error>() {
|
||||
if ioe.kind() == io::ErrorKind::PermissionDenied {
|
||||
return PingOutcome::PermissionDenied;
|
||||
}
|
||||
}
|
||||
text.push_str(&e.to_string().to_lowercase());
|
||||
text.push('\n');
|
||||
cur = e.source();
|
||||
}
|
||||
if text.contains("permission denied") || text.contains("access is denied") || text.contains("os error 13") {
|
||||
PingOutcome::PermissionDenied
|
||||
} else {
|
||||
PingOutcome::Unreachable
|
||||
}
|
||||
}
|
||||
|
||||
/// The endpoint bollard's `connect_with_local_defaults` will use.
|
||||
pub fn endpoint(docker_host: Option<&str>) -> String {
|
||||
match docker_host.map(str::trim).filter(|h| !h.is_empty()) {
|
||||
Some(h) => h.to_string(),
|
||||
None if cfg!(windows) => "npipe:////./pipe/docker_engine".to_string(),
|
||||
None => "unix:///var/run/docker.sock".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn current_os() -> &'static str {
|
||||
if cfg!(target_os = "linux") {
|
||||
"linux"
|
||||
} else if cfg!(target_os = "macos") {
|
||||
"macos"
|
||||
} else if cfg!(windows) {
|
||||
"windows"
|
||||
} else {
|
||||
"unknown"
|
||||
}
|
||||
}
|
||||
|
||||
/// Paths whose existence means Docker is installed on this OS. Pure so the
|
||||
/// list can be tested; `docker_installed` does the filesystem checks.
|
||||
pub fn install_markers(os: &str, home: Option<&Path>, docker_host: Option<&str>) -> Vec<PathBuf> {
|
||||
let mut v: Vec<PathBuf> = Vec::new();
|
||||
// A unix:// DOCKER_HOST whose socket file exists counts, whatever the OS.
|
||||
if let Some(p) = docker_host.and_then(|h| h.trim().strip_prefix("unix://")) {
|
||||
if !p.is_empty() {
|
||||
v.push(PathBuf::from(p));
|
||||
}
|
||||
}
|
||||
match os {
|
||||
"linux" => {
|
||||
v.extend(
|
||||
["/usr/bin/dockerd", "/usr/local/bin/dockerd", "/usr/bin/docker", "/var/run/docker.sock", "/run/docker.sock"]
|
||||
.iter()
|
||||
.map(PathBuf::from),
|
||||
);
|
||||
if let Some(h) = home {
|
||||
v.push(h.join(".docker/desktop"));
|
||||
v.push(h.join("bin/dockerd")); // rootless install script
|
||||
}
|
||||
}
|
||||
"macos" => {
|
||||
v.push(PathBuf::from("/Applications/Docker.app"));
|
||||
v.push(PathBuf::from("/var/run/docker.sock"));
|
||||
v.push(PathBuf::from("/usr/local/bin/docker"));
|
||||
if let Some(h) = home {
|
||||
v.push(h.join("Applications/Docker.app"));
|
||||
v.push(h.join(".docker/run/docker.sock"));
|
||||
}
|
||||
}
|
||||
"windows" => {
|
||||
v.push(PathBuf::from(r"C:\Program Files\Docker\Docker\Docker Desktop.exe"));
|
||||
v.push(PathBuf::from(r"C:\Program Files\Docker\Docker\resources\bin\docker.exe"));
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
v
|
||||
}
|
||||
|
||||
/// Executable names to look for on `PATH`.
|
||||
pub fn path_binaries(os: &str) -> &'static [&'static str] {
|
||||
match os {
|
||||
"windows" => &["docker.exe"],
|
||||
_ => &["docker", "dockerd"],
|
||||
}
|
||||
}
|
||||
|
||||
fn on_path(name: &str) -> bool {
|
||||
std::env::var_os("PATH")
|
||||
.map(|p| std::env::split_paths(&p).any(|dir| dir.join(name).is_file()))
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
/// Cheap installed-ness probe: stats a handful of paths, runs nothing.
|
||||
pub fn docker_installed(os: &str, docker_host: Option<&str>) -> bool {
|
||||
let home = dirs::home_dir();
|
||||
if install_markers(os, home.as_deref(), docker_host).iter().any(|p| p.exists()) {
|
||||
return true;
|
||||
}
|
||||
if os == "linux" {
|
||||
// Rootless Docker's socket lives in the user's runtime dir.
|
||||
if let Some(rt) = std::env::var_os("XDG_RUNTIME_DIR") {
|
||||
if Path::new(&rt).join("docker.sock").exists() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
path_binaries(os).iter().any(|b| on_path(b))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::fmt;
|
||||
|
||||
#[test]
|
||||
fn ping_ok_is_running_regardless_of_probes() {
|
||||
assert_eq!(classify(PingOutcome::Ok, false), DockerState::Running);
|
||||
assert_eq!(classify(PingOutcome::Ok, true), DockerState::Running);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unreachable_and_installed_is_not_running() {
|
||||
// The reported case: dockerd present, systemd gave up restarting it.
|
||||
assert_eq!(classify(PingOutcome::Unreachable, true), DockerState::NotRunning);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unreachable_and_nothing_found_is_not_installed() {
|
||||
assert_eq!(classify(PingOutcome::Unreachable, false), DockerState::NotInstalled);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn permission_denied_is_no_permission_even_without_probes() {
|
||||
assert_eq!(classify(PingOutcome::PermissionDenied, false), DockerState::NoPermission);
|
||||
assert_eq!(classify(PingOutcome::PermissionDenied, true), DockerState::NoPermission);
|
||||
}
|
||||
|
||||
/// An error that wraps another, the way bollard → hyper → io do.
|
||||
#[derive(Debug)]
|
||||
struct Wrap(&'static str, Option<io::Error>);
|
||||
impl fmt::Display for Wrap {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.write_str(self.0)
|
||||
}
|
||||
}
|
||||
impl StdError for Wrap {
|
||||
fn source(&self) -> Option<&(dyn StdError + 'static)> {
|
||||
self.1.as_ref().map(|e| e as _)
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nested_io_permission_denied_is_found() {
|
||||
let e = Wrap("error trying to connect", Some(io::Error::from(io::ErrorKind::PermissionDenied)));
|
||||
assert_eq!(ping_outcome_from_error(&e), PingOutcome::PermissionDenied);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nested_connection_refused_and_not_found_are_unreachable() {
|
||||
let refused = Wrap("error trying to connect", Some(io::Error::from(io::ErrorKind::ConnectionRefused)));
|
||||
let missing = Wrap("error trying to connect", Some(io::Error::from(io::ErrorKind::NotFound)));
|
||||
assert_eq!(ping_outcome_from_error(&refused), PingOutcome::Unreachable);
|
||||
assert_eq!(ping_outcome_from_error(&missing), PingOutcome::Unreachable);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn permission_denied_only_in_text_is_found() {
|
||||
let e = Wrap("client error (Connect): Permission denied (os error 13)", None);
|
||||
assert_eq!(ping_outcome_from_error(&e), PingOutcome::PermissionDenied);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn endpoint_respects_docker_host() {
|
||||
assert_eq!(endpoint(Some("tcp://10.0.0.5:2375")), "tcp://10.0.0.5:2375");
|
||||
assert_eq!(endpoint(Some(" ")), endpoint(None));
|
||||
let default = endpoint(None);
|
||||
assert!(default.starts_with("unix://") || default.starts_with("npipe://"), "{default}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn install_markers_cover_each_os() {
|
||||
let home = Path::new("/home/u");
|
||||
let linux = install_markers("linux", Some(home), None);
|
||||
assert!(linux.contains(&PathBuf::from("/usr/bin/dockerd")));
|
||||
assert!(linux.contains(&PathBuf::from("/var/run/docker.sock")));
|
||||
assert!(linux.contains(&home.join(".docker/desktop")));
|
||||
|
||||
let mac = install_markers("macos", Some(home), None);
|
||||
assert!(mac.contains(&PathBuf::from("/Applications/Docker.app")));
|
||||
assert!(mac.contains(&home.join(".docker/run/docker.sock")));
|
||||
|
||||
let win = install_markers("windows", None, None);
|
||||
assert!(win.contains(&PathBuf::from(r"C:\Program Files\Docker\Docker\Docker Desktop.exe")));
|
||||
assert_eq!(path_binaries("windows"), &["docker.exe"]);
|
||||
assert!(path_binaries("linux").contains(&"dockerd"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unix_docker_host_socket_is_a_marker() {
|
||||
let m = install_markers("linux", None, Some("unix:///run/user/1000/docker.sock"));
|
||||
assert_eq!(m[0], PathBuf::from("/run/user/1000/docker.sock"));
|
||||
let tcp = install_markers("linux", None, Some("tcp://host:2375"));
|
||||
assert!(!tcp.iter().any(|p| p.to_string_lossy().contains("host")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn status_serializes_with_snake_case_state() {
|
||||
let s = DockerStatus {
|
||||
state: DockerState::NotRunning,
|
||||
endpoint: "unix:///var/run/docker.sock".into(),
|
||||
detail: Some("refused".into()),
|
||||
os: "linux",
|
||||
};
|
||||
let json = serde_json::to_value(&s).unwrap();
|
||||
assert_eq!(json["state"], "not_running");
|
||||
assert_eq!(json["os"], "linux");
|
||||
}
|
||||
}
|
||||
@@ -374,6 +374,25 @@ fn refusal_message(e: &str) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
/// The edge image: what `main` builds, ahead of `:latest` between releases.
|
||||
const EDGE_IMAGE: &str = "ghcr.io/shadowdao/triple-c-sandbox:edge";
|
||||
|
||||
/// What the user is told when the agent never answers through the tunnel.
|
||||
/// The usual cause is an image whose entrypoint predates AWS mode and never
|
||||
/// starts the agent: the registry's `:latest` moves only on a release.
|
||||
/// `image` is the one the task ran, when the caller knows it.
|
||||
fn agent_silent_message(image: Option<&str>) -> String {
|
||||
let which = match image {
|
||||
Some(i) => format!("The image \"{}\"", i.escape_debug()),
|
||||
None => "The workspace's image".to_string(),
|
||||
};
|
||||
format!(
|
||||
"The workspace's agent did not answer through the tunnel. {which} may be older than this \
|
||||
app's AWS support: the registry's :latest moves only when a release is cut. Until then, \
|
||||
set Settings → Docker → Custom image to {EDGE_IMAGE}, then start the project again."
|
||||
)
|
||||
}
|
||||
|
||||
/// Wait for the agent behind `ep` to answer. A refusal (wrong token) is
|
||||
/// final; silence is retried until [`HEALTH_TIMEOUT`].
|
||||
async fn wait_healthy(ep: &AgentEndpoint) -> Result<(), String> {
|
||||
@@ -385,11 +404,7 @@ async fn wait_healthy(ep: &AgentEndpoint) -> Result<(), String> {
|
||||
Err(e) => return Err(refusal_message(&e)),
|
||||
}
|
||||
if tokio::time::Instant::now() + HEALTH_INTERVAL > deadline {
|
||||
return Err(
|
||||
"The workspace's agent did not answer through the tunnel. Check that the image \
|
||||
includes triple-c-agent, then start the project again."
|
||||
.into(),
|
||||
);
|
||||
return Err(agent_silent_message(None));
|
||||
}
|
||||
tokio::time::sleep(HEALTH_INTERVAL).await;
|
||||
}
|
||||
@@ -967,7 +982,8 @@ pub async fn start_core<T: TaskApi, W: WorkspaceApi, R: RuntimeApi, C: Connector
|
||||
if created && stop_created(tasks, &task_cluster(&env, &task.arn), &task.arn).await {
|
||||
(inp.on_task)(None);
|
||||
}
|
||||
Err(e)
|
||||
// Name the image this start ran (the connector doesn't know it).
|
||||
Err(if e == agent_silent_message(None) { agent_silent_message(Some(inp.image)) } else { e })
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1621,7 +1637,7 @@ pub async fn reconcile(
|
||||
settings: &AppSettings,
|
||||
store: Arc<ProjectsStore>,
|
||||
on_connect_warning: impl FnOnce(String) + Send + 'static,
|
||||
on_ports_warning: impl FnOnce(String) + Send + 'static,
|
||||
on_ports_warning: impl Fn(String) + Send + Sync + 'static,
|
||||
on_interrupted_warning: impl FnOnce(String) + Send + 'static,
|
||||
) {
|
||||
let (connection_id, region, sdk) = match project_sdk(project, settings).await {
|
||||
@@ -1652,8 +1668,11 @@ pub async fn reconcile(
|
||||
Ok(true) => {
|
||||
// Q6: the port mappings' forwards, before the
|
||||
// (slower) credential copy.
|
||||
if let Some(detail) = super::port_forwards::open_for_project(&store, &project.id).await {
|
||||
on_ports_warning(detail);
|
||||
let warn: super::port_forwards::PortsWarn = Arc::new(on_ports_warning);
|
||||
if let Some(detail) =
|
||||
super::port_forwards::open_for_project(&store, &project.id, Some(warn.clone())).await
|
||||
{
|
||||
warn(detail);
|
||||
}
|
||||
if let Err(e) = connect::apply_connect(&project, &settings).await {
|
||||
log::warn!("Project {}: could not copy the credentials in: {e}", project.id);
|
||||
|
||||
@@ -93,6 +93,8 @@ struct Fake {
|
||||
logs: Vec<String>,
|
||||
role: Option<Knowable>,
|
||||
connect_fails: bool,
|
||||
/// The connector times out waiting for the agent (an image without it).
|
||||
agent_silent: bool,
|
||||
connect_tokens: Mutex<Vec<String>>,
|
||||
secret_json: Mutex<Option<String>>,
|
||||
/// A losing start rotates the secret's token while this one connects.
|
||||
@@ -309,6 +311,9 @@ impl Connector for Fake {
|
||||
v["TRIPLEC_AGENT_TOKEN"] = "the-losers-token".into();
|
||||
*j = Some(v.to_string());
|
||||
}
|
||||
if self.agent_silent {
|
||||
return Err(agent_silent_message(None));
|
||||
}
|
||||
if self.connect_fails {
|
||||
return Err("session-manager-plugin was not found".into());
|
||||
}
|
||||
@@ -586,6 +591,25 @@ async fn a_tunnel_failure_stops_a_task_this_start_ran_but_never_an_attached_one(
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_silent_agent_names_the_image_and_the_edge_tag() {
|
||||
let p = aws_project(StorageMode::Ephemeral);
|
||||
let fake = Fake { run: Some(task(&p, "new", "RUNNING", true)), agent_silent: true, ..Default::default() };
|
||||
let e = start(&fake, &p).await.0.err().unwrap();
|
||||
assert!(e.contains(&format!("\"{REGISTRY_IMAGE}\"")), "{e}");
|
||||
assert!(e.contains("older than this app's AWS support"), "{e}");
|
||||
assert!(e.contains(":latest moves only when a release is cut"), "{e}");
|
||||
assert!(e.contains("Settings → Docker → Custom image to ghcr.io/shadowdao/triple-c-sandbox:edge"), "{e}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_silent_agent_message_escapes_the_image_name() {
|
||||
let m = agent_silent_message(Some("evil\"\nimage"));
|
||||
assert!(m.contains(r#""evil\"\nimage""#), "{m}");
|
||||
assert!(!m.contains('\n'));
|
||||
assert!(agent_silent_message(None).contains("The workspace's image may be older"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_user_who_has_not_joined_is_told_before_anything_is_written() {
|
||||
let p = aws_project(StorageMode::Hybrid);
|
||||
|
||||
@@ -11,7 +11,9 @@
|
||||
//! ## Two differences from Docker, both deliberate
|
||||
//!
|
||||
//! * **It reaches the workspace's loopback, not its network interface**
|
||||
//! (`socat … TCP:127.0.0.1:<port>` inside the task). So a mapping can
|
||||
//! (`socat` to `127.0.0.1:<port>`, or `[::1]:<port>` when only an IPv6
|
||||
//! loopback/wildcard socket listens there — see
|
||||
//! [`crate::auth_bridge::tunnel::mapping_command`]). So a mapping can
|
||||
//! reach a service that bound loopback precisely to be private — which is
|
||||
//! why the agent's port, the browser view's range and (when the project
|
||||
//! runs it) the gateway sidecar's [`GATEWAY_SIDECAR_PORT`] are refused.
|
||||
@@ -46,7 +48,6 @@
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
use crate::auth_bridge::proc_net::PortFamily;
|
||||
use crate::auth_bridge::tunnel::PortForward;
|
||||
use crate::auth_bridge::{RESERVED_CONTAINER_PORTS, RESERVED_HOST_PORTS};
|
||||
use crate::models::PortMapping;
|
||||
@@ -54,6 +55,18 @@ use crate::storage::projects_store::ProjectsStore;
|
||||
|
||||
use super::ContainerTarget;
|
||||
|
||||
/// Where a warning about a mapping goes after the open has returned: the
|
||||
/// first connection that finds nothing listening in the workspace.
|
||||
pub type PortsWarn = Arc<dyn Fn(String) + Send + Sync>;
|
||||
|
||||
/// What the user is told when a mapping's workspace port has no listener.
|
||||
pub fn nothing_listening(host_port: u16, container_port: u16) -> String {
|
||||
format!(
|
||||
"localhost:{host_port}: nothing is listening on port {container_port} in the workspace \
|
||||
(127.0.0.1 or ::1)"
|
||||
)
|
||||
}
|
||||
|
||||
/// What became of one mapping: `error` is `None` when its forward is open.
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub struct PortForwardResult {
|
||||
@@ -215,7 +228,7 @@ pub async fn open_for(
|
||||
mappings: &[PortMapping],
|
||||
) -> Vec<PortForwardResult> {
|
||||
let mappings = mappings.to_vec();
|
||||
open_latest(project_id, target, move || Some((mappings, false))).await
|
||||
open_latest(project_id, target, None, move || Some((mappings, false))).await
|
||||
}
|
||||
|
||||
/// Open the project's mappings into `target`, replacing the set it had.
|
||||
@@ -232,14 +245,22 @@ pub async fn open_for(
|
||||
pub async fn open_latest(
|
||||
project_id: &str,
|
||||
target: &ContainerTarget,
|
||||
warn: Option<PortsWarn>,
|
||||
read: impl FnOnce() -> Option<(Vec<PortMapping>, bool)> + Send,
|
||||
) -> Vec<PortForwardResult> {
|
||||
let plock = project_lock(project_id);
|
||||
let _held = plock.lock().await;
|
||||
let Some((mappings, gateway_sidecar)) = read() else {
|
||||
log::info!("Project {project_id}: no longer an AWS project; closing its port forwards");
|
||||
close_unlocked(project_id).await;
|
||||
return Vec::new();
|
||||
};
|
||||
log::info!(
|
||||
"Project {project_id}: opening port mappings into {} ({} stored, {} incomplete)",
|
||||
target.id(),
|
||||
mappings.len(),
|
||||
mappings.iter().filter(|m| incomplete(m)).count()
|
||||
);
|
||||
|
||||
// What can be forwarded, in order; the first row wins a host port.
|
||||
let mut results: Vec<PortForwardResult> = Vec::new();
|
||||
@@ -284,7 +305,12 @@ pub async fn open_latest(
|
||||
opened.push(f);
|
||||
continue;
|
||||
}
|
||||
match PortForward::bind_mapping(target.clone(), host_port, container_port, PortFamily::V4).await {
|
||||
let on_refused = warn.clone().map(|w| {
|
||||
let notice: crate::auth_bridge::tunnel::RefusedNotice =
|
||||
Arc::new(move || w(nothing_listening(host_port, container_port)));
|
||||
notice
|
||||
});
|
||||
match PortForward::bind_mapping(target.clone(), host_port, container_port, on_refused).await {
|
||||
Ok(fwd) => {
|
||||
if let Some(w) = &fwd.ipv6_warning {
|
||||
log::warn!("Project {project_id}: port mapping {host_port}: {w}");
|
||||
@@ -313,11 +339,25 @@ pub async fn open_latest(
|
||||
// Checked *after* the set is registered: a tunnel close that ran before
|
||||
// this sees it gone here; one that runs after removes it itself.
|
||||
if !still_connected(project_id, target) {
|
||||
log::warn!(
|
||||
"Project {project_id}: the workspace's tunnel is no longer {} — closing the port forwards just opened",
|
||||
target.id()
|
||||
);
|
||||
close_unlocked(project_id).await;
|
||||
for r in results.iter_mut().filter(|r| r.error.is_none()) {
|
||||
r.error = Some("the workspace disconnected".into());
|
||||
}
|
||||
}
|
||||
for r in &results {
|
||||
match &r.error {
|
||||
None => log::info!(
|
||||
"Project {project_id}: port mapping localhost:{} → workspace port {} is open",
|
||||
r.mapping.host_port,
|
||||
r.mapping.container_port
|
||||
),
|
||||
Some(e) => log::warn!("Project {project_id}: port mapping not open: {e}"),
|
||||
}
|
||||
}
|
||||
results
|
||||
}
|
||||
|
||||
@@ -337,6 +377,9 @@ pub async fn close(project_id: &str) {
|
||||
async fn close_unlocked(project_id: &str) {
|
||||
let set = lock().remove(project_id);
|
||||
if let Some(set) = set {
|
||||
if !set.forwards.is_empty() {
|
||||
log::info!("Project {project_id}: closing {} port forward(s)", set.forwards.len());
|
||||
}
|
||||
shutdown_all(set.forwards).await;
|
||||
}
|
||||
}
|
||||
@@ -352,20 +395,38 @@ pub async fn close_all() {
|
||||
/// After a connect (or a save of the mappings while connected): open an
|
||||
/// AWS project's mappings, **as stored when the open runs**, into its
|
||||
/// connected workspace. The warning detail for the mappings that failed, if
|
||||
/// any did; `None` as well for a local project (Docker publishes its own) or
|
||||
/// a workspace that is not (or no longer) connected.
|
||||
pub async fn open_for_project(store: &ProjectsStore, project_id: &str) -> Option<String> {
|
||||
/// any did; `None` for a local project (Docker publishes its own), and for a
|
||||
/// workspace that is not (or no longer) connected **unless the project is
|
||||
/// Running** — mappings that should be open and aren't are never silent.
|
||||
/// `warn` receives the later "nothing is listening" notices.
|
||||
pub async fn open_for_project(
|
||||
store: &ProjectsStore,
|
||||
project_id: &str,
|
||||
warn: Option<PortsWarn>,
|
||||
) -> Option<String> {
|
||||
let project = store.get(project_id).filter(|p| p.is_aws())?;
|
||||
let target = ContainerTarget::Agent(super::tunnels::get_endpoint(&project.id)?);
|
||||
let results = open_latest(project_id, &target, || {
|
||||
let wanted = project.port_mappings.iter().filter(|m| !incomplete(m)).count();
|
||||
let running = || {
|
||||
store.get(project_id).is_some_and(|p| p.status == crate::models::ProjectStatus::Running)
|
||||
};
|
||||
let Some(endpoint) = super::tunnels::get_endpoint(&project.id) else {
|
||||
log::info!("Project {project_id}: no tunnel to the workspace; {wanted} port mapping(s) not opened");
|
||||
return (wanted > 0 && running()).then(|| {
|
||||
"The workspace is not connected, so its port mappings were not opened. Start the \
|
||||
project again."
|
||||
.to_string()
|
||||
});
|
||||
};
|
||||
let target = ContainerTarget::Agent(endpoint);
|
||||
let results = open_latest(project_id, &target, warn, || {
|
||||
store.get(project_id).filter(|p| p.is_aws()).map(|p| {
|
||||
let gateway = p.aws.as_ref().is_some_and(|a| a.gateway_sidecar);
|
||||
(p.port_mappings, gateway)
|
||||
})
|
||||
})
|
||||
.await;
|
||||
if !still_connected(project_id, &target) {
|
||||
return None;
|
||||
if !still_connected(project_id, &target) && !running() {
|
||||
return None; // a Stop raced the open: nothing to say
|
||||
}
|
||||
failure_detail(&results)
|
||||
}
|
||||
|
||||
@@ -23,6 +23,8 @@ struct Fake {
|
||||
requests: AtomicUsize,
|
||||
/// The command of each attach.
|
||||
cmds: std::sync::Mutex<Vec<Vec<String>>>,
|
||||
/// Answer every attach as socat finding nothing listening.
|
||||
refuse: std::sync::atomic::AtomicBool,
|
||||
}
|
||||
|
||||
async fn attach_ws(State(f): State<Arc<Fake>>, ws: WebSocketUpgrade) -> Response {
|
||||
@@ -41,6 +43,14 @@ async fn echo(f: Arc<Fake>, mut ws: WebSocket) {
|
||||
.collect();
|
||||
f.cmds.lock().unwrap().push(cmd);
|
||||
let _ = ws.send(WsMessage::Text(r#"{"type":"started","exec_id":"a1"}"#.into())).await;
|
||||
if f.refuse.load(Ordering::SeqCst) {
|
||||
let mut err = vec![2u8];
|
||||
err.extend_from_slice(b"socat[7] E connect(5, AF=2 127.0.0.1:8080, 16): Connection refused\n");
|
||||
let _ = ws.send(WsMessage::Binary(err.into())).await;
|
||||
let _ = ws.send(WsMessage::Text(r#"{"type":"exit","code":1}"#.into())).await;
|
||||
let _ = ws.close().await;
|
||||
return;
|
||||
}
|
||||
while let Some(Ok(msg)) = ws.recv().await {
|
||||
match msg {
|
||||
WsMessage::Binary(b) => {
|
||||
@@ -129,7 +139,7 @@ async fn a_busy_host_port_fails_its_mapping_alone_and_the_other_forwards() {
|
||||
assert_eq!(round_trip(free, b"ping").await, b"ping");
|
||||
assert_eq!(
|
||||
fake.cmds.lock().unwrap().as_slice(),
|
||||
[vec!["socat".to_string(), "-".into(), "TCP:127.0.0.1:5432".into()]]
|
||||
[crate::auth_bridge::tunnel::mapping_command(5432)]
|
||||
);
|
||||
|
||||
// Stop / Remove / task death all close the tunnel: the mappings go too.
|
||||
@@ -310,7 +320,7 @@ async fn overlapping_opens_converge_on_the_last_stored_set_without_false_errors(
|
||||
let mine = sets[i % sets.len()].clone();
|
||||
opens.push(tokio::spawn(async move {
|
||||
go2.wait().await;
|
||||
open_latest(&p2, &t2, move || {
|
||||
open_latest(&p2, &t2, None, move || {
|
||||
let mut s = s2.lock().unwrap();
|
||||
*s = mine; // this save lands, then its open reads the store
|
||||
Some((s.clone(), false))
|
||||
@@ -352,7 +362,7 @@ async fn a_save_keeps_unchanged_forwards_and_their_live_connections() {
|
||||
let r = open_for(&p, &target, &[tcp(a, 9090)]).await;
|
||||
assert!(r[0].error.is_none(), "{:?}", r[0].error);
|
||||
assert_eq!(round_trip(a, b"x").await, b"x");
|
||||
assert_eq!(fake.cmds.lock().unwrap().last().unwrap()[2], "TCP:127.0.0.1:9090");
|
||||
assert_eq!(fake.cmds.lock().unwrap().last().unwrap(), &crate::auth_bridge::tunnel::mapping_command(9090));
|
||||
assert!(port_is_free(b));
|
||||
tunnels::close(&p).await;
|
||||
}
|
||||
@@ -371,9 +381,9 @@ async fn a_stored_project_is_read_when_the_open_runs() {
|
||||
let busy_port = busy.local_addr().unwrap().port();
|
||||
project.port_mappings = vec![tcp(port, 8080), tcp(busy_port, 8081)];
|
||||
let store = ProjectsStore::over_file_for_test(dir.path().join("projects.json"), vec![project]);
|
||||
assert_eq!(open_for_project(&store, &p).await, None, "not connected: nothing, no warning");
|
||||
assert_eq!(open_for_project(&store, &p, None).await, None, "not connected: nothing, no warning");
|
||||
let (_target, _, _) = connected_agent(&p).await;
|
||||
let warning = open_for_project(&store, &p).await.expect("the busy port is reported");
|
||||
let warning = open_for_project(&store, &p, None).await.expect("the busy port is reported");
|
||||
assert!(warning.contains(&busy_port.to_string()) && warning.contains("already in use"), "{warning}");
|
||||
assert_eq!(open_ports(&p), vec![port]);
|
||||
tunnels::close(&p).await;
|
||||
@@ -386,7 +396,7 @@ async fn the_auth_bridges_forward_still_waits_for_a_client_to_speak() {
|
||||
let p = pid("bridge");
|
||||
let (target, fake, _) = connected_agent(&p).await;
|
||||
let port = free_port();
|
||||
let mut fwd = PortForward::bind(target, port, port, PortFamily::V4).await.unwrap();
|
||||
let mut fwd = PortForward::bind(target, port, port, crate::auth_bridge::proc_net::PortFamily::V4).await.unwrap();
|
||||
assert_eq!((fwd.port, fwd.container_port), (port, port));
|
||||
let _client = TcpStream::connect(("127.0.0.1", port)).await.unwrap();
|
||||
tokio::time::sleep(std::time::Duration::from_millis(300)).await;
|
||||
@@ -394,3 +404,182 @@ async fn the_auth_bridges_forward_still_waits_for_a_client_to_speak() {
|
||||
fwd.shutdown().await;
|
||||
tunnels::close(&p).await;
|
||||
}
|
||||
|
||||
fn aws_project_in_store(p: &str, status: crate::models::ProjectStatus, mappings: Vec<PortMapping>) -> (tempfile::TempDir, ProjectsStore) {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let mut project = crate::models::Project::new("x".into(), vec![]);
|
||||
project.id = p.to_string();
|
||||
project.host_id = Some("h1".into());
|
||||
project.aws_placement =
|
||||
Some(crate::models::AwsPlacement { region: "us-west-2".into(), environment: "dev".into() });
|
||||
project.aws = Some(Default::default());
|
||||
project.status = status;
|
||||
project.port_mappings = mappings;
|
||||
let store = ProjectsStore::over_file_for_test(dir.path().join("projects.json"), vec![project]);
|
||||
(dir, store)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_running_project_whose_mappings_cannot_open_is_never_silent() {
|
||||
use crate::models::ProjectStatus;
|
||||
let p = pid("silent");
|
||||
// Stopped (a save while stopped): nothing to open, nothing to say.
|
||||
let (_d, store) = aws_project_in_store(&p, ProjectStatus::Stopped, vec![tcp(free_port(), 8080)]);
|
||||
assert_eq!(open_for_project(&store, &p, None).await, None);
|
||||
// Running with no tunnel: the mappings should be open and are not.
|
||||
let (_d, store) = aws_project_in_store(&p, ProjectStatus::Running, vec![tcp(free_port(), 8080)]);
|
||||
let w = open_for_project(&store, &p, None).await.expect("a warning");
|
||||
assert!(w.contains("not connected"), "{w}");
|
||||
// Only incomplete rows: nothing to say.
|
||||
let (_d, store) = aws_project_in_store(&p, ProjectStatus::Running, vec![tcp(0, 8080)]);
|
||||
assert_eq!(open_for_project(&store, &p, None).await, None);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_start_opens_a_listener_for_a_mapping_saved_before_it() {
|
||||
use crate::models::ProjectStatus;
|
||||
// The reported case: 8080 → 8080 saved while stopped, then a start
|
||||
// registers the tunnel, sets Running and opens the mappings.
|
||||
let p = pid("start");
|
||||
let port = free_port();
|
||||
let (_d, store) = aws_project_in_store(&p, ProjectStatus::Stopped, vec![tcp(port, 8080)]);
|
||||
let (_target, fake, _) = connected_agent(&p).await;
|
||||
store.update_status(&p, ProjectStatus::Running).unwrap();
|
||||
assert_eq!(open_for_project(&store, &p, None).await, None);
|
||||
assert_eq!(open_ports(&p), vec![port]);
|
||||
assert_eq!(round_trip(port, b"ping").await, b"ping");
|
||||
// Over IPv6 loopback too (`localhost` may resolve to ::1 first).
|
||||
if let Ok(mut c) = TcpStream::connect(("::1", port)).await {
|
||||
c.write_all(b"six").await.unwrap();
|
||||
let mut buf = [0u8; 3];
|
||||
c.read_exact(&mut buf).await.unwrap();
|
||||
assert_eq!(&buf, b"six");
|
||||
}
|
||||
assert_eq!(fake.cmds.lock().unwrap()[0], crate::auth_bridge::tunnel::mapping_command(8080));
|
||||
tunnels::close(&p).await;
|
||||
assert!(port_is_free(port));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn nothing_listening_in_the_workspace_is_reported_once_per_mapping() {
|
||||
use crate::models::ProjectStatus;
|
||||
let p = pid("refused");
|
||||
let port = free_port();
|
||||
let (_d, store) = aws_project_in_store(&p, ProjectStatus::Running, vec![tcp(port, 8080)]);
|
||||
let (_target, fake, _) = connected_agent(&p).await;
|
||||
fake.refuse.store(true, Ordering::SeqCst);
|
||||
let seen = Arc::new(std::sync::Mutex::new(Vec::<String>::new()));
|
||||
let s2 = seen.clone();
|
||||
let warn: PortsWarn = Arc::new(move |d| s2.lock().unwrap().push(d));
|
||||
assert_eq!(open_for_project(&store, &p, Some(warn)).await, None);
|
||||
for _ in 0..3 {
|
||||
let mut c = TcpStream::connect(("127.0.0.1", port)).await.unwrap();
|
||||
let mut buf = Vec::new();
|
||||
let _ = tokio::time::timeout(std::time::Duration::from_secs(5), c.read_to_end(&mut buf)).await;
|
||||
}
|
||||
let seen = seen.lock().unwrap().clone();
|
||||
assert_eq!(seen, vec![nothing_listening(port, 8080)]);
|
||||
assert!(seen[0].contains("nothing is listening on port 8080 in the workspace (127.0.0.1 or ::1)"));
|
||||
tunnels::close(&p).await;
|
||||
}
|
||||
|
||||
/// The reported case end to end against a **real** agent in a real
|
||||
/// container (no SSM; the tunnel is registered by hand): a mapping saved
|
||||
/// before the start, a Python server on `0.0.0.0:8080` (the user's), one on
|
||||
/// `[::1]` only, and a port nothing listens on. Needs Docker and an image
|
||||
/// whose entrypoint starts the agent (`TRIPLEC_AGENT_E2E_IMAGE`, default
|
||||
/// `ghcr.io/shadowdao/triple-c-sandbox:edge`).
|
||||
#[tokio::test]
|
||||
#[ignore = "needs a Docker daemon and an image whose entrypoint starts triple-c-agent"]
|
||||
async fn live_a_mapping_reaches_v4_and_v6_servers_in_a_real_workspace() {
|
||||
use crate::models::ProjectStatus;
|
||||
use std::process::Command;
|
||||
use std::time::Duration;
|
||||
let docker = |args: &[&str]| -> String {
|
||||
let out = Command::new("docker").args(args).output().expect("docker cli");
|
||||
assert!(out.status.success(), "docker {args:?}: {}", String::from_utf8_lossy(&out.stderr));
|
||||
String::from_utf8_lossy(&out.stdout).trim().to_string()
|
||||
};
|
||||
let image = std::env::var("TRIPLEC_AGENT_E2E_IMAGE")
|
||||
.unwrap_or_else(|_| "ghcr.io/shadowdao/triple-c-sandbox:edge".into());
|
||||
let token = format!("{}{}", uuid::Uuid::new_v4().simple(), uuid::Uuid::new_v4().simple());
|
||||
let name = format!("tc-ports-e2e-{}", uuid::Uuid::new_v4().simple());
|
||||
docker(&[
|
||||
"run", "-d", "--name", &name, "-w", "/workspace",
|
||||
"-e", &format!("TRIPLEC_AGENT_TOKEN={token}"),
|
||||
"-e", "TRIPLEC_AGENT_ADDR=0.0.0.0:47900",
|
||||
"-p", "127.0.0.1::47900",
|
||||
&image,
|
||||
]);
|
||||
let p = pid("live");
|
||||
let outcome = async {
|
||||
let mapped = docker(&["port", &name, "47900/tcp"]);
|
||||
let lport: u16 = mapped.lines().next().and_then(|l| l.rsplit(':').next()).and_then(|x| x.parse().ok()).unwrap();
|
||||
let ip = docker(&["inspect", "-f", "{{range .NetworkSettings.Networks}}{{.IPAddress}} {{end}}", &name]);
|
||||
let mut candidates = vec![AgentEndpoint::loopback(lport, token.clone())];
|
||||
for a in ip.split_whitespace() {
|
||||
candidates.push(AgentEndpoint::new(url::Url::parse(&format!("http://{a}:47900/")).unwrap(), token.clone()).unwrap());
|
||||
}
|
||||
let mut ep = None;
|
||||
'wait: for _ in 0..240 {
|
||||
for c in &candidates {
|
||||
if ContainerTarget::Agent(c.clone()).is_running().await.unwrap_or(false) {
|
||||
ep = Some(c.clone());
|
||||
break 'wait;
|
||||
}
|
||||
}
|
||||
tokio::time::sleep(Duration::from_millis(500)).await;
|
||||
}
|
||||
let ep = ep.ok_or("agent never answered")?;
|
||||
docker(&["exec", "-d", "-u", "claude", &name, "python3", "-m", "http.server", "8080", "--bind", "0.0.0.0"]);
|
||||
docker(&["exec", "-d", "-u", "claude", &name, "python3", "-m", "http.server", "8081", "--bind", "::1"]);
|
||||
tokio::time::sleep(Duration::from_secs(2)).await;
|
||||
|
||||
let (h80, h81, h82) = (free_port(), free_port(), free_port());
|
||||
let (_d, store) = aws_project_in_store(&p, ProjectStatus::Stopped, vec![tcp(h80, 8080), tcp(h81, 8081), tcp(h82, 8082)]);
|
||||
// The start: tunnel registered, Running, then the open.
|
||||
let mut t = tunnels::tests::fake_tunnel(lport, Arc::new(AtomicUsize::new(0)));
|
||||
t.endpoint = ep;
|
||||
tunnels::register(&p, t);
|
||||
store.update_status(&p, ProjectStatus::Running).unwrap();
|
||||
let seen = Arc::new(std::sync::Mutex::new(Vec::<String>::new()));
|
||||
let s2 = seen.clone();
|
||||
let warn: PortsWarn = Arc::new(move |d| s2.lock().unwrap().push(d));
|
||||
if let Some(w) = open_for_project(&store, &p, Some(warn)).await {
|
||||
return Err(format!("open warned: {w}"));
|
||||
}
|
||||
async fn get(addr: (&str, u16)) -> Result<String, String> {
|
||||
let mut c = TcpStream::connect(addr).await.map_err(|e| format!("{addr:?}: {e}"))?;
|
||||
c.write_all(b"GET / HTTP/1.0\r\nHost: localhost\r\n\r\n").await.map_err(|e| e.to_string())?;
|
||||
let mut buf = Vec::new();
|
||||
tokio::time::timeout(Duration::from_secs(20), c.read_to_end(&mut buf)).await.map_err(|_| "timeout".to_string())?.map_err(|e| e.to_string())?;
|
||||
Ok(String::from_utf8_lossy(&buf).into_owned())
|
||||
}
|
||||
for (port, what) in [(h80, "0.0.0.0:8080"), (h81, "[::1]:8081")] {
|
||||
for host in ["127.0.0.1", "::1"] {
|
||||
let r = get((host, port)).await?;
|
||||
if !r.starts_with("HTTP/1.0 200") {
|
||||
return Err(format!("{what} via {host}:{port}: {r:?}"));
|
||||
}
|
||||
eprintln!("{what} via {host}:{port}: 200");
|
||||
}
|
||||
}
|
||||
let r = get(("127.0.0.1", h82)).await?;
|
||||
if !r.is_empty() {
|
||||
return Err(format!("nothing listens on 8082, yet: {r:?}"));
|
||||
}
|
||||
tokio::time::sleep(Duration::from_millis(500)).await;
|
||||
let seen = seen.lock().unwrap().clone();
|
||||
if seen != vec![nothing_listening(h82, 8082)] {
|
||||
return Err(format!("warnings: {seen:?}"));
|
||||
}
|
||||
Ok::<(), String>(())
|
||||
}
|
||||
.await;
|
||||
tunnels::close(&p).await;
|
||||
let logs = Command::new("docker").args(["logs", "--tail", "20", &name]).output().map(|o| String::from_utf8_lossy(&o.stdout).into_owned()).unwrap_or_default();
|
||||
let _ = Command::new("docker").args(["rm", "-f", &name]).output();
|
||||
if let Err(e) = outcome {
|
||||
panic!("{e}\n--- container log tail ---\n{logs}");
|
||||
}
|
||||
}
|
||||
@@ -198,27 +198,48 @@ fn sdk_error(e: &(dyn std::error::Error + 'static)) -> String {
|
||||
|
||||
// ── The plugin ───────────────────────────────────────────────────────────────
|
||||
|
||||
/// Find `session-manager-plugin`: `TRIPLEC_SSM_PLUGIN` if set, then `PATH`,
|
||||
/// then where AWS's installers put it (the GUI app on macOS does not get the
|
||||
/// shell's `PATH`, so the install locations are not optional).
|
||||
/// The plugin's file name on this platform: what the bundle holds (Tauri strips the
|
||||
/// `-<target-triple>` suffix of `bundle.externalBin` when it copies the sidecar in) and what
|
||||
/// AWS's installers put on `PATH`.
|
||||
const PLUGIN_FILE: &str =
|
||||
if cfg!(windows) { "session-manager-plugin.exe" } else { "session-manager-plugin" };
|
||||
|
||||
const PLUGIN_INSTALL_HINT: &str = "The AWS Session Manager plugin (session-manager-plugin) is \
|
||||
not installed. It is what connects to a workspace on AWS; install it from \
|
||||
https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html";
|
||||
|
||||
/// Find `session-manager-plugin`, in this order:
|
||||
///
|
||||
/// 1. `TRIPLEC_SSM_PLUGIN`, if set (an error if it names no file — an explicit choice is never
|
||||
/// silently replaced by another plugin);
|
||||
/// 2. **the copy bundled with the app** (`bundle.externalBin`), beside the app's own
|
||||
/// executable: `usr/bin` in the AppImage, `Contents/MacOS` in the macOS bundle, the install
|
||||
/// directory on Windows (and `target/<profile>` under `tauri dev`, where tauri-build copies
|
||||
/// it). A debug build's placeholder (`sidecar_placeholder`) is skipped;
|
||||
/// 3. `PATH`;
|
||||
/// 4. where AWS's installers put it (the GUI app on macOS does not get the shell's `PATH`, so
|
||||
/// the install locations are not optional).
|
||||
///
|
||||
/// 3 and 4 remain for dev builds without a fetched sidecar.
|
||||
pub fn find_plugin() -> Result<PathBuf, String> {
|
||||
if let Some(p) = std::env::var_os("TRIPLEC_SSM_PLUGIN").filter(|p| !p.is_empty()) {
|
||||
let p = PathBuf::from(p);
|
||||
return if p.is_file() {
|
||||
Ok(p)
|
||||
} else {
|
||||
Err(format!("TRIPLEC_SSM_PLUGIN names {}, which is not a file", p.display()))
|
||||
};
|
||||
}
|
||||
let name = if cfg!(windows) { "session-manager-plugin.exe" } else { "session-manager-plugin" };
|
||||
let on_path = std::env::var_os("PATH")
|
||||
.map(|paths| std::env::split_paths(&paths).map(|d| d.join(name)).collect::<Vec<_>>())
|
||||
.unwrap_or_default();
|
||||
let installed: Vec<PathBuf> = if cfg!(windows) {
|
||||
let exe_dir = std::env::current_exe()
|
||||
.ok()
|
||||
.and_then(|exe| exe.parent().map(Path::to_path_buf));
|
||||
resolve_plugin(&PluginSearch {
|
||||
override_path: std::env::var_os("TRIPLEC_SSM_PLUGIN"),
|
||||
exe_dir,
|
||||
path_var: std::env::var_os("PATH"),
|
||||
install_dirs: plugin_install_dirs(),
|
||||
})
|
||||
}
|
||||
|
||||
/// Where AWS's installers put the plugin, in the order they are tried.
|
||||
fn plugin_install_dirs() -> Vec<PathBuf> {
|
||||
if cfg!(windows) {
|
||||
["ProgramFiles", "ProgramFiles(x86)"]
|
||||
.iter()
|
||||
.filter_map(|v| std::env::var_os(v))
|
||||
.map(|d| PathBuf::from(d).join(r"Amazon\SessionManagerPlugin\bin").join(name))
|
||||
.map(|d| PathBuf::from(d).join(r"Amazon\SessionManagerPlugin\bin"))
|
||||
.collect()
|
||||
} else {
|
||||
[
|
||||
@@ -228,19 +249,54 @@ pub fn find_plugin() -> Result<PathBuf, String> {
|
||||
"/usr/bin",
|
||||
]
|
||||
.iter()
|
||||
.map(|d| Path::new(d).join(name))
|
||||
.map(PathBuf::from)
|
||||
.collect()
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// Everything [`find_plugin`] reads from the process, so the order is testable.
|
||||
struct PluginSearch {
|
||||
override_path: Option<std::ffi::OsString>,
|
||||
exe_dir: Option<PathBuf>,
|
||||
path_var: Option<std::ffi::OsString>,
|
||||
install_dirs: Vec<PathBuf>,
|
||||
}
|
||||
|
||||
fn resolve_plugin(search: &PluginSearch) -> Result<PathBuf, String> {
|
||||
if let Some(p) = search.override_path.as_ref().filter(|p| !p.is_empty()) {
|
||||
let p = PathBuf::from(p);
|
||||
return if p.is_file() {
|
||||
Ok(p)
|
||||
} else {
|
||||
Err(format!("TRIPLEC_SSM_PLUGIN names {}, which is not a file", p.display()))
|
||||
};
|
||||
}
|
||||
if let Some(bundled) = search.exe_dir.as_ref().map(|d| d.join(PLUGIN_FILE)) {
|
||||
if bundled.is_file() && !is_sidecar_placeholder(&bundled) {
|
||||
return Ok(bundled);
|
||||
}
|
||||
}
|
||||
let on_path = search
|
||||
.path_var
|
||||
.as_ref()
|
||||
.map(|paths| std::env::split_paths(paths).map(|d| d.join(PLUGIN_FILE)).collect::<Vec<_>>())
|
||||
.unwrap_or_default();
|
||||
on_path
|
||||
.into_iter()
|
||||
.chain(installed)
|
||||
.chain(search.install_dirs.iter().map(|d| d.join(PLUGIN_FILE)))
|
||||
.find(|p| p.is_file())
|
||||
.ok_or_else(|| {
|
||||
"The AWS Session Manager plugin (session-manager-plugin) is not installed. It is \
|
||||
what connects to a workspace on AWS; install it from \
|
||||
https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"
|
||||
.to_string()
|
||||
})
|
||||
.ok_or_else(|| PLUGIN_INSTALL_HINT.to_string())
|
||||
}
|
||||
|
||||
/// Whether `path` is the stand-in a debug build bundles when no real plugin was fetched.
|
||||
/// Unreadable counts as "not a placeholder": the spawn then reports the real error.
|
||||
fn is_sidecar_placeholder(path: &Path) -> bool {
|
||||
use std::io::Read;
|
||||
let mut head = [0u8; crate::sidecar_placeholder::MARKER.len()];
|
||||
std::fs::File::open(path)
|
||||
.and_then(|mut f| f.read_exact(&mut head))
|
||||
.map(|()| crate::sidecar_placeholder::is_placeholder(&head))
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
/// A running plugin process with a listener on the local port.
|
||||
|
||||
@@ -400,3 +400,135 @@ async fn the_keepalive_asks_for_health_without_a_token() {
|
||||
assert!(req.starts_with("GET /v1/health HTTP/1.1\r\n"), "{req}");
|
||||
assert!(!req.to_ascii_lowercase().contains("authorization"), "{req}");
|
||||
}
|
||||
|
||||
// ── Finding the plugin ───────────────────────────────────────────────────────
|
||||
|
||||
mod plugin_resolution {
|
||||
use super::super::{resolve_plugin, PluginSearch, PLUGIN_FILE, PLUGIN_INSTALL_HINT};
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
/// A directory holding a fake plugin (contents are never run).
|
||||
fn dir_with_plugin(root: &Path, name: &str) -> PathBuf {
|
||||
let d = root.join(name);
|
||||
std::fs::create_dir_all(&d).unwrap();
|
||||
std::fs::write(d.join(PLUGIN_FILE), b"\x7fELF fake plugin").unwrap();
|
||||
d
|
||||
}
|
||||
|
||||
fn search(
|
||||
override_path: Option<&Path>,
|
||||
exe_dir: Option<&Path>,
|
||||
path: &[&Path],
|
||||
install: &[&Path],
|
||||
) -> PluginSearch {
|
||||
PluginSearch {
|
||||
override_path: override_path.map(|p| p.as_os_str().to_owned()),
|
||||
exe_dir: exe_dir.map(Path::to_path_buf),
|
||||
path_var: Some(std::env::join_paths(path).unwrap()),
|
||||
install_dirs: install.iter().map(|p| p.to_path_buf()).collect(),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_override_wins_over_everything() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
let chosen = t.path().join("my-plugin");
|
||||
std::fs::write(&chosen, b"x").unwrap();
|
||||
let bundled = dir_with_plugin(t.path(), "app");
|
||||
let on_path = dir_with_plugin(t.path(), "path");
|
||||
let s = search(Some(&chosen), Some(&bundled), &[&on_path], &[]);
|
||||
assert_eq!(resolve_plugin(&s).unwrap(), chosen);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_override_naming_no_file_is_an_error_not_a_fallback() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
let bundled = dir_with_plugin(t.path(), "app");
|
||||
let s = search(Some(&t.path().join("missing")), Some(&bundled), &[], &[]);
|
||||
let e = resolve_plugin(&s).unwrap_err();
|
||||
assert!(e.contains("TRIPLEC_SSM_PLUGIN names"), "{e}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_empty_override_is_ignored() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
let bundled = dir_with_plugin(t.path(), "app");
|
||||
let mut s = search(None, Some(&bundled), &[], &[]);
|
||||
s.override_path = Some(std::ffi::OsString::new());
|
||||
assert_eq!(resolve_plugin(&s).unwrap(), bundled.join(PLUGIN_FILE));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_bundled_sidecar_wins_over_path_and_installs() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
let bundled = dir_with_plugin(t.path(), "app");
|
||||
let on_path = dir_with_plugin(t.path(), "path");
|
||||
let installed = dir_with_plugin(t.path(), "installed");
|
||||
let s = search(None, Some(&bundled), &[&on_path], &[&installed]);
|
||||
assert_eq!(resolve_plugin(&s).unwrap(), bundled.join(PLUGIN_FILE));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn without_a_sidecar_path_comes_before_the_install_locations() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
let empty_app = t.path().join("app");
|
||||
std::fs::create_dir_all(&empty_app).unwrap();
|
||||
let first = t.path().join("path-first-empty");
|
||||
std::fs::create_dir_all(&first).unwrap();
|
||||
let on_path = dir_with_plugin(t.path(), "path");
|
||||
let installed = dir_with_plugin(t.path(), "installed");
|
||||
let s = search(None, Some(&empty_app), &[&first, &on_path], &[&installed]);
|
||||
assert_eq!(resolve_plugin(&s).unwrap(), on_path.join(PLUGIN_FILE));
|
||||
|
||||
let s = search(None, Some(&empty_app), &[&first], &[&installed]);
|
||||
assert_eq!(resolve_plugin(&s).unwrap(), installed.join(PLUGIN_FILE));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_debug_placeholder_beside_the_exe_is_skipped() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
let app = t.path().join("app");
|
||||
std::fs::create_dir_all(&app).unwrap();
|
||||
std::fs::write(app.join(PLUGIN_FILE), crate::sidecar_placeholder::contents()).unwrap();
|
||||
let on_path = dir_with_plugin(t.path(), "path");
|
||||
let s = search(None, Some(&app), &[&on_path], &[]);
|
||||
assert_eq!(resolve_plugin(&s).unwrap(), on_path.join(PLUGIN_FILE));
|
||||
|
||||
// And with nothing else installed, the install hint, not the placeholder.
|
||||
let s = search(None, Some(&app), &[], &[]);
|
||||
assert_eq!(resolve_plugin(&s).unwrap_err(), PLUGIN_INSTALL_HINT);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_directory_named_like_the_plugin_is_not_a_plugin() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
let app = t.path().join("app");
|
||||
std::fs::create_dir_all(app.join(PLUGIN_FILE)).unwrap();
|
||||
let installed = dir_with_plugin(t.path(), "installed");
|
||||
let s = search(None, Some(&app), &[], &[&installed]);
|
||||
assert_eq!(resolve_plugin(&s).unwrap(), installed.join(PLUGIN_FILE));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn nothing_anywhere_is_the_install_hint() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
let s = search(None, None, &[t.path()], &[t.path()]);
|
||||
let e = resolve_plugin(&s).unwrap_err();
|
||||
assert!(e.contains("is not installed") && e.contains("docs.aws.amazon.com"), "{e}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_bundled_name_is_what_tauri_gives_the_sidecar() {
|
||||
// tauri-build/-bundler strip "-<target-triple>" from bundle.externalBin's
|
||||
// "binaries/session-manager-plugin"; the .exe stays on Windows.
|
||||
let conf: serde_json::Value =
|
||||
serde_json::from_str(include_str!("../../../tauri.conf.json")).unwrap();
|
||||
let bins = conf["bundle"]["externalBin"].as_array().expect("bundle.externalBin");
|
||||
let stems: Vec<&str> = bins
|
||||
.iter()
|
||||
.map(|b| b.as_str().unwrap().rsplit('/').next().unwrap())
|
||||
.collect();
|
||||
let expected = PLUGIN_FILE.trim_end_matches(".exe");
|
||||
assert!(stems.contains(&expected), "{stems:?} has no {expected}");
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ mod logging;
|
||||
mod marketplace;
|
||||
mod models;
|
||||
mod project_lock;
|
||||
mod sidecar_placeholder;
|
||||
mod storage;
|
||||
pub mod url_open;
|
||||
pub mod web_terminal;
|
||||
@@ -541,6 +542,7 @@ pub fn run() {
|
||||
.invoke_handler(tauri::generate_handler![
|
||||
// Docker
|
||||
commands::docker_commands::check_docker,
|
||||
commands::docker_commands::check_docker_status,
|
||||
commands::docker_commands::check_image_exists,
|
||||
commands::docker_commands::build_image,
|
||||
commands::docker_commands::get_container_info,
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
//! The stand-in `build.rs` writes for the bundled `session-manager-plugin` sidecar in a
|
||||
//! **debug** build that has no real one, and how the app recognises it.
|
||||
//!
|
||||
//! `bundle.externalBin` makes tauri-build fail outright when the per-target file is missing,
|
||||
//! for `cargo test`, `cargo check` and `tauri dev` as much as for a release. The real binary
|
||||
//! is built from AWS's pinned source by `scripts/build-ssm-plugin.sh` (`.ps1` on Windows), with
|
||||
//! a downloaded Go toolchain; requiring that for every test run would put a Go build and the
|
||||
//! network on the path of every `cargo test`. So debug builds get this placeholder instead, a
|
||||
//! release build refuses it (`build.rs`), and `host::ssm::find_plugin` skips it and falls back to
|
||||
//! an installed plugin.
|
||||
//!
|
||||
//! Shared by `build.rs` (through `#[path]`) and the app, so the two cannot disagree.
|
||||
|
||||
/// The first bytes of a placeholder. Not an executable format on any platform.
|
||||
pub const MARKER: &[u8] = b"TRIPLE-C SSM PLUGIN PLACEHOLDER";
|
||||
|
||||
/// The whole placeholder file.
|
||||
#[allow(dead_code)] // build.rs only
|
||||
pub fn contents() -> Vec<u8> {
|
||||
let mut v = MARKER.to_vec();
|
||||
v.extend_from_slice(
|
||||
b"\nNot the AWS Session Manager plugin. Debug builds get this when \
|
||||
app/src-tauri/binaries has no real one; run scripts/build-ssm-plugin.sh \
|
||||
(scripts/build-ssm-plugin.ps1 on Windows) to build the real plugin.\n",
|
||||
);
|
||||
v
|
||||
}
|
||||
|
||||
/// Whether `bytes` (the start of a file) is a placeholder.
|
||||
pub fn is_placeholder(bytes: &[u8]) -> bool {
|
||||
bytes.starts_with(MARKER)
|
||||
}
|
||||
@@ -36,6 +36,12 @@
|
||||
"icons/icon.icns",
|
||||
"icons/icon.png"
|
||||
],
|
||||
"externalBin": [
|
||||
"binaries/session-manager-plugin"
|
||||
],
|
||||
"resources": {
|
||||
"THIRD_PARTY_NOTICES": "THIRD_PARTY_NOTICES"
|
||||
},
|
||||
"linux": {
|
||||
"appimage": {
|
||||
"bundleMediaFramework": true
|
||||
|
||||
+4
-2
@@ -6,6 +6,7 @@ import TopBar from "./components/layout/TopBar";
|
||||
import StatusBar from "./components/layout/StatusBar";
|
||||
import NotesDock from "./components/layout/NotesDock";
|
||||
import TerminalView from "./components/terminal/TerminalView";
|
||||
import { dockerFailLabel } from "./lib/dockerStatus";
|
||||
import DockerInstallDialog from "./components/DockerInstallDialog";
|
||||
import ProjectHome from "./components/projects/home/ProjectHome";
|
||||
import AddProjectDialog from "./components/projects/AddProjectDialog";
|
||||
@@ -213,9 +214,10 @@ export default function App() {
|
||||
* tracks and ends in a real button.
|
||||
*/
|
||||
function WelcomeScreen() {
|
||||
const { dockerAvailable, imageExists, projects, openProjectHome } = useAppState(
|
||||
const { dockerAvailable, dockerStatus, imageExists, projects, openProjectHome } = useAppState(
|
||||
useShallow((s) => ({
|
||||
dockerAvailable: s.dockerAvailable,
|
||||
dockerStatus: s.dockerStatus,
|
||||
imageExists: s.imageExists,
|
||||
projects: s.projects,
|
||||
openProjectHome: s.openProjectHome,
|
||||
@@ -233,7 +235,7 @@ function WelcomeScreen() {
|
||||
label: "Docker detected",
|
||||
state: dockerAvailable,
|
||||
pendingLabel: "Checking for Docker…",
|
||||
failLabel: "Docker not available",
|
||||
failLabel: dockerFailLabel(dockerStatus),
|
||||
},
|
||||
{
|
||||
label: "Container image ready",
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||
import { render, screen, act } from "@testing-library/react";
|
||||
import DockerInstallDialog from "./DockerInstallDialog";
|
||||
import { useAppState } from "../store/appState";
|
||||
import type { DockerStatus } from "../lib/types";
|
||||
|
||||
vi.mock("../lib/tauri-commands", () => ({
|
||||
getDockerStatus: vi.fn(),
|
||||
checkImageExists: vi.fn(),
|
||||
buildImage: vi.fn(),
|
||||
pullImage: vi.fn(),
|
||||
openUrlExternal: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("../hooks/useInstallHelper", () => ({
|
||||
useInstallHelper: () => ({
|
||||
options: {
|
||||
os: "linux",
|
||||
product_name: "Docker Engine",
|
||||
can_auto_install: false,
|
||||
auto_install_method: null,
|
||||
auto_install_blocker: "no pkexec",
|
||||
docs_url: "https://docs.docker.com",
|
||||
manual_steps: [],
|
||||
post_install_notes: [],
|
||||
},
|
||||
loadOptions: vi.fn(),
|
||||
runInstall: vi.fn(),
|
||||
}),
|
||||
}));
|
||||
|
||||
const status = (state: DockerStatus["state"], os: DockerStatus["os"] = "linux"): DockerStatus => ({
|
||||
state,
|
||||
endpoint: "unix:///var/run/docker.sock",
|
||||
detail: state === "running" ? null : "connection refused",
|
||||
os,
|
||||
});
|
||||
|
||||
function setStatus(s: DockerStatus) {
|
||||
act(() => useAppState.getState().setDockerStatus(s));
|
||||
}
|
||||
|
||||
describe("DockerInstallDialog", () => {
|
||||
beforeEach(() => {
|
||||
useAppState.setState({ dockerStatus: null, dockerAvailable: null });
|
||||
});
|
||||
|
||||
it("offers install guidance when Docker is not installed", () => {
|
||||
setStatus(status("not_installed"));
|
||||
render(<DockerInstallDialog onClose={vi.fn()} />);
|
||||
expect(screen.getByRole("dialog", { name: "Docker is not installed" })).toBeTruthy();
|
||||
expect(screen.getByText(/AWS projects don't need local Docker/)).toBeTruthy();
|
||||
expect(screen.getByText("unix:///var/run/docker.sock")).toBeTruthy();
|
||||
});
|
||||
|
||||
it("says installed-but-not-running with systemd steps on Linux, and offers no install", () => {
|
||||
setStatus(status("not_running"));
|
||||
render(<DockerInstallDialog onClose={vi.fn()} />);
|
||||
expect(screen.getByRole("dialog", { name: "Docker is installed but not running" })).toBeTruthy();
|
||||
expect(screen.getByText("sudo systemctl start docker")).toBeTruthy();
|
||||
expect(screen.getByText("sudo systemctl reset-failed docker")).toBeTruthy();
|
||||
expect(screen.getByText("journalctl -u docker -b")).toBeTruthy();
|
||||
expect(screen.queryByText(/Install Docker Engine/)).toBeNull();
|
||||
expect(screen.getByText(/AWS projects don't need local Docker/)).toBeTruthy();
|
||||
});
|
||||
|
||||
it("tells macOS/Windows users to start Docker Desktop", () => {
|
||||
setStatus(status("not_running", "macos"));
|
||||
render(<DockerInstallDialog onClose={vi.fn()} />);
|
||||
expect(screen.getByText("Docker Desktop")).toBeTruthy();
|
||||
expect(screen.queryByText("sudo systemctl start docker")).toBeNull();
|
||||
});
|
||||
|
||||
it("explains the docker group on permission denied", () => {
|
||||
setStatus(status("no_permission"));
|
||||
render(<DockerInstallDialog onClose={vi.fn()} />);
|
||||
expect(screen.getByRole("dialog", { name: "Docker is running but not accessible" })).toBeTruthy();
|
||||
expect(screen.getByText("sudo usermod -aG docker $USER")).toBeTruthy();
|
||||
});
|
||||
|
||||
it("updates live and closes itself when Docker becomes available", () => {
|
||||
setStatus(status("not_installed"));
|
||||
const onClose = vi.fn();
|
||||
render(<DockerInstallDialog onClose={onClose} />);
|
||||
setStatus(status("not_running"));
|
||||
expect(screen.getByRole("dialog", { name: "Docker is installed but not running" })).toBeTruthy();
|
||||
expect(onClose).not.toHaveBeenCalled();
|
||||
setStatus(status("running"));
|
||||
expect(onClose).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -1,10 +1,79 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useInstallHelper } from "../hooks/useInstallHelper";
|
||||
import { openUrlExternal } from "../lib/tauri-commands";
|
||||
import type { DockerStatus } from "../lib/types";
|
||||
import { useDocker } from "../hooks/useDocker";
|
||||
import Modal from "./ui/Modal";
|
||||
import Button from "./ui/Button";
|
||||
|
||||
const AWS_NOTE = "AWS projects don't need local Docker and still work.";
|
||||
|
||||
function Cmd({ children }: { children: string }) {
|
||||
return (
|
||||
<code className="block font-mono text-[var(--text-primary)] bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-[var(--radius-control)] px-2 py-1 my-1 select-all break-all">
|
||||
{children}
|
||||
</code>
|
||||
);
|
||||
}
|
||||
|
||||
/** Guidance for a Docker that is installed but not answering. */
|
||||
function NotRunningHelp({ status }: { status: DockerStatus }) {
|
||||
if (status.os === "linux") {
|
||||
return (
|
||||
<div className="text-xs text-[var(--text-secondary)] space-y-2">
|
||||
<p>Start the daemon:</p>
|
||||
<Cmd>sudo systemctl start docker</Cmd>
|
||||
<p>
|
||||
If systemd gave up restarting it (<span className="font-mono">start-limit-hit</span>),
|
||||
clear that first, then start it again:
|
||||
</p>
|
||||
<Cmd>sudo systemctl reset-failed docker</Cmd>
|
||||
<p>To see why it stopped:</p>
|
||||
<Cmd>systemctl status docker</Cmd>
|
||||
<Cmd>journalctl -u docker -b</Cmd>
|
||||
<p>
|
||||
To start it at every boot, use{" "}
|
||||
<span className="font-mono">sudo systemctl enable --now docker</span>. Rootless Docker
|
||||
runs as your user instead: <span className="font-mono">systemctl --user start docker</span>.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<div className="text-xs text-[var(--text-secondary)] space-y-2">
|
||||
<p>
|
||||
Start <span className="text-[var(--text-primary)]">Docker Desktop</span> and wait until it
|
||||
says the engine is running — the first start can take a minute. This dialog closes on its
|
||||
own once Docker answers.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function NoPermissionHelp({ status }: { status: DockerStatus }) {
|
||||
if (status.os === "linux") {
|
||||
return (
|
||||
<div className="text-xs text-[var(--text-secondary)] space-y-2">
|
||||
<p>
|
||||
Your user is not in the <span className="font-mono">docker</span> group, so the socket
|
||||
refuses the connection. Add yourself:
|
||||
</p>
|
||||
<Cmd>sudo usermod -aG docker $USER</Cmd>
|
||||
<p>Then log out and back in (or reboot) so the new group applies, and reopen Triple-C.</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<div className="text-xs text-[var(--text-secondary)] space-y-2">
|
||||
<p>
|
||||
The Docker endpoint refused access. Make sure Docker Desktop is running for your user
|
||||
{status.os === "windows" ? " and that your account is in the docker-users group" : ""}, then
|
||||
re-check.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
interface Props {
|
||||
onClose: () => void;
|
||||
}
|
||||
@@ -13,7 +82,7 @@ type Phase = "idle" | "installing" | "done" | "error";
|
||||
|
||||
export default function DockerInstallDialog({ onClose }: Props) {
|
||||
const { options, loadOptions, runInstall } = useInstallHelper();
|
||||
const { checkDocker } = useDocker();
|
||||
const { checkDocker, dockerStatus } = useDocker();
|
||||
const [showManual, setShowManual] = useState(false);
|
||||
const [phase, setPhase] = useState<Phase>("idle");
|
||||
const [log, setLog] = useState<string[]>([]);
|
||||
@@ -23,6 +92,13 @@ export default function DockerInstallDialog({ onClose }: Props) {
|
||||
loadOptions();
|
||||
}, [loadOptions]);
|
||||
|
||||
// Docker came up while the dialog was open (polling keeps `dockerStatus`
|
||||
// current): nothing left to say. Not mid-install, whose notes still matter.
|
||||
const running = dockerStatus?.state === "running";
|
||||
useEffect(() => {
|
||||
if (running && (phase === "idle" || phase === "error")) onClose();
|
||||
}, [running, phase, onClose]);
|
||||
|
||||
const handleInstall = async () => {
|
||||
setPhase("installing");
|
||||
setLog([]);
|
||||
@@ -52,6 +128,50 @@ export default function DockerInstallDialog({ onClose }: Props) {
|
||||
if (available) onClose();
|
||||
};
|
||||
|
||||
const state = dockerStatus?.state ?? "not_installed";
|
||||
const endpointLine = dockerStatus && (
|
||||
<p className="text-[11px] text-[var(--text-secondary)] mt-3 break-all">
|
||||
Tried <span className="font-mono">{dockerStatus.endpoint}</span>
|
||||
{dockerStatus.detail ? <> — {dockerStatus.detail}</> : null}
|
||||
</p>
|
||||
);
|
||||
const awsLine = (
|
||||
<p className="text-[11px] text-[var(--text-secondary)] mt-2">{AWS_NOTE}</p>
|
||||
);
|
||||
|
||||
if (dockerStatus && (state === "not_running" || state === "no_permission")) {
|
||||
return (
|
||||
<Modal
|
||||
title={state === "not_running" ? "Docker is installed but not running" : "Docker is running but not accessible"}
|
||||
onClose={onClose}
|
||||
widthClassName="w-[34rem]"
|
||||
footer={
|
||||
<>
|
||||
<Button variant="ghost" onClick={onClose}>
|
||||
Dismiss
|
||||
</Button>
|
||||
<Button variant="primary" onClick={handleRecheck}>
|
||||
Re-check
|
||||
</Button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<p className="text-[13px] text-[var(--text-secondary)] mb-3">
|
||||
{state === "not_running"
|
||||
? "Triple-C found Docker on this machine, but the Docker daemon is not answering. There is nothing to install."
|
||||
: "The Docker daemon is up, but this user is not allowed to talk to it."}
|
||||
</p>
|
||||
{state === "not_running" ? (
|
||||
<NotRunningHelp status={dockerStatus} />
|
||||
) : (
|
||||
<NoPermissionHelp status={dockerStatus} />
|
||||
)}
|
||||
{endpointLine}
|
||||
{awsLine}
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
|
||||
if (!options) {
|
||||
return null;
|
||||
}
|
||||
@@ -61,7 +181,7 @@ export default function DockerInstallDialog({ onClose }: Props) {
|
||||
|
||||
return (
|
||||
<Modal
|
||||
title="Docker not detected"
|
||||
title="Docker is not installed"
|
||||
onClose={onClose}
|
||||
widthClassName="w-[34rem]"
|
||||
// Closing mid-install would orphan a privileged installer.
|
||||
@@ -80,6 +200,8 @@ export default function DockerInstallDialog({ onClose }: Props) {
|
||||
<span className="text-[var(--text-primary)]">{options.product_name}</span> for
|
||||
you, or you can follow the official instructions.
|
||||
</p>
|
||||
{awsLine}
|
||||
<div className="mb-4">{endpointLine}</div>
|
||||
|
||||
{phase === "idle" && (
|
||||
<div className="flex flex-col gap-2">
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { dockerFailLabel } from "../../lib/dockerStatus";
|
||||
import { useState } from "react";
|
||||
import { useShallow } from "zustand/react/shallow";
|
||||
import MainTabs from "./MainTabs";
|
||||
@@ -9,9 +10,10 @@ import HelpDialog from "./HelpDialog";
|
||||
import StatusIndicator, { type StatusTone } from "../ui/StatusIndicator";
|
||||
|
||||
export default function TopBar() {
|
||||
const { dockerAvailable, imageExists, updateInfo, imageUpdateInfo, appVersion, setUpdateInfo, setImageUpdateInfo } = useAppState(
|
||||
const { dockerAvailable, dockerStatus, imageExists, updateInfo, imageUpdateInfo, appVersion, setUpdateInfo, setImageUpdateInfo } = useAppState(
|
||||
useShallow(s => ({
|
||||
dockerAvailable: s.dockerAvailable,
|
||||
dockerStatus: s.dockerStatus,
|
||||
imageExists: s.imageExists,
|
||||
updateInfo: s.updateInfo,
|
||||
imageUpdateInfo: s.imageUpdateInfo,
|
||||
@@ -76,7 +78,7 @@ export default function TopBar() {
|
||||
<HealthDot
|
||||
state={dockerAvailable}
|
||||
okLabel="Docker"
|
||||
failLabel="Docker unavailable"
|
||||
failLabel={dockerFailLabel(dockerStatus)}
|
||||
pendingLabel="Docker — checking"
|
||||
/>
|
||||
<HealthDot
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { dockerFailLabel } from "../../lib/dockerStatus";
|
||||
import { useState } from "react";
|
||||
import { useDocker } from "../../hooks/useDocker";
|
||||
import { useSettings } from "../../hooks/useSettings";
|
||||
@@ -13,7 +14,7 @@ const IMAGE_SOURCE_OPTIONS: { value: ImageSource; label: string; description: st
|
||||
];
|
||||
|
||||
export default function DockerSettings() {
|
||||
const { dockerAvailable, imageExists, checkDocker, checkImage, buildImage, pullImage } =
|
||||
const { dockerAvailable, dockerStatus, imageExists, checkDocker, checkImage, buildImage, pullImage } =
|
||||
useDocker();
|
||||
const { appSettings, saveSettings } = useSettings();
|
||||
const [working, setWorking] = useState(false);
|
||||
@@ -82,7 +83,7 @@ export default function DockerSettings() {
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-[var(--text-secondary)]">Docker Status</span>
|
||||
<span className={dockerAvailable ? "text-[var(--success)]" : "text-[var(--error)]"}>
|
||||
{dockerAvailable === null ? "Checking..." : dockerAvailable ? "Connected" : "Not Available"}
|
||||
{dockerAvailable === null ? "Checking..." : dockerAvailable ? "Connected" : dockerFailLabel(dockerStatus)}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -64,10 +64,10 @@ function ErrorLine({
|
||||
}) {
|
||||
return (
|
||||
<div role="alert" className="text-xs text-[var(--error)] leading-snug flex items-center gap-2 flex-wrap">
|
||||
<span>{awsErrorMessage(failure.error)}</span>
|
||||
<span className="min-w-0 break-words">{awsErrorMessage(failure.error)}</span>
|
||||
{failure.error.kind === "sso_expired" && !onSignIn && (
|
||||
<span>
|
||||
Sign in with <code>aws sso login --profile {failure.error.profile}</code> and try again.
|
||||
Sign in with <code className="break-all">aws sso login --profile {failure.error.profile}</code> and try again.
|
||||
</span>
|
||||
)}
|
||||
{failure.error.kind === "sso_expired" && onSignIn && (
|
||||
@@ -124,7 +124,7 @@ function PermissionReportView({ report }: { report: PermissionReport }) {
|
||||
>
|
||||
{badge}
|
||||
</span>
|
||||
<span className="text-xs text-[var(--text-secondary)]">
|
||||
<span className="min-w-0 break-all text-xs text-[var(--text-secondary)]" data-testid="report-identity">
|
||||
{report.identity.arn} · {report.region}
|
||||
</span>
|
||||
</div>
|
||||
@@ -154,8 +154,8 @@ function PermissionReportView({ report }: { report: PermissionReport }) {
|
||||
</summary>
|
||||
<ul className="mt-1 space-y-0.5 pl-4">
|
||||
{t.results.map((r) => (
|
||||
<li key={r.action} className="text-[var(--text-secondary)]">
|
||||
<span className="font-mono">{r.action}</span> — {r.verdict}
|
||||
<li key={r.action} className="text-[var(--text-secondary)] break-words">
|
||||
<span className="font-mono break-all">{r.action}</span> — {r.verdict}
|
||||
{r.note && (
|
||||
<>
|
||||
{" "}
|
||||
@@ -263,7 +263,7 @@ function ConnectionRow({ host }: { host: HostConnection }) {
|
||||
<li
|
||||
ref={rowRef}
|
||||
data-testid={`host-${host.id}`}
|
||||
className="border border-[var(--border-color)] rounded-[var(--radius-control)] p-2.5 space-y-1.5"
|
||||
className="border border-[var(--border-color)] rounded-[var(--radius-control)] p-2.5 space-y-1.5 min-w-0"
|
||||
>
|
||||
{editing ? (
|
||||
<div className="space-y-2">
|
||||
@@ -273,7 +273,7 @@ function ConnectionRow({ host }: { host: HostConnection }) {
|
||||
<input id={id} className={inputClass} list="aws-regions" value={region} onChange={(e) => setRegion(e.target.value)} />
|
||||
)}
|
||||
</Field>
|
||||
<div className="flex gap-2">
|
||||
<div className="flex gap-2 flex-wrap">
|
||||
<Button size="sm" variant="primary" onClick={save} disabled={busy || !name.trim() || !region.trim()}>
|
||||
Save changes
|
||||
</Button>
|
||||
@@ -283,16 +283,16 @@ function ConnectionRow({ host }: { host: HostConnection }) {
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex items-start justify-between gap-2 flex-wrap">
|
||||
<div className="flex items-start justify-between gap-2 flex-wrap" data-testid={`host-header-${host.id}`}>
|
||||
<div className="min-w-0">
|
||||
<div className="text-[13px] font-medium text-[var(--text-primary)]">{host.name}</div>
|
||||
<div className="text-xs text-[var(--text-secondary)]">
|
||||
<div className="text-[13px] font-medium text-[var(--text-primary)] break-words">{host.name}</div>
|
||||
<div className="text-xs text-[var(--text-secondary)] break-words">
|
||||
<span>{auth.method === "profile" ? `Profile: ${auth.name}` : "Access keys"}</span>
|
||||
{" · "}
|
||||
<span>{host.kind.default_region}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex gap-1.5">
|
||||
<div className="flex gap-1.5 flex-wrap">
|
||||
<Button size="sm" onClick={runCheck} disabled={busy} aria-label={`Check ${host.name}`}>
|
||||
Check
|
||||
</Button>
|
||||
@@ -309,7 +309,7 @@ function ConnectionRow({ host }: { host: HostConnection }) {
|
||||
)}
|
||||
{confirmRemove && (
|
||||
<div role="alertdialog" aria-label={`Remove ${host.name}?`} className="flex items-center gap-2 flex-wrap text-xs">
|
||||
<span>Remove {host.name}? Its stored credentials are deleted.</span>
|
||||
<span className="min-w-0 break-words">Remove {host.name}? Its stored credentials are deleted.</span>
|
||||
<Button data-focus="confirm-remove" size="sm" variant="danger" onClick={remove} disabled={busy} aria-label={`Confirm remove ${host.name}`}>
|
||||
Confirm remove
|
||||
</Button>
|
||||
@@ -501,7 +501,7 @@ function AddConnectionForm() {
|
||||
{busy ? "Adding…" : "Add connection"}
|
||||
</Button>
|
||||
{signedInAs && (
|
||||
<p role="status" className="text-xs text-[var(--success)]">
|
||||
<p role="status" className="text-xs text-[var(--success)] break-all">
|
||||
Signed in as {signedInAs}
|
||||
</p>
|
||||
)}
|
||||
@@ -516,7 +516,7 @@ export default function HostsSettings() {
|
||||
const { appSettings } = useSettings();
|
||||
const hosts = appSettings?.hosts ?? [];
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
<div className="space-y-3 min-w-0">
|
||||
<p className="text-xs text-[var(--text-secondary)] leading-snug">
|
||||
Where project environments run. AWS connections check what your credentials can do, and find, deploy and join environments.
|
||||
</p>
|
||||
|
||||
@@ -177,7 +177,7 @@ export default function AdminBundleModal({
|
||||
Saved to <code className="font-mono text-[var(--text-primary)] break-all">{saved}</code>
|
||||
</p>
|
||||
<p>From that folder, run:</p>
|
||||
<pre className="font-mono text-[var(--text-primary)] bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 whitespace-pre-wrap">
|
||||
<pre className="font-mono text-[var(--text-primary)] bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 whitespace-pre-wrap break-all max-w-full overflow-x-auto">
|
||||
{COMMANDS}
|
||||
</pre>
|
||||
<Button size="sm" onClick={copy}>
|
||||
|
||||
@@ -30,6 +30,7 @@ export default function DeployEnvironmentModal({
|
||||
onClose,
|
||||
onDeploy,
|
||||
onDetect,
|
||||
onBundle,
|
||||
}: {
|
||||
connectionId: string;
|
||||
region: string;
|
||||
@@ -40,6 +41,8 @@ export default function DeployEnvironmentModal({
|
||||
/** Starts the run; resolves to the command's error, or null once started. */
|
||||
onDeploy: (name: string, network: NetworkChoice, maxWorkspaceHours: number) => Promise<AwsError | null>;
|
||||
onDetect: () => void;
|
||||
/** Switch to an environment bundle for an admin (offered when AWS refuses the deploy). */
|
||||
onBundle?: () => void;
|
||||
}) {
|
||||
const [name, setName] = useState("main");
|
||||
const [draft, setDraft] = useState<NetworkDraft>(DEFAULT_NETWORK);
|
||||
@@ -80,7 +83,7 @@ export default function DeployEnvironmentModal({
|
||||
|
||||
const createBoundary = async () => {
|
||||
setBoundaryError(null);
|
||||
const err = await boundary.start(BOUNDARY_STATE_KEY, region, "Permissions boundary", () =>
|
||||
const err = await boundary.start(BOUNDARY_STATE_KEY, region, "boundary", "Permissions boundary", () =>
|
||||
deployAwsPermissionsBoundary(connectionId, region),
|
||||
);
|
||||
if (err?.kind === "access_denied") setBundle({ reason: awsErrorMessage(err) });
|
||||
@@ -125,18 +128,19 @@ export default function DeployEnvironmentModal({
|
||||
<div className="flex gap-2 flex-wrap">
|
||||
<Button
|
||||
size="md"
|
||||
wrap
|
||||
variant="primary"
|
||||
onClick={createBoundary}
|
||||
disabled={!!boundaryRun && !boundaryRun.done}
|
||||
>
|
||||
Create the permissions boundary (needs an account administrator)
|
||||
</Button>
|
||||
<Button size="md" onClick={() => setBundle({})}>
|
||||
<Button size="md" wrap onClick={() => setBundle({})}>
|
||||
Save a bundle for an administrator instead
|
||||
</Button>
|
||||
</div>
|
||||
{boundaryError && (
|
||||
<p role="alert" className="text-[var(--error)]">
|
||||
<p role="alert" className="text-[var(--error)] break-words">
|
||||
{awsErrorMessage(boundaryError)}
|
||||
</p>
|
||||
)}
|
||||
@@ -149,6 +153,7 @@ export default function DeployEnvironmentModal({
|
||||
</p>
|
||||
<Button
|
||||
size="md"
|
||||
wrap
|
||||
onClick={() =>
|
||||
setBundle({
|
||||
reason: boundaryFailed.summary ?? `OpenTofu exited with code ${boundaryFailed.exit_code}`,
|
||||
@@ -179,10 +184,18 @@ export default function DeployEnvironmentModal({
|
||||
First deploy downloads OpenTofu (~30 MB) and the AWS provider (~150 MB).
|
||||
</p>
|
||||
{error && (
|
||||
<p role="alert" className="text-xs text-[var(--error)] leading-snug">
|
||||
<p role="alert" className="text-xs text-[var(--error)] leading-snug break-words">
|
||||
{awsErrorMessage(error)}
|
||||
</p>
|
||||
)}
|
||||
{error?.kind === "access_denied" && onBundle && !repair && (
|
||||
<div className="space-y-1.5 text-xs text-[var(--text-secondary)] leading-snug">
|
||||
<p>An admin can deploy this environment for you from a bundle.</p>
|
||||
<Button size="sm" wrap onClick={onBundle}>
|
||||
Save an environment bundle for an admin…
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</Modal>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||
import { act, renderHook } from "@testing-library/react";
|
||||
import { runKey, useDeployRuns } from "./DeployProgress";
|
||||
import { act, render, renderHook, screen } from "@testing-library/react";
|
||||
import DeployProgressView, { runKey, useDeployRuns } from "./DeployProgress";
|
||||
import type { DeployProgress } from "../../../lib/types";
|
||||
import { progress, tofuEvent } from "./testkit";
|
||||
|
||||
@@ -29,10 +29,10 @@ describe("useDeployRuns", () => {
|
||||
const onDone = vi.fn();
|
||||
const { result } = renderHook(() => useDeployRuns(onDone));
|
||||
await act(async () => {
|
||||
await result.current.start(KEY, "eu-west-1", "Deploy of main", async () => "eu");
|
||||
await result.current.start(KEY, "eu-west-1", "deploy", "Deploy of main", async () => "eu");
|
||||
});
|
||||
await act(async () => {
|
||||
await result.current.start(KEY, "us-east-1", "Deploy of main", async () => "us");
|
||||
await result.current.start(KEY, "us-east-1", "deploy", "Deploy of main", async () => "us");
|
||||
});
|
||||
expect(handlers.size).toBe(2);
|
||||
emit(progress({ op_id: "eu", state_key: KEY, events: [tofuEvent("eu line")] }));
|
||||
@@ -54,8 +54,8 @@ describe("useDeployRuns", () => {
|
||||
it("removes its progress listeners on unmount", async () => {
|
||||
const { result, unmount } = renderHook(() => useDeployRuns());
|
||||
await act(async () => {
|
||||
await result.current.start(KEY, "eu-west-1", "Deploy of main", async () => "a");
|
||||
await result.current.start("boundary/terraform.tfstate", "eu-west-1", "Boundary", async () => "b");
|
||||
await result.current.start(KEY, "eu-west-1", "deploy", "Deploy of main", async () => "a");
|
||||
await result.current.start("boundary/terraform.tfstate", "eu-west-1", "deploy", "Boundary", async () => "b");
|
||||
});
|
||||
expect(handlers.size).toBe(2);
|
||||
unmount();
|
||||
@@ -66,7 +66,7 @@ describe("useDeployRuns", () => {
|
||||
const { result } = renderHook(() => useDeployRuns());
|
||||
let err: unknown;
|
||||
await act(async () => {
|
||||
err = await result.current.start(KEY, "eu-west-1", "Deploy of main", async () => {
|
||||
err = await result.current.start(KEY, "eu-west-1", "deploy", "Deploy of main", async () => {
|
||||
throw { kind: "other", message: "A deployment is already running" };
|
||||
});
|
||||
});
|
||||
@@ -75,3 +75,28 @@ describe("useDeployRuns", () => {
|
||||
expect(result.current.runs).toEqual({});
|
||||
});
|
||||
});
|
||||
|
||||
describe("DeployProgress layout", () => {
|
||||
it("wraps its header and a long failure summary", () => {
|
||||
render(
|
||||
<DeployProgressView
|
||||
connectionId="h1"
|
||||
run={{
|
||||
stateKey: KEY,
|
||||
region: "eu-west-1",
|
||||
kind: "deploy",
|
||||
label: "Deploy of main",
|
||||
opId: "x",
|
||||
events: [],
|
||||
done: true,
|
||||
cancellable: false,
|
||||
result: { ok: false, exit_code: 1, summary: "a very long summary ".repeat(10) },
|
||||
}}
|
||||
/>,
|
||||
);
|
||||
const header = screen.getByTestId("deploy-progress-header");
|
||||
expect(header.className).toContain("flex-wrap");
|
||||
expect(header.firstElementChild?.className).toContain("min-w-0");
|
||||
expect(screen.getByRole("status").firstElementChild?.className).toContain("whitespace-normal");
|
||||
});
|
||||
});
|
||||
@@ -13,10 +13,18 @@ import Button from "../../ui/Button";
|
||||
import Modal from "../../ui/Modal";
|
||||
import StatusIndicator from "../../ui/StatusIndicator";
|
||||
|
||||
/**
|
||||
* What a run does. Decisions about a run (such as offering an admin bundle
|
||||
* when AWS refuses it) key on this, never on its label: a follow of an
|
||||
* existing environment's deploy is labelled like a new deploy.
|
||||
*/
|
||||
export type RunKind = "deploy" | "follow" | "repair" | "update" | "destroy" | "onboard" | "push" | "boundary";
|
||||
|
||||
/** One OpenTofu run this view is showing: a start, or a follow of one already running. */
|
||||
export interface DeployRun {
|
||||
stateKey: string;
|
||||
region: string;
|
||||
kind: RunKind;
|
||||
label: string;
|
||||
/** Null until the starting command resolves. */
|
||||
opId: string | null;
|
||||
@@ -57,7 +65,13 @@ export function useDeployRuns(
|
||||
}, []);
|
||||
|
||||
const start = useCallback(
|
||||
async (stateKey: string, region: string, label: string, run: () => Promise<string>): Promise<AwsError | null> => {
|
||||
async (
|
||||
stateKey: string,
|
||||
region: string,
|
||||
kind: RunKind,
|
||||
label: string,
|
||||
run: () => Promise<string>,
|
||||
): Promise<AwsError | null> => {
|
||||
const k = runKey(region, stateKey);
|
||||
subs.current.get(k)?.unlisten?.();
|
||||
const sub: Subscription = { unlisten: null };
|
||||
@@ -94,7 +108,7 @@ export function useDeployRuns(
|
||||
|
||||
setRuns((prev) => ({
|
||||
...prev,
|
||||
[k]: { stateKey, region, label, opId: null, events: [], done: false, cancellable: false, result: null },
|
||||
[k]: { stateKey, region, kind, label, opId: null, events: [], done: false, cancellable: false, result: null },
|
||||
}));
|
||||
|
||||
const unlisten = await listen<ProgressPayload>(AWS_DEPLOY_PROGRESS_EVENT, ({ payload }) => {
|
||||
@@ -146,7 +160,7 @@ function EventLine({ e }: { e: TofuEvent }) {
|
||||
return (
|
||||
<li className="text-xs leading-snug">
|
||||
{(e.resource || e.action) && (
|
||||
<span className="mr-1.5">
|
||||
<span className="mr-1.5 break-all">
|
||||
{e.resource && <span className="font-mono text-[var(--text-primary)]">{e.resource}</span>}
|
||||
{e.action && <span className="ml-1 text-[var(--text-secondary)]">{e.action}</span>}
|
||||
</span>
|
||||
@@ -154,10 +168,10 @@ function EventLine({ e }: { e: TofuEvent }) {
|
||||
{isError ? (
|
||||
<>
|
||||
<span className="font-semibold text-[var(--error)]">Error: </span>
|
||||
<pre className="whitespace-pre-wrap break-words font-mono text-[var(--error)]">{e.message}</pre>
|
||||
<pre className="max-w-full overflow-x-auto whitespace-pre-wrap break-words font-mono text-[var(--error)]">{e.message}</pre>
|
||||
</>
|
||||
) : (
|
||||
<span className="text-[var(--text-secondary)]">{e.message}</span>
|
||||
<span className="text-[var(--text-secondary)] break-words">{e.message}</span>
|
||||
)}
|
||||
</li>
|
||||
);
|
||||
@@ -205,14 +219,14 @@ export default function DeployProgress({
|
||||
return (
|
||||
<section
|
||||
aria-label={`${run.label} progress`}
|
||||
className="space-y-1.5 border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 bg-[var(--bg-primary)]"
|
||||
className="space-y-1.5 min-w-0 border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 bg-[var(--bg-primary)]"
|
||||
>
|
||||
<div className="flex items-center justify-between gap-2 flex-wrap">
|
||||
<div className="flex items-center gap-2 text-xs">
|
||||
<span className="font-medium text-[var(--text-primary)]">{run.label}</span>
|
||||
<div className="flex items-center justify-between gap-2 flex-wrap" data-testid="deploy-progress-header">
|
||||
<div className="flex items-center gap-2 text-xs flex-wrap min-w-0">
|
||||
<span className="font-medium text-[var(--text-primary)] break-words min-w-0">{run.label}</span>
|
||||
{status && <StatusIndicator tone={status.tone} label={status.label} />}
|
||||
</div>
|
||||
<div className="flex gap-1.5">
|
||||
<div className="flex gap-1.5 flex-wrap">
|
||||
{!run.done && (
|
||||
<Button
|
||||
size="sm"
|
||||
@@ -239,11 +253,12 @@ export default function DeployProgress({
|
||||
</ol>
|
||||
)}
|
||||
{run.done && run.result && (
|
||||
<p role="status" className="text-xs">
|
||||
<p role="status" className="text-xs break-words">
|
||||
{run.result.ok ? (
|
||||
<StatusIndicator tone="ok" label={`Finished${run.result.summary ? `: ${run.result.summary}` : ""}`} />
|
||||
<StatusIndicator wrap tone="ok" label={`Finished${run.result.summary ? `: ${run.result.summary}` : ""}`} />
|
||||
) : (
|
||||
<StatusIndicator
|
||||
wrap
|
||||
tone="error"
|
||||
label={`Failed (exit ${run.result.exit_code})${run.result.summary ? `: ${run.result.summary}` : ""}`}
|
||||
/>
|
||||
@@ -251,7 +266,7 @@ export default function DeployProgress({
|
||||
</p>
|
||||
)}
|
||||
{cancelError && !confirming && (
|
||||
<p role="alert" className="text-xs text-[var(--error)]">
|
||||
<p role="alert" className="text-xs text-[var(--error)] break-words">
|
||||
{awsErrorMessage(cancelError)}
|
||||
</p>
|
||||
)}
|
||||
|
||||
@@ -48,6 +48,7 @@ export default function Ec2CapacityFields({
|
||||
<div className="text-[13px] font-medium text-[var(--text-primary)]">EC2 capacity</div>
|
||||
<SegmentedControl<"none" | "ec2">
|
||||
label="EC2 capacity"
|
||||
className="flex-wrap max-w-full"
|
||||
value={value.enabled ? "ec2" : "none"}
|
||||
onChange={(v) => set({ enabled: v === "ec2" })}
|
||||
segments={[
|
||||
|
||||
@@ -81,7 +81,7 @@ describe("EnvironmentsPanel", () => {
|
||||
expect(within(screen.getByTestId("env-dev")).getByText("Joined")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("offers an admin bundle instead of deploy for a workspace user with nothing found", async () => {
|
||||
it("offers deploy to a workspace user too, with a note and the admin options under a disclosure", async () => {
|
||||
backend(
|
||||
() => scan(),
|
||||
(cmd) => {
|
||||
@@ -91,22 +91,162 @@ describe("EnvironmentsPanel", () => {
|
||||
);
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
expect(await screen.findByText(/needs an environment admin/)).toBeInTheDocument();
|
||||
expect(screen.queryByRole("button", { name: "Deploy a new environment" })).toBeNull();
|
||||
fireEvent.click(screen.getByRole("button", { name: "Show the environment-admin policies" }));
|
||||
expect(await screen.findByText("environment-admin.json")).toBeInTheDocument();
|
||||
const deploy = await screen.findByRole("button", { name: "Deploy a new environment" });
|
||||
expect(deploy.className).toContain("--accent-emphasis");
|
||||
expect(screen.getByTestId("deploy-unconfirmed-note")).toHaveTextContent(
|
||||
"Your permission check didn't confirm environment-admin rights; the deploy will stop with AWS's message if a permission is missing.",
|
||||
);
|
||||
const options = screen.getByTestId("not-admin-options");
|
||||
expect(options.tagName).toBe("DETAILS");
|
||||
expect(within(options).getByText(/Not an admin\?/)).toBeInTheDocument();
|
||||
fireEvent.click(within(options).getByRole("button", { name: "Show the environment-admin policies" }));
|
||||
expect(await within(options).findByRole("button", { name: "Copy environment-admin.json" })).toBeInTheDocument();
|
||||
expect(invoke).toHaveBeenCalledWith("aws_policy_document", { tier: "environment_admin" });
|
||||
fireEvent.click(screen.getByRole("button", { name: "Request an environment from an admin…" }));
|
||||
fireEvent.click(within(options).getByRole("button", { name: "Request an environment from an admin…" }));
|
||||
const dialog = screen.getByRole("dialog");
|
||||
expect(within(dialog).getByRole("button", { name: "Save bundle to folder…" })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("treats a connection with no permission report as not an admin", async () => {
|
||||
it("opens the deploy form for a workspace user", async () => {
|
||||
backend(() => scan());
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Deploy a new environment" }));
|
||||
expect(screen.getByRole("dialog", { name: "Deploy a new environment" })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("an admin sees deploy without the note or the not-an-admin options", async () => {
|
||||
backend(() => scan());
|
||||
render(<EnvironmentsPanel connection={conn} tier="environment_admin" />);
|
||||
await open();
|
||||
expect(await screen.findByRole("button", { name: "Deploy a new environment" })).toBeInTheDocument();
|
||||
expect(screen.queryByTestId("deploy-unconfirmed-note")).toBeNull();
|
||||
expect(screen.queryByTestId("not-admin-options")).toBeNull();
|
||||
});
|
||||
|
||||
it("a connection with no permission report gets deploy with the note", async () => {
|
||||
backend(() => scan());
|
||||
render(<EnvironmentsPanel connection={conn} />);
|
||||
await open();
|
||||
expect(await screen.findByRole("button", { name: "Request an environment from an admin…" })).toBeInTheDocument();
|
||||
expect(screen.queryByRole("button", { name: "Deploy a new environment" })).toBeNull();
|
||||
expect(await screen.findByRole("button", { name: "Deploy a new environment" })).toBeInTheDocument();
|
||||
expect(screen.getByTestId("deploy-unconfirmed-note")).toBeInTheDocument();
|
||||
expect(screen.getByText(/Run Check to see what your credentials can do/)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("shows the boundary note to anyone when the account has no boundary", async () => {
|
||||
backend(() => scan({ boundary: "no" }));
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
expect(await screen.findByText(/no Triple-C permissions boundary yet/)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("offers a bundle when AWS refuses a deploy run's permission", async () => {
|
||||
backend(
|
||||
() => scan(),
|
||||
(cmd) => {
|
||||
if (cmd === "deploy_aws_environment") return "d1";
|
||||
throw new Error(`unexpected ${cmd}`);
|
||||
},
|
||||
);
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Deploy a new environment" }));
|
||||
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "Deploy" }));
|
||||
await waitFor(() => expect(screen.queryByRole("dialog")).toBeNull());
|
||||
const key = "environments/main/terraform.tfstate";
|
||||
emit(
|
||||
progress({
|
||||
op_id: "d1",
|
||||
state_key: key,
|
||||
events: [tofuEvent("creating IAM Role: AccessDenied: User is not authorized to perform iam:CreateRole", { level: "error" })],
|
||||
}),
|
||||
);
|
||||
emit(progress({ op_id: "d1", state_key: key, done: true, cancellable: false, result: { ok: false, exit_code: 1, summary: null } }));
|
||||
const hint = await screen.findByTestId("denied-hint");
|
||||
expect(hint).toHaveTextContent("AWS refused a permission");
|
||||
fireEvent.click(within(hint).getByRole("button", { name: "Save a bundle for an admin…" }));
|
||||
expect(within(screen.getByRole("dialog")).getByRole("button", { name: "Save bundle to folder…" })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("never offers a new-environment bundle for a refused follow of an existing deploy", async () => {
|
||||
const key = "environments/dev/terraform.tfstate";
|
||||
backend(
|
||||
() => scan({ environments: [env({ actions: ["follow"], state: { state: "ready" } })] }),
|
||||
(cmd) => {
|
||||
if (cmd === "follow_aws_deployment") return "f9";
|
||||
throw new Error(`unexpected ${cmd}`);
|
||||
},
|
||||
);
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
await waitFor(() => expect(invoke.mock.calls.some((c) => c[0] === "follow_aws_deployment")).toBe(true));
|
||||
await screen.findByRole("region", { name: "Deploy of dev progress" });
|
||||
emit(
|
||||
progress({
|
||||
op_id: "f9",
|
||||
state_key: key,
|
||||
events: [tofuEvent("AccessDenied: User is not authorized to perform ecs:UpdateService", { level: "error" })],
|
||||
}),
|
||||
);
|
||||
emit(progress({ op_id: "f9", state_key: key, done: true, cancellable: false, result: { ok: false, exit_code: 1, summary: null } }));
|
||||
expect(await screen.findByText(/Failed \(exit 1\)/)).toBeInTheDocument();
|
||||
expect(screen.queryByTestId("denied-hint")).toBeNull();
|
||||
});
|
||||
|
||||
it("marks the not-an-admin disclosure open or closed like the Environments toggle", async () => {
|
||||
backend(() => scan());
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
const options = await screen.findByTestId("not-admin-options");
|
||||
const summary = options.querySelector("summary")!;
|
||||
expect(summary).toHaveTextContent("▸");
|
||||
(options as HTMLDetailsElement).open = true;
|
||||
fireEvent(options, new Event("toggle"));
|
||||
await waitFor(() => expect(summary).toHaveTextContent("▾"));
|
||||
});
|
||||
|
||||
it("shows a refused deploy's AWS message and offers the bundle", async () => {
|
||||
backend(
|
||||
() => scan(),
|
||||
(cmd) => {
|
||||
if (cmd === "deploy_aws_environment")
|
||||
throw { kind: "access_denied", action: "s3:CreateBucket", message: "User is not authorized" };
|
||||
throw new Error(`unexpected ${cmd}`);
|
||||
},
|
||||
);
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Deploy a new environment" }));
|
||||
const dialog = screen.getByRole("dialog");
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Deploy" }));
|
||||
expect(await within(dialog).findByText("AWS denied s3:CreateBucket: User is not authorized")).toBeInTheDocument();
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Save an environment bundle for an admin…" }));
|
||||
expect(within(screen.getByRole("dialog")).getByRole("button", { name: "Save bundle to folder…" })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("keeps the key rows wrapping in a narrow sidebar", async () => {
|
||||
backend(
|
||||
() => scan({ environments: [env({ actions: ["join", "update", "repair"] })] }),
|
||||
(cmd) => {
|
||||
if (cmd === "aws_policy_document") return [{ name: "a.json", json: "{}" }, { name: "b.json", json: "{}" }];
|
||||
throw new Error(`unexpected ${cmd}`);
|
||||
},
|
||||
);
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
const row = await screen.findByTestId("env-row-dev");
|
||||
expect(row.className).toContain("flex-wrap");
|
||||
expect(row.firstElementChild?.className).toContain("min-w-0");
|
||||
const actions = screen.getByTestId("env-actions-dev");
|
||||
expect(actions.className).toContain("flex-wrap");
|
||||
expect(actions.className).toContain("min-w-0");
|
||||
expect(screen.getByTestId("region-row").className).toContain("flex-wrap");
|
||||
expect(screen.getByRole("button", { name: "Deploy a new environment" }).className).toContain("whitespace-normal");
|
||||
fireEvent.click(screen.getByRole("button", { name: "Show the environment-admin policies" }));
|
||||
const grid = await screen.findByTestId("policy-copy-grid");
|
||||
expect(grid.className).toContain("grid");
|
||||
expect(grid.className).toContain("auto-fill");
|
||||
for (const b of within(grid).getAllByRole("button")) expect(b.className).toContain("whitespace-normal");
|
||||
});
|
||||
|
||||
it("an incomplete environment offers repair and destroy, destroy only after typing its name", async () => {
|
||||
@@ -248,7 +388,43 @@ describe("EnvironmentsPanel", () => {
|
||||
expect(await within(screen.getByTestId("env-dev")).findByText("Joined")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("a workspace user's join opens the onboarding bundle and waits for an admin", async () => {
|
||||
it("a workspace user can join themselves, with the note", async () => {
|
||||
backend(
|
||||
() => scan({ environments: [env()] }),
|
||||
(cmd) => {
|
||||
if (cmd === "onboard_aws_user") return "j1";
|
||||
throw new Error(`unexpected ${cmd}`);
|
||||
},
|
||||
);
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
|
||||
const dialog = screen.getByRole("dialog", { name: "Join dev" });
|
||||
expect(within(dialog).getByTestId("join-unconfirmed-note")).toBeInTheDocument();
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Join" }));
|
||||
await waitFor(() =>
|
||||
expect(invoke).toHaveBeenCalledWith("onboard_aws_user", expect.objectContaining({ environment: "dev" })),
|
||||
);
|
||||
});
|
||||
|
||||
it("a refused join shows AWS's message and offers the onboarding bundle", async () => {
|
||||
backend(
|
||||
() => scan({ environments: [env()] }),
|
||||
(cmd) => {
|
||||
if (cmd === "onboard_aws_user") throw { kind: "access_denied", action: "s3:PutObject", message: "explicit deny" };
|
||||
throw new Error(`unexpected ${cmd}`);
|
||||
},
|
||||
);
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
|
||||
const dialog = screen.getByRole("dialog", { name: "Join dev" });
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Join" }));
|
||||
expect(await within(dialog).findByText("AWS denied s3:PutObject: explicit deny")).toBeInTheDocument();
|
||||
expect(within(dialog).getByText(/AWS refused this with your permissions/)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("a workspace user can switch the join to an onboarding bundle and then waits for an admin", async () => {
|
||||
backend(
|
||||
() => scan({ environments: [env()] }),
|
||||
(cmd) => {
|
||||
@@ -259,6 +435,11 @@ describe("EnvironmentsPanel", () => {
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
|
||||
fireEvent.click(
|
||||
within(screen.getByRole("dialog", { name: "Join dev" })).getByRole("button", {
|
||||
name: "Save an onboarding bundle for an admin…",
|
||||
}),
|
||||
);
|
||||
const dialog = screen.getByRole("dialog");
|
||||
// Opening the bundle is not a request yet.
|
||||
expect(screen.queryByText("Waiting for an admin to onboard you")).toBeNull();
|
||||
@@ -280,6 +461,14 @@ describe("EnvironmentsPanel", () => {
|
||||
expect(within(screen.getByTestId("env-dev")).getByText("Waiting for an admin to onboard you")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("an admin's join has no unconfirmed note", async () => {
|
||||
backend(() => scan({ environments: [env()] }));
|
||||
render(<EnvironmentsPanel connection={conn} tier="environment_admin" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
|
||||
expect(within(screen.getByRole("dialog", { name: "Join dev" })).queryByTestId("join-unconfirmed-note")).toBeNull();
|
||||
});
|
||||
|
||||
it("an admin joins with EC2 capacity: a type from the table, max instances and their triple-c-user value", async () => {
|
||||
backend(
|
||||
() => scan({ environments: [env()] }),
|
||||
@@ -422,7 +611,7 @@ describe("EnvironmentsPanel", () => {
|
||||
expect(within(dialog).queryByText(/Choosing None removes/)).toBeNull();
|
||||
});
|
||||
|
||||
it("a joined workspace user's capacity change is a bundle starting from their record", async () => {
|
||||
it("a joined workspace user's capacity bundle starts from their record", async () => {
|
||||
backend(
|
||||
() => scan({ environments: [env({ onboarding: { state: "joined", ec2: compute({ max_instances: 1 }) } })] }),
|
||||
(cmd) => {
|
||||
@@ -434,6 +623,7 @@ describe("EnvironmentsPanel", () => {
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "EC2 capacity in dev" }));
|
||||
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "Save an onboarding bundle for an admin…" }));
|
||||
const dialog = screen.getByRole("dialog", { name: "Onboarding bundle" });
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Save bundle to folder…" }));
|
||||
await waitFor(() =>
|
||||
@@ -525,6 +715,7 @@ describe("EnvironmentsPanel", () => {
|
||||
render(<EnvironmentsPanel connection={conn} tier="workspace_user" />);
|
||||
await open();
|
||||
fireEvent.click(await screen.findByRole("button", { name: "Join dev" }));
|
||||
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "Save an onboarding bundle for an admin…" }));
|
||||
fireEvent.click(within(screen.getByRole("dialog")).getByRole("button", { name: "Close" }));
|
||||
expect(screen.queryByText("Waiting for an admin to onboard you")).toBeNull();
|
||||
expect(within(screen.getByTestId("env-dev")).getByRole("button", { name: "Join dev" })).toHaveTextContent("Join");
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
unlockAwsState,
|
||||
updateAwsEnvironment,
|
||||
} from "../../../lib/tauri-commands";
|
||||
import { awsErrorMessage, toAwsError } from "../../../lib/aws-error";
|
||||
import { awsErrorMessage, looksDenied, toAwsError } from "../../../lib/aws-error";
|
||||
import { clearEc2CapacityCache } from "../../../lib/ec2Capacity";
|
||||
import type {
|
||||
AwsError,
|
||||
@@ -34,7 +34,7 @@ import AdminBundleModal from "./AdminBundleModal";
|
||||
import UpdateEnvironmentModal from "./UpdateEnvironmentModal";
|
||||
import DeployEnvironmentModal from "./DeployEnvironmentModal";
|
||||
import JoinEnvironmentModal from "./JoinEnvironmentModal";
|
||||
import DeployProgress, { runKey, useDeployRuns, type DeployRun } from "./DeployProgress";
|
||||
import DeployProgress, { runKey, useDeployRuns, type DeployRun, type RunKind } from "./DeployProgress";
|
||||
import PolicyFiles from "./PolicyFiles";
|
||||
import {
|
||||
COMMON_REGIONS,
|
||||
@@ -45,6 +45,7 @@ import {
|
||||
onboardingStateKey,
|
||||
stateLock,
|
||||
stateStatus,
|
||||
UNCONFIRMED_NOTE,
|
||||
} from "./environmentFormat";
|
||||
|
||||
/** A typed confirmation: the action runs only once the environment's name is typed. */
|
||||
@@ -118,6 +119,7 @@ type Bundle = {
|
||||
type JoinOf = {
|
||||
region: string;
|
||||
name: string;
|
||||
ownerId: string;
|
||||
stateKey: string;
|
||||
recorded: UserCompute | null;
|
||||
reapply: boolean;
|
||||
@@ -131,6 +133,21 @@ const recordedEc2 = (e: DetectedEnvironment): UserCompute | null =>
|
||||
/** A row-level key: the same environment name can exist in every region. */
|
||||
const rowKey = (region: string, name: string) => `${region}:${name}`;
|
||||
|
||||
/**
|
||||
* A failed new deploy or self-onboarding started here that AWS refused a
|
||||
* permission for: the bundle for an admin is the way on. Only those two
|
||||
* kinds: an environment bundle deploys a *new* environment, so a follow,
|
||||
* repair or update of an existing one is never offered it.
|
||||
*/
|
||||
function deniedRun(r: DeployRun): "environment" | "user_onboard" | null {
|
||||
if (r.kind !== "deploy" && r.kind !== "onboard") return null;
|
||||
if (!r.done || !r.result || r.result.ok) return null;
|
||||
const denied =
|
||||
looksDenied(r.result.summary) || r.events.some((e) => e.level === "error" && looksDenied(e.message));
|
||||
if (!denied) return null;
|
||||
return r.kind === "deploy" ? "environment" : "user_onboard";
|
||||
}
|
||||
|
||||
/** The environment a run's state key belongs to, if any. */
|
||||
function runEnvironment(stateKey: string): string | null {
|
||||
const m = /^(?:environments|users)\/([^/]+)\//.exec(stateKey);
|
||||
@@ -139,14 +156,16 @@ function runEnvironment(stateKey: string): string | null {
|
||||
|
||||
/**
|
||||
* The environments a connection can reach in a region (spec §2): detection,
|
||||
* each environment's state and actions, and deploy/join for this caller's tier.
|
||||
* each environment's state and actions, and deploy/join. Deploy and join are
|
||||
* offered to anyone (AWS has the last word and its refusal is shown); an
|
||||
* unconfirmed tier only adds a note and the bundle-for-an-admin alternative.
|
||||
*/
|
||||
export default function EnvironmentsPanel({
|
||||
connection,
|
||||
tier,
|
||||
}: {
|
||||
connection: HostConnection;
|
||||
/** The connection's last permission report; absent means unknown, treated as not an admin. */
|
||||
/** The connection's last permission report; absent means unknown (not confirmed as an admin). */
|
||||
tier?: PermissionSummary;
|
||||
}) {
|
||||
const isAdmin = tier === "environment_admin";
|
||||
@@ -176,6 +195,7 @@ export default function EnvironmentsPanel({
|
||||
// onboarding that didn't finish has no record to start from.
|
||||
const lastEc2 = useRef(new Map<string, Ec2Compute>());
|
||||
const [copyNote, setCopyNote] = useState<string | null>(null);
|
||||
const [notAdminOpen, setNotAdminOpen] = useState(false);
|
||||
const request = useRef(0);
|
||||
const followed = useRef(new Set<string>());
|
||||
|
||||
@@ -210,11 +230,18 @@ export default function EnvironmentsPanel({
|
||||
|
||||
/** Start a run in `runRegion` (always the region of the scan the action came from). */
|
||||
const launch = useCallback(
|
||||
async (runRegion: string, envName: string, stateKey: string, label: string, run: () => Promise<string>) => {
|
||||
async (
|
||||
runRegion: string,
|
||||
envName: string,
|
||||
stateKey: string,
|
||||
kind: RunKind,
|
||||
label: string,
|
||||
run: () => Promise<string>,
|
||||
) => {
|
||||
const rk = rowKey(runRegion, envName);
|
||||
setRowErrors(({ [rk]: _gone, ...rest }) => rest);
|
||||
setPending((p) => ({ ...p, [rk]: true }));
|
||||
const err = await start(stateKey, runRegion, label, run);
|
||||
const err = await start(stateKey, runRegion, kind, label, run);
|
||||
setPending(({ [rk]: _gone, ...rest }) => rest);
|
||||
if (err) setRowErrors((r) => ({ ...r, [rk]: err }));
|
||||
return err;
|
||||
@@ -230,7 +257,7 @@ export default function EnvironmentsPanel({
|
||||
const seen = runKey(scan.region, key);
|
||||
if (!runs[seen] && !followed.current.has(seen)) {
|
||||
followed.current.add(seen);
|
||||
void launch(scan.region, name, key, label, () => followAwsDeployment(connection.id, scan.region, key));
|
||||
void launch(scan.region, name, key, "follow", label, () => followAwsDeployment(connection.id, scan.region, key));
|
||||
}
|
||||
};
|
||||
for (const e of scan.environments) {
|
||||
@@ -261,50 +288,42 @@ export default function EnvironmentsPanel({
|
||||
const stale = detecting || !current;
|
||||
|
||||
const deploy = (runRegion: string, name: string, network: NetworkChoice, hours: number) =>
|
||||
launch(runRegion, name, environmentStateKey(name), `Deploy of ${name}`, () =>
|
||||
launch(runRegion, name, environmentStateKey(name), "deploy", `Deploy of ${name}`, () =>
|
||||
deployAwsEnvironment(connection.id, runRegion, name, network, hours),
|
||||
);
|
||||
// Without `hours`, the environment's recorded cap is kept.
|
||||
const repair = (runRegion: string, name: string, network?: NetworkChoice, hours?: number) =>
|
||||
launch(runRegion, name, environmentStateKey(name), `Repair of ${name}`, () =>
|
||||
launch(runRegion, name, environmentStateKey(name), "repair", `Repair of ${name}`, () =>
|
||||
repairAwsEnvironment(connection.id, runRegion, name, network, hours),
|
||||
);
|
||||
const update = (runRegion: string, name: string, hours: number) =>
|
||||
launch(runRegion, name, environmentStateKey(name), `Update of ${name}`, () =>
|
||||
launch(runRegion, name, environmentStateKey(name), "update", `Update of ${name}`, () =>
|
||||
updateAwsEnvironment(connection.id, runRegion, name, hours),
|
||||
);
|
||||
|
||||
// Join (or, once joined, a change of EC2 capacity): admins choose the
|
||||
// capacity and apply it themselves; others get a bundle for an admin.
|
||||
// Join (or, once joined, a change of EC2 capacity): anyone chooses the
|
||||
// capacity and applies it; the modal offers a bundle for an admin instead.
|
||||
const join = (found: EnvironmentScan, e: DetectedEnvironment) => {
|
||||
const recorded = recordedEc2(e);
|
||||
if (isAdmin) {
|
||||
setJoinOf({
|
||||
region: found.region,
|
||||
name: e.name,
|
||||
stateKey: onboardingStateKey(e.name, found.owner_key),
|
||||
recorded,
|
||||
reapply: e.onboarding?.state === "joined",
|
||||
incomplete: e.onboarding?.state === "incomplete",
|
||||
lastChoice: lastEc2.current.get(rowKey(found.region, e.name)) ?? null,
|
||||
});
|
||||
} else {
|
||||
setBundle({
|
||||
kind: "user_onboard",
|
||||
region: found.region,
|
||||
environment: e.name,
|
||||
ownerId: found.owner_id,
|
||||
recordedEc2: recorded,
|
||||
});
|
||||
}
|
||||
setJoinOf({
|
||||
region: found.region,
|
||||
name: e.name,
|
||||
ownerId: found.owner_id,
|
||||
stateKey: onboardingStateKey(e.name, found.owner_key),
|
||||
recorded: recordedEc2(e),
|
||||
reapply: e.onboarding?.state === "joined",
|
||||
incomplete: e.onboarding?.state === "incomplete",
|
||||
lastChoice: lastEc2.current.get(rowKey(found.region, e.name)) ?? null,
|
||||
});
|
||||
};
|
||||
const onboardBundle = (region: string, environment: string, ownerId: string, recorded: UserCompute | null) =>
|
||||
setBundle({ kind: "user_onboard", region, environment, ownerId, recordedEc2: recorded });
|
||||
const runJoin = (j: JoinOf, ec2: Ec2Choice) => {
|
||||
const key = rowKey(j.region, j.name);
|
||||
if (ec2.kind === "ec2") {
|
||||
const { kind: _kind, ...c } = ec2;
|
||||
lastEc2.current.set(key, c);
|
||||
} else lastEc2.current.delete(key);
|
||||
return launch(j.region, j.name, j.stateKey, `Joining ${j.name}`, () => onboardAwsUser(connection.id, j.region, j.name, ec2));
|
||||
return launch(j.region, j.name, j.stateKey, "onboard", `Joining ${j.name}`, () => onboardAwsUser(connection.id, j.region, j.name, ec2));
|
||||
};
|
||||
|
||||
const rowRuns = (name: string) =>
|
||||
@@ -313,14 +332,40 @@ export default function EnvironmentsPanel({
|
||||
const looseRuns = Object.values(runs).filter(
|
||||
(r) => r.region !== current?.region || !shown.has(runEnvironment(r.stateKey) ?? ""),
|
||||
);
|
||||
const progress = (r: DeployRun) => (
|
||||
<DeployProgress
|
||||
key={runKey(r.region, r.stateKey)}
|
||||
run={r}
|
||||
connectionId={connection.id}
|
||||
onDismiss={() => dismiss(runKey(r.region, r.stateKey))}
|
||||
/>
|
||||
);
|
||||
const progress = (r: DeployRun) => {
|
||||
const denied = deniedRun(r);
|
||||
const env = runEnvironment(r.stateKey);
|
||||
const found = current?.region === r.region ? current : null;
|
||||
const target = env && found ? found.environments.find((e) => e.name === env) : undefined;
|
||||
const offer =
|
||||
denied === "environment" ? true : denied === "user_onboard" ? !!(found && target) : false;
|
||||
return (
|
||||
<div key={runKey(r.region, r.stateKey)} className="space-y-1.5 min-w-0">
|
||||
<DeployProgress run={r} connectionId={connection.id} onDismiss={() => dismiss(runKey(r.region, r.stateKey))} />
|
||||
{offer && (
|
||||
<div className="space-y-1.5 text-xs text-[var(--text-secondary)] leading-snug" data-testid="denied-hint">
|
||||
<p className="break-words">
|
||||
AWS refused a permission this run needs (its message is above). This may need an admin:{" "}
|
||||
{denied === "environment"
|
||||
? "An admin can deploy the environment for you from a bundle."
|
||||
: "An admin can onboard you from a bundle."}
|
||||
</p>
|
||||
<Button
|
||||
size="sm"
|
||||
wrap
|
||||
onClick={() =>
|
||||
denied === "environment"
|
||||
? setBundle({ kind: "environment", region: r.region })
|
||||
: found && target && onboardBundle(r.region, target.name, found.owner_id, recordedEc2(target))
|
||||
}
|
||||
>
|
||||
Save a bundle for an admin…
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const envRow = (found: EnvironmentScan, e: DetectedEnvironment) => {
|
||||
const at = found.region;
|
||||
@@ -349,10 +394,10 @@ export default function EnvironmentsPanel({
|
||||
data-testid={`env-${e.name}`}
|
||||
className="border border-[var(--border-color)] rounded-[var(--radius-control)] p-2 space-y-1.5"
|
||||
>
|
||||
<div className="flex items-start justify-between gap-2 flex-wrap">
|
||||
<div className="min-w-0 space-y-0.5 text-xs">
|
||||
<div className="flex items-center gap-2 flex-wrap">
|
||||
<span className="text-[13px] font-medium text-[var(--text-primary)]">{e.name}</span>
|
||||
<div className="flex items-start justify-between gap-2 flex-wrap" data-testid={`env-row-${e.name}`}>
|
||||
<div className="min-w-0 flex-1 basis-40 space-y-0.5 text-xs break-words">
|
||||
<div className="flex items-center gap-2 flex-wrap min-w-0">
|
||||
<span className="text-[13px] font-medium text-[var(--text-primary)] break-all">{e.name}</span>
|
||||
<StatusIndicator tone={status.tone} label={status.label} />
|
||||
{onboarding === "joined" && <StatusIndicator tone="ok" label="Joined" />}
|
||||
{onboarding === "in_progress" && <StatusIndicator tone="busy" label="Onboarding in progress" />}
|
||||
@@ -407,11 +452,11 @@ export default function EnvironmentsPanel({
|
||||
})()}
|
||||
</div>
|
||||
)}
|
||||
{!isAdmin && isWaiting && onboarding !== "joined" && (
|
||||
{isWaiting && onboarding !== "joined" && (
|
||||
<div className="text-[var(--text-secondary)]">Waiting for an admin to onboard you</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex gap-1.5 flex-wrap">
|
||||
<div className="flex gap-1.5 flex-wrap min-w-0 max-w-full" data-testid={`env-actions-${e.name}`}>
|
||||
{has("join") && onboarding !== "joined" && onboarding !== "in_progress" && (
|
||||
<Button
|
||||
size="sm"
|
||||
@@ -420,17 +465,18 @@ export default function EnvironmentsPanel({
|
||||
aria-label={`Join ${e.name}`}
|
||||
onClick={() => join(found, e)}
|
||||
>
|
||||
{!isAdmin && isWaiting ? "Show onboarding bundle" : "Join"}
|
||||
Join
|
||||
</Button>
|
||||
)}
|
||||
{has("join") && onboarding === "joined" && (
|
||||
<Button
|
||||
size="sm"
|
||||
wrap
|
||||
disabled={busy || joinBlocked}
|
||||
aria-label={`EC2 capacity in ${e.name}`}
|
||||
onClick={() => join(found, e)}
|
||||
>
|
||||
{isAdmin ? "Change EC2 capacity" : "EC2 capacity bundle"}
|
||||
Change EC2 capacity
|
||||
</Button>
|
||||
)}
|
||||
{mine("follow") && (
|
||||
@@ -439,7 +485,7 @@ export default function EnvironmentsPanel({
|
||||
disabled={busy}
|
||||
aria-label={`Follow my onboarding to ${e.name}`}
|
||||
onClick={() =>
|
||||
void launch(at, e.name, myKey, `Joining ${e.name}`, () => followAwsDeployment(connection.id, at, myKey))
|
||||
void launch(at, e.name, myKey, "follow", `Joining ${e.name}`, () => followAwsDeployment(connection.id, at, myKey))
|
||||
}
|
||||
>
|
||||
Follow
|
||||
@@ -451,7 +497,7 @@ export default function EnvironmentsPanel({
|
||||
disabled={busy}
|
||||
aria-label={`Push saved state of my onboarding to ${e.name}`}
|
||||
onClick={() =>
|
||||
void launch(at, e.name, myKey, `Push of the saved state of joining ${e.name}`, () =>
|
||||
void launch(at, e.name, myKey, "push", `Push of the saved state of joining ${e.name}`, () =>
|
||||
pushAwsSavedState(connection.id, at, myKey),
|
||||
)
|
||||
}
|
||||
@@ -477,7 +523,7 @@ export default function EnvironmentsPanel({
|
||||
aria-label={`Push saved state of ${e.name}`}
|
||||
onClick={() => {
|
||||
const key = environmentStateKey(e.name);
|
||||
void launch(at, e.name, key, `Push of the saved state of ${e.name}`, () =>
|
||||
void launch(at, e.name, key, "push", `Push of the saved state of ${e.name}`, () =>
|
||||
pushAwsSavedState(connection.id, at, key),
|
||||
);
|
||||
}}
|
||||
@@ -492,7 +538,7 @@ export default function EnvironmentsPanel({
|
||||
aria-label={`Follow ${e.name}`}
|
||||
onClick={() => {
|
||||
const key = environmentStateKey(e.name);
|
||||
void launch(at, e.name, key, `Deploy of ${e.name}`, () => followAwsDeployment(connection.id, at, key));
|
||||
void launch(at, e.name, key, "follow", `Deploy of ${e.name}`, () => followAwsDeployment(connection.id, at, key));
|
||||
}}
|
||||
>
|
||||
Follow
|
||||
@@ -548,7 +594,7 @@ export default function EnvironmentsPanel({
|
||||
</div>
|
||||
</div>
|
||||
{rowError && (
|
||||
<p role="alert" className="text-xs text-[var(--error)] leading-snug">
|
||||
<p role="alert" className="text-xs text-[var(--error)] leading-snug break-words">
|
||||
{awsErrorMessage(rowError)}
|
||||
</p>
|
||||
)}
|
||||
@@ -560,14 +606,14 @@ export default function EnvironmentsPanel({
|
||||
const nothingFound = !!current && current.environments.length === 0;
|
||||
|
||||
return (
|
||||
<div className="pt-1.5 space-y-2">
|
||||
<div className="pt-1.5 space-y-2 min-w-0">
|
||||
<Button size="sm" variant="ghost" aria-expanded={open} onClick={() => setOpen((o) => !o)}>
|
||||
<span aria-hidden="true">{open ? "▾" : "▸"}</span>
|
||||
Environments
|
||||
</Button>
|
||||
{open && (
|
||||
<div className="space-y-2 pl-1">
|
||||
<div className="flex items-end gap-2 flex-wrap">
|
||||
<div className="space-y-2 pl-1 min-w-0">
|
||||
<div className="flex items-end gap-2 flex-wrap min-w-0" data-testid="region-row">
|
||||
<Field label="Region">
|
||||
{(id) => (
|
||||
<select id={id} className={selectClass} value={region} onChange={(e) => setRegion(e.target.value)}>
|
||||
@@ -589,11 +635,11 @@ export default function EnvironmentsPanel({
|
||||
</p>
|
||||
)}
|
||||
{detectError && (
|
||||
<p role="alert" className="text-xs text-[var(--error)] leading-snug">
|
||||
<p role="alert" className="text-xs text-[var(--error)] leading-snug break-words">
|
||||
{awsErrorMessage(detectError)}
|
||||
</p>
|
||||
)}
|
||||
{current && isAdmin && current.boundary === "no" && (
|
||||
{current && current.boundary === "no" && (
|
||||
<p className="text-xs text-[var(--text-secondary)] leading-snug">
|
||||
This account has no Triple-C permissions boundary yet; deploying creates it first.
|
||||
</p>
|
||||
@@ -604,32 +650,54 @@ export default function EnvironmentsPanel({
|
||||
{nothingFound && (
|
||||
<p className="text-xs text-[var(--text-secondary)] leading-snug">
|
||||
No Triple-C environment in {current.region}.
|
||||
{!isAdmin &&
|
||||
" Deploying one needs an environment admin: attach the environment-admin policies to an identity, or send an admin a bundle to deploy."}
|
||||
{!tier && " Run Check to find out whether you can deploy one yourself."}
|
||||
{!tier && " Run Check to see what your credentials can do."}
|
||||
</p>
|
||||
)}
|
||||
{current && isAdmin && (
|
||||
<Button
|
||||
size="md"
|
||||
variant={nothingFound ? "primary" : "secondary"}
|
||||
disabled={stale}
|
||||
onClick={() => setDeployOpen(true)}
|
||||
>
|
||||
Deploy a new environment
|
||||
</Button>
|
||||
)}
|
||||
{nothingFound && !isAdmin && (
|
||||
<div className="space-y-2">
|
||||
<PolicyFiles tier="environment_admin" label="Show the environment-admin policies" onCopy={copy} />
|
||||
<Button size="md" disabled={stale} onClick={() => setBundle({ kind: "environment", region: current.region })}>
|
||||
Request an environment from an admin…
|
||||
{current && (
|
||||
<div className="space-y-1.5 min-w-0" data-testid="deploy-section">
|
||||
<Button
|
||||
size="md"
|
||||
wrap
|
||||
variant={nothingFound ? "primary" : "secondary"}
|
||||
disabled={stale}
|
||||
onClick={() => setDeployOpen(true)}
|
||||
>
|
||||
Deploy a new environment
|
||||
</Button>
|
||||
{copyNote && (
|
||||
<p role="status" className="text-xs text-[var(--text-secondary)]">
|
||||
{copyNote}
|
||||
{!isAdmin && (
|
||||
<p className="text-xs text-[var(--text-secondary)] leading-snug break-words" data-testid="deploy-unconfirmed-note">
|
||||
{UNCONFIRMED_NOTE}
|
||||
</p>
|
||||
)}
|
||||
{!isAdmin && (
|
||||
<details
|
||||
className="text-xs min-w-0"
|
||||
data-testid="not-admin-options"
|
||||
open={notAdminOpen}
|
||||
onToggle={(ev) => setNotAdminOpen(ev.currentTarget.open)}
|
||||
>
|
||||
<summary className="cursor-pointer list-none [&::-webkit-details-marker]:hidden text-[var(--text-primary)] break-words">
|
||||
<span aria-hidden="true" className="mr-1">{notAdminOpen ? "▾" : "▸"}</span>
|
||||
Not an admin? Ask one to deploy it
|
||||
</summary>
|
||||
<div className="mt-1.5 space-y-2 min-w-0">
|
||||
<Button
|
||||
size="sm"
|
||||
wrap
|
||||
disabled={stale}
|
||||
onClick={() => setBundle({ kind: "environment", region: current.region })}
|
||||
>
|
||||
Request an environment from an admin…
|
||||
</Button>
|
||||
<PolicyFiles tier="environment_admin" label="Show the environment-admin policies" onCopy={copy} />
|
||||
{copyNote && (
|
||||
<p role="status" className="text-xs text-[var(--text-secondary)] break-words">
|
||||
{copyNote}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</details>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{looseRuns.map(progress)}
|
||||
@@ -649,6 +717,12 @@ export default function EnvironmentsPanel({
|
||||
repairOf ? repair(current.region, name, network, hours) : deploy(current.region, name, network, hours)
|
||||
}
|
||||
onDetect={() => void detect()}
|
||||
onBundle={() => {
|
||||
const at = current.region;
|
||||
setDeployOpen(false);
|
||||
setRepairOf(null);
|
||||
setBundle({ kind: "environment", region: at });
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{updateOf && (
|
||||
@@ -667,7 +741,7 @@ export default function EnvironmentsPanel({
|
||||
confirmLabel="Destroy"
|
||||
onClose={() => setDestroyOf(null)}
|
||||
onConfirm={() =>
|
||||
launch(destroyOf.region, destroyOf.name, environmentStateKey(destroyOf.name), `Destroy of ${destroyOf.name}`, () =>
|
||||
launch(destroyOf.region, destroyOf.name, environmentStateKey(destroyOf.name), "destroy", `Destroy of ${destroyOf.name}`, () =>
|
||||
destroyIncompleteAwsEnvironment(connection.id, destroyOf.region, destroyOf.name),
|
||||
)
|
||||
}
|
||||
@@ -718,6 +792,12 @@ export default function EnvironmentsPanel({
|
||||
reapply={joinOf.reapply}
|
||||
incomplete={joinOf.incomplete}
|
||||
lastChoice={joinOf.lastChoice}
|
||||
confirmedAdmin={isAdmin}
|
||||
onBundle={() => {
|
||||
const j = joinOf;
|
||||
setJoinOf(null);
|
||||
onboardBundle(j.region, j.name, j.ownerId, j.recorded);
|
||||
}}
|
||||
onJoin={(ec2) => runJoin(joinOf, ec2)}
|
||||
onClose={() => setJoinOf(null)}
|
||||
/>
|
||||
|
||||
@@ -4,12 +4,13 @@ import type { AwsError, Ec2Choice, Ec2Compute, UserCompute } from "../../../lib/
|
||||
import Button from "../../ui/Button";
|
||||
import Modal from "../../ui/Modal";
|
||||
import Ec2CapacityFields from "./Ec2CapacityFields";
|
||||
import { ec2DraftFrom, ec2FromDraft, type Ec2Draft } from "./environmentFormat";
|
||||
import { ec2DraftFrom, ec2FromDraft, UNCONFIRMED_NOTE, type Ec2Draft } from "./environmentFormat";
|
||||
|
||||
/**
|
||||
* Self-onboarding (environment admins): join an environment, or re-apply an
|
||||
* onboarding to change its EC2 capacity. Starts from the recorded capacity,
|
||||
* so a re-apply keeps it unless changed.
|
||||
* Self-onboarding: join an environment, or re-apply an onboarding to change
|
||||
* its EC2 capacity. Starts from the recorded capacity, so a re-apply keeps it
|
||||
* unless changed. Open to anyone: AWS refuses the run when a permission is
|
||||
* missing, and an onboarding bundle for an admin is the alternative.
|
||||
*/
|
||||
export default function JoinEnvironmentModal({
|
||||
environment,
|
||||
@@ -18,6 +19,8 @@ export default function JoinEnvironmentModal({
|
||||
reapply,
|
||||
incomplete = false,
|
||||
lastChoice = null,
|
||||
confirmedAdmin = true,
|
||||
onBundle,
|
||||
onJoin,
|
||||
onClose,
|
||||
}: {
|
||||
@@ -33,6 +36,10 @@ export default function JoinEnvironmentModal({
|
||||
/** The EC2 capacity last chosen here in this run of the app, if any:
|
||||
* the starting point when there is no record. */
|
||||
lastChoice?: Ec2Compute | null;
|
||||
/** The permission check confirmed environment-admin rights; otherwise a note says AWS may refuse. */
|
||||
confirmedAdmin?: boolean;
|
||||
/** Switch to an onboarding bundle for an admin instead. */
|
||||
onBundle?: () => void;
|
||||
/** Starts the run; resolves to the command's error, or null once started. */
|
||||
onJoin: (ec2: Ec2Choice) => Promise<AwsError | null>;
|
||||
onClose: () => void;
|
||||
@@ -73,6 +80,7 @@ export default function JoinEnvironmentModal({
|
||||
>
|
||||
<div className="space-y-3 text-xs text-[var(--text-secondary)] leading-snug">
|
||||
{!reapply && <p>Joining creates your own task role and file system in {environment}.</p>}
|
||||
{!confirmedAdmin && <p data-testid="join-unconfirmed-note">{UNCONFIRMED_NOTE}</p>}
|
||||
{recorded && (
|
||||
<p>Stop your EC2 workspaces before removing EC2 capacity or changing your triple-c-user value: that change can't finish while one runs.</p>
|
||||
)}
|
||||
@@ -89,10 +97,22 @@ export default function JoinEnvironmentModal({
|
||||
</p>
|
||||
)}
|
||||
{error && (
|
||||
<p role="alert" className="text-[var(--error)]">
|
||||
<p role="alert" className="text-[var(--error)] break-words">
|
||||
{awsErrorMessage(error)}
|
||||
</p>
|
||||
)}
|
||||
{onBundle && (
|
||||
<div className="space-y-1.5 pt-1 border-t border-[var(--border-color)]">
|
||||
<p>
|
||||
{error?.kind === "access_denied"
|
||||
? "AWS refused this with your permissions. An admin can onboard you from a bundle instead."
|
||||
: "Can't onboard yourself? An admin can onboard you from a bundle."}
|
||||
</p>
|
||||
<Button size="sm" wrap onClick={onBundle}>
|
||||
Save an onboarding bundle for an admin…
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</Modal>
|
||||
);
|
||||
|
||||
@@ -28,6 +28,7 @@ export default function NetworkFields({
|
||||
<div className="text-[13px] font-medium text-[var(--text-primary)]">Network</div>
|
||||
<SegmentedControl<NetworkChoice["mode"]>
|
||||
label="Network"
|
||||
className="flex-wrap max-w-full"
|
||||
value={value.mode}
|
||||
onChange={(mode) => set({ mode })}
|
||||
segments={[
|
||||
|
||||
@@ -28,12 +28,12 @@ export default function PolicyFiles({
|
||||
|
||||
if (!files) {
|
||||
return (
|
||||
<div className="space-y-1">
|
||||
<Button size="sm" onClick={load}>
|
||||
<div className="space-y-1 min-w-0">
|
||||
<Button size="sm" wrap onClick={load}>
|
||||
{label}
|
||||
</Button>
|
||||
{error && (
|
||||
<p role="alert" className="text-xs text-[var(--error)]">
|
||||
<p role="alert" className="text-xs text-[var(--error)] break-words">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
@@ -41,30 +41,38 @@ export default function PolicyFiles({
|
||||
);
|
||||
}
|
||||
return (
|
||||
<div className="space-y-1 text-xs">
|
||||
<p className="text-[var(--text-secondary)]">
|
||||
<div className="space-y-1.5 text-xs min-w-0">
|
||||
<p className="text-[var(--text-secondary)] leading-snug break-words">
|
||||
{tier === "workspace_user" ? "Workspace user" : "Environment admin"}:{" "}
|
||||
{files.length === 1
|
||||
? "attach this file as a customer managed policy."
|
||||
: `Attach all ${files.length} files, each as its own customer managed policy.`}
|
||||
</p>
|
||||
{/* One copy button per file, in a grid that drops to one column when narrow. */}
|
||||
<div data-testid="policy-copy-grid" className="grid gap-1.5 grid-cols-[repeat(auto-fill,minmax(9rem,1fr))]">
|
||||
{files.map((f) => (
|
||||
<Button
|
||||
key={f.name}
|
||||
size="sm"
|
||||
wrap
|
||||
className="w-full justify-start break-all"
|
||||
aria-label={`Copy ${f.name}`}
|
||||
onClick={() => onCopy(f)}
|
||||
>
|
||||
Copy <span className="font-mono">{f.name}</span>
|
||||
</Button>
|
||||
))}
|
||||
</div>
|
||||
{files.map((f) => (
|
||||
<div key={f.name} className="space-y-1">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="font-mono text-[var(--text-primary)]">{f.name}</span>
|
||||
<Button size="sm" aria-label={`Copy ${f.name}`} onClick={() => onCopy(f)}>
|
||||
Copy
|
||||
</Button>
|
||||
</div>
|
||||
<details>
|
||||
<summary className="cursor-pointer text-[var(--text-secondary)]">Show JSON</summary>
|
||||
<pre className="mt-1 max-h-48 overflow-auto whitespace-pre-wrap break-all text-[var(--text-secondary)]">
|
||||
{f.json}
|
||||
</pre>
|
||||
</details>
|
||||
</div>
|
||||
<details key={f.name} className="min-w-0">
|
||||
<summary className="cursor-pointer text-[var(--text-secondary)] break-all">
|
||||
Show JSON of <span className="font-mono">{f.name}</span>
|
||||
</summary>
|
||||
<pre className="mt-1 max-h-48 max-w-full overflow-auto whitespace-pre-wrap break-all text-[var(--text-secondary)]">
|
||||
{f.json}
|
||||
</pre>
|
||||
</details>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -143,3 +143,7 @@ export function computeLine(c: UserCompute): string {
|
||||
const n = c.max_instances === 1 ? "1 instance" : `up to ${c.max_instances} instances`;
|
||||
return `${c.instance_type}, ${n} (triple-c-user ${c.user_tag})`;
|
||||
}
|
||||
|
||||
/** Shown under an action whose permissions the check didn't confirm: AWS has the last word. */
|
||||
export const UNCONFIRMED_NOTE =
|
||||
"Your permission check didn't confirm environment-admin rights; the deploy will stop with AWS's message if a permission is missing.";
|
||||
@@ -74,4 +74,23 @@ describe("Button", () => {
|
||||
fireEvent.click(button);
|
||||
expect(onClick).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("wraps a long label only when asked", () => {
|
||||
render(
|
||||
<>
|
||||
<Button>Short</Button>
|
||||
<Button wrap size="md">
|
||||
Request an environment from an admin…
|
||||
</Button>
|
||||
</>,
|
||||
);
|
||||
const plain = screen.getByRole("button", { name: "Short" });
|
||||
expect(plain.className).toContain("whitespace-nowrap");
|
||||
expect(plain.className).toContain("h-6");
|
||||
const long = screen.getByRole("button", { name: "Request an environment from an admin…" });
|
||||
expect(long.className).toContain("whitespace-normal");
|
||||
expect(long.className).toContain("min-h-8");
|
||||
expect(long.className).toContain("max-w-full");
|
||||
expect(long.className).not.toMatch(/(^|\s)h-8(\s|$)/);
|
||||
});
|
||||
});
|
||||
@@ -19,6 +19,11 @@ interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
|
||||
unavailable?: boolean;
|
||||
/** Why the button cannot be used. Required for `unavailable` to say anything. */
|
||||
unavailableReason?: string;
|
||||
/**
|
||||
* Let a long label wrap onto more lines instead of forcing the button (and
|
||||
* its row) wider than a narrow container, such as the settings sidebar.
|
||||
*/
|
||||
wrap?: boolean;
|
||||
/** React 19 passes `ref` as a prop; it lands on the `<button>` via `rest`. */
|
||||
ref?: Ref<HTMLButtonElement>;
|
||||
}
|
||||
@@ -48,6 +53,12 @@ const SIZES: Record<ButtonSize, string> = {
|
||||
md: "h-8 px-3 text-[13px] gap-1.5",
|
||||
};
|
||||
|
||||
/** `wrap`: the same sizes as a minimum height, so a second line can grow the button. */
|
||||
const WRAP_SIZES: Record<ButtonSize, string> = {
|
||||
sm: "min-h-6 py-0.5 px-2 text-xs gap-1",
|
||||
md: "min-h-8 py-1 px-3 text-[13px] gap-1.5",
|
||||
};
|
||||
|
||||
export default function Button({
|
||||
variant = "secondary",
|
||||
size = "sm",
|
||||
@@ -55,6 +66,7 @@ export default function Button({
|
||||
type = "button",
|
||||
unavailable = false,
|
||||
unavailableReason = "",
|
||||
wrap = false,
|
||||
children,
|
||||
...rest
|
||||
}: Props) {
|
||||
@@ -71,7 +83,7 @@ export default function Button({
|
||||
type={type}
|
||||
{...rest}
|
||||
{...controlProps}
|
||||
className={`inline-flex items-center justify-center whitespace-nowrap rounded-[var(--radius-control)] font-medium transition-colors disabled:cursor-not-allowed aria-disabled:cursor-not-allowed ${SIZES[size]} ${VARIANTS[variant]} ${className}`}
|
||||
className={`inline-flex items-center justify-center ${wrap ? `whitespace-normal break-words text-left max-w-full min-w-0 ${WRAP_SIZES[size]}` : `whitespace-nowrap ${SIZES[size]}`} rounded-[var(--radius-control)] font-medium transition-colors disabled:cursor-not-allowed aria-disabled:cursor-not-allowed ${VARIANTS[variant]} ${className}`}
|
||||
>
|
||||
{children}
|
||||
</button>
|
||||
|
||||
@@ -208,7 +208,7 @@ export default function Modal({
|
||||
</div>
|
||||
|
||||
{footer && (
|
||||
<div className="flex items-center justify-end gap-2 px-5 py-3 border-t border-[var(--border-color)] flex-shrink-0">
|
||||
<div className="flex flex-wrap items-center justify-end gap-2 px-5 py-3 border-t border-[var(--border-color)] flex-shrink-0">
|
||||
{footer}
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -53,6 +53,8 @@ interface Props {
|
||||
iconOnly?: boolean;
|
||||
className?: string;
|
||||
title?: string;
|
||||
/** Let a long label (a failure summary) wrap instead of overflowing its container. */
|
||||
wrap?: boolean;
|
||||
}
|
||||
|
||||
export default function StatusIndicator({
|
||||
@@ -61,11 +63,12 @@ export default function StatusIndicator({
|
||||
iconOnly = false,
|
||||
className = "",
|
||||
title,
|
||||
wrap = false,
|
||||
}: Props) {
|
||||
const style = TONES[tone];
|
||||
return (
|
||||
<span
|
||||
className={`inline-flex items-center gap-1 whitespace-nowrap ${className}`}
|
||||
className={`inline-flex gap-1 ${wrap ? "items-baseline whitespace-normal break-words min-w-0 max-w-full" : "items-center whitespace-nowrap"} ${className}`}
|
||||
title={title ?? label}
|
||||
>
|
||||
<span
|
||||
|
||||
@@ -2,11 +2,11 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
||||
import { act, renderHook } from "@testing-library/react";
|
||||
import { useDocker } from "./useDocker";
|
||||
|
||||
const checkDocker = vi.fn();
|
||||
const getDockerStatus = vi.fn();
|
||||
const checkImageExists = vi.fn();
|
||||
|
||||
vi.mock("../lib/tauri-commands", () => ({
|
||||
checkDocker: () => checkDocker(),
|
||||
getDockerStatus: () => getDockerStatus(),
|
||||
checkImageExists: () => checkImageExists(),
|
||||
buildImage: vi.fn(),
|
||||
pullImage: vi.fn(),
|
||||
@@ -15,6 +15,8 @@ vi.mock("../lib/tauri-commands", () => ({
|
||||
vi.mock("@tauri-apps/api/event", () => ({ listen: vi.fn(async () => vi.fn()) }));
|
||||
|
||||
const setDockerAvailable = vi.fn();
|
||||
const setDockerStatus = vi.fn();
|
||||
const status = (state: string) => ({ state, endpoint: "unix:///var/run/docker.sock", detail: null, os: "linux" });
|
||||
const setImageExists = vi.fn();
|
||||
|
||||
vi.mock("../store/appState", () => ({
|
||||
@@ -22,6 +24,8 @@ vi.mock("../store/appState", () => ({
|
||||
selector({
|
||||
dockerAvailable: false,
|
||||
setDockerAvailable,
|
||||
dockerStatus: null,
|
||||
setDockerStatus,
|
||||
imageExists: false,
|
||||
setImageExists,
|
||||
}),
|
||||
@@ -49,7 +53,7 @@ describe("useDocker.startDockerPolling", () => {
|
||||
});
|
||||
|
||||
it("runs onAvailable once, after Docker is marked available and the image re-checked", async () => {
|
||||
checkDocker.mockResolvedValueOnce(false).mockResolvedValue(true);
|
||||
getDockerStatus.mockResolvedValueOnce(status("not_running")).mockResolvedValue(status("running"));
|
||||
const onAvailable = vi.fn();
|
||||
|
||||
const { result } = renderHook(() => useDocker());
|
||||
@@ -59,9 +63,11 @@ describe("useDocker.startDockerPolling", () => {
|
||||
|
||||
await tick();
|
||||
expect(onAvailable).not.toHaveBeenCalled();
|
||||
// The not-running state is published so the dialog can show it live.
|
||||
expect(setDockerStatus).toHaveBeenLastCalledWith(status("not_running"));
|
||||
|
||||
await tick();
|
||||
expect(setDockerAvailable).toHaveBeenCalledWith(true);
|
||||
expect(setDockerStatus).toHaveBeenLastCalledWith(status("running"));
|
||||
expect(setImageExists).toHaveBeenCalledWith(true);
|
||||
expect(onAvailable).toHaveBeenCalledTimes(1);
|
||||
|
||||
@@ -71,7 +77,7 @@ describe("useDocker.startDockerPolling", () => {
|
||||
});
|
||||
|
||||
it("still works without a callback and can be cancelled by its cleanup", async () => {
|
||||
checkDocker.mockResolvedValue(true);
|
||||
getDockerStatus.mockResolvedValue(status("running"));
|
||||
|
||||
const { result } = renderHook(() => useDocker());
|
||||
let stop: () => void = () => {};
|
||||
@@ -81,7 +87,7 @@ describe("useDocker.startDockerPolling", () => {
|
||||
act(() => stop());
|
||||
|
||||
await tick();
|
||||
expect(checkDocker).not.toHaveBeenCalled();
|
||||
expect(setDockerAvailable).not.toHaveBeenCalled();
|
||||
expect(getDockerStatus).not.toHaveBeenCalled();
|
||||
expect(setDockerStatus).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -7,12 +7,16 @@ import * as commands from "../lib/tauri-commands";
|
||||
export function useDocker() {
|
||||
const {
|
||||
dockerAvailable,
|
||||
dockerStatus,
|
||||
setDockerStatus,
|
||||
setDockerAvailable,
|
||||
imageExists,
|
||||
setImageExists,
|
||||
} = useAppState(
|
||||
useShallow(s => ({
|
||||
dockerAvailable: s.dockerAvailable,
|
||||
dockerStatus: s.dockerStatus,
|
||||
setDockerStatus: s.setDockerStatus,
|
||||
setDockerAvailable: s.setDockerAvailable,
|
||||
imageExists: s.imageExists,
|
||||
setImageExists: s.setImageExists,
|
||||
@@ -21,14 +25,14 @@ export function useDocker() {
|
||||
|
||||
const checkDocker = useCallback(async () => {
|
||||
try {
|
||||
const available = await commands.checkDocker();
|
||||
setDockerAvailable(available);
|
||||
return available;
|
||||
const status = await commands.getDockerStatus();
|
||||
setDockerStatus(status);
|
||||
return status.state === "running";
|
||||
} catch {
|
||||
setDockerAvailable(false);
|
||||
return false;
|
||||
}
|
||||
}, [setDockerAvailable]);
|
||||
}, [setDockerStatus, setDockerAvailable]);
|
||||
|
||||
const checkImage = useCallback(async () => {
|
||||
try {
|
||||
@@ -62,7 +66,9 @@ export function useDocker() {
|
||||
const pollingRef = useRef<ReturnType<typeof setInterval> | null>(null);
|
||||
|
||||
/**
|
||||
* Poll until Docker appears, then stop.
|
||||
* Poll until Docker appears, then stop. Every tick stores the latest
|
||||
* `dockerStatus`, so the Docker dialog follows "not running" → "no
|
||||
* permission" → running live and closes itself.
|
||||
*
|
||||
* `onAvailable` runs exactly once, after `dockerAvailable` is set and the
|
||||
* image has been re-checked. It exists because a session that started before
|
||||
@@ -75,11 +81,11 @@ export function useDocker() {
|
||||
|
||||
const interval = setInterval(async () => {
|
||||
try {
|
||||
const available = await commands.checkDocker();
|
||||
if (available) {
|
||||
const status = await commands.getDockerStatus();
|
||||
if (status.state === "running") {
|
||||
clearInterval(interval);
|
||||
pollingRef.current = null;
|
||||
setDockerAvailable(true);
|
||||
setDockerStatus(status);
|
||||
// Also check image once Docker is available
|
||||
try {
|
||||
const exists = await commands.checkImageExists();
|
||||
@@ -92,6 +98,8 @@ export function useDocker() {
|
||||
} catch (e) {
|
||||
console.error("Docker-available callback failed:", e);
|
||||
}
|
||||
} else {
|
||||
setDockerStatus(status);
|
||||
}
|
||||
} catch {
|
||||
// Still not available, keep polling
|
||||
@@ -103,7 +111,7 @@ export function useDocker() {
|
||||
clearInterval(interval);
|
||||
pollingRef.current = null;
|
||||
};
|
||||
}, [setDockerAvailable, setImageExists]);
|
||||
}, [setDockerStatus, setImageExists]);
|
||||
|
||||
const pullImage = useCallback(
|
||||
async (imageName: string, onProgress?: (msg: string) => void) => {
|
||||
@@ -125,6 +133,7 @@ export function useDocker() {
|
||||
|
||||
return {
|
||||
dockerAvailable,
|
||||
dockerStatus,
|
||||
imageExists,
|
||||
checkDocker,
|
||||
checkImage,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { describe, it, expect } from "vitest";
|
||||
import { awsErrorMessage, toAwsError } from "./aws-error";
|
||||
import { awsErrorMessage, looksDenied, toAwsError } from "./aws-error";
|
||||
|
||||
describe("toAwsError", () => {
|
||||
it("passes a tagged AwsError through", () => {
|
||||
@@ -21,3 +21,21 @@ describe("toAwsError", () => {
|
||||
expect(toAwsError(null).kind).toBe("other");
|
||||
});
|
||||
});
|
||||
|
||||
describe("access denied", () => {
|
||||
it("shows AWS's message, naming the action when the message doesn't", () => {
|
||||
expect(awsErrorMessage({ kind: "access_denied", action: "iam:CreateRole", message: "User: x is not authorized" })).toBe(
|
||||
"AWS denied iam:CreateRole: User: x is not authorized",
|
||||
);
|
||||
expect(awsErrorMessage({ kind: "access_denied", action: "s3:PutObject", message: "denied s3:PutObject" })).toBe(
|
||||
"AWS denied this request: denied s3:PutObject",
|
||||
);
|
||||
});
|
||||
it("recognises refusals in OpenTofu output", () => {
|
||||
expect(looksDenied("Error: creating IAM Role: AccessDenied: User is not authorized")).toBe(true);
|
||||
expect(looksDenied("api error UnauthorizedOperation: You are not authorized")).toBe(true);
|
||||
expect(looksDenied("Error: creating VPC: VpcLimitExceeded")).toBe(false);
|
||||
expect(looksDenied(null)).toBe(false);
|
||||
expect(looksDenied("blocked by an explicit deny in a service control policy")).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -34,7 +34,22 @@ export function awsErrorMessage(e: AwsError): string {
|
||||
return "The access keys for this connection are missing from the keychain. Remove and re-add the connection.";
|
||||
case "state_bucket_taken":
|
||||
return `The state bucket name ${e.bucket} is already taken by another AWS account.`;
|
||||
case "access_denied":
|
||||
// AWS's own message, named by the action when it doesn't already say it.
|
||||
return e.action && !e.message.includes(e.action)
|
||||
? `AWS denied ${e.action}: ${e.message}`
|
||||
: `AWS denied this request: ${e.message}`;
|
||||
default:
|
||||
return e.message;
|
||||
}
|
||||
}
|
||||
|
||||
// The codes `aws::error` maps to access_denied, and how AWS words a refusal in
|
||||
// OpenTofu's output. A bare "explicit deny" is left out: an SCP or bucket
|
||||
// policy deny isn't something an admin bundle fixes.
|
||||
const DENIED = /AccessDenied|UnauthorizedOperation|not authorized to perform/i;
|
||||
|
||||
/** Whether a line of OpenTofu output (or a run's summary) reads as AWS refusing a permission. */
|
||||
export function looksDenied(text: string | null | undefined): boolean {
|
||||
return !!text && DENIED.test(text);
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
import type { DockerStatus } from "./types";
|
||||
|
||||
/** Short label for status dots and checklists. */
|
||||
export function dockerFailLabel(status: DockerStatus | null): string {
|
||||
switch (status?.state) {
|
||||
case "not_running":
|
||||
return "Docker not running";
|
||||
case "no_permission":
|
||||
return "Docker access denied";
|
||||
case "not_installed":
|
||||
return "Docker not installed";
|
||||
default:
|
||||
return "Docker unavailable";
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import type { Project, ProjectPath, NewProjectHost, RemoveProjectOptions, WipChoice, UnsavedWork, WorkspaceStatus, ProjectRemovalReport, ProjectResetOutcome, ContainerInfo, AppSettings, SettingsImportPreview, SettingsImportOutcome, UpdateInfo, ImageUpdateInfo, FileEntry, FileContents, WebTerminalInfo, SttStatus, GatewayStatus, InstallOptions, ClaudeSession, ContainerCapabilities, ScheduledTask, ScheduledTaskInput, SchedulerNotification, AuthBridgeStatus, BrowserViewStatus, BrowserViewPopoutState, BrowserPageState, PlaywrightDetection, BrowserSetupOutcome, BrowserInstallTarget, ContainerStaleness, MigrationOptions, MigrationReport, MigrationState, ClearTokenOutcome, CaCertInfo, UploadOutcome, Note, ViewerFile, ViewerPoll, ViewerSaved, ViewerState, FileDiff, InstallScope, ItemUpdate, Marketplace, MarketplaceAccount, MarketplaceItemRef, MarketplaceSnapshot, ProjectSyncResult, SyncReport, HostConnection, CallerIdentity, PermissionReport, PolicyFile, HourlyEstimate, AwsWorkspaceConfig, Tier, EnvironmentScan, NetworkChoice, ModuleKind, Ec2Choice, Ec2Compute, Ec2InstanceTable, Ec2Capacity, SavedBundle } from "./types";
|
||||
import type { Project, ProjectPath, NewProjectHost, RemoveProjectOptions, WipChoice, UnsavedWork, WorkspaceStatus, ProjectRemovalReport, ProjectResetOutcome, ContainerInfo, AppSettings, SettingsImportPreview, SettingsImportOutcome, UpdateInfo, ImageUpdateInfo, FileEntry, FileContents, WebTerminalInfo, SttStatus, GatewayStatus, InstallOptions, DockerStatus, ClaudeSession, ContainerCapabilities, ScheduledTask, ScheduledTaskInput, SchedulerNotification, AuthBridgeStatus, BrowserViewStatus, BrowserViewPopoutState, BrowserPageState, PlaywrightDetection, BrowserSetupOutcome, BrowserInstallTarget, ContainerStaleness, MigrationOptions, MigrationReport, MigrationState, ClearTokenOutcome, CaCertInfo, UploadOutcome, Note, ViewerFile, ViewerPoll, ViewerSaved, ViewerState, FileDiff, InstallScope, ItemUpdate, Marketplace, MarketplaceAccount, MarketplaceItemRef, MarketplaceSnapshot, ProjectSyncResult, SyncReport, HostConnection, CallerIdentity, PermissionReport, PolicyFile, HourlyEstimate, AwsWorkspaceConfig, Tier, EnvironmentScan, NetworkChoice, ModuleKind, Ec2Choice, Ec2Compute, Ec2InstanceTable, Ec2Capacity, SavedBundle } from "./types";
|
||||
|
||||
// Docker
|
||||
export const checkDocker = () => invoke<boolean>("check_docker");
|
||||
export const getDockerStatus = () => invoke<DockerStatus>("check_docker_status");
|
||||
export const checkImageExists = () => invoke<boolean>("check_image_exists");
|
||||
export const buildImage = () => invoke<void>("build_image");
|
||||
export const getContainerInfo = (projectId: string) =>
|
||||
|
||||
@@ -702,6 +702,17 @@ export interface FileContents {
|
||||
size: number;
|
||||
}
|
||||
|
||||
/** Mirrors `docker::status::DockerStatus` (src-tauri/src/docker/status.rs). */
|
||||
export type DockerState = "running" | "not_running" | "no_permission" | "not_installed";
|
||||
|
||||
export interface DockerStatus {
|
||||
state: DockerState;
|
||||
/** The endpoint that was tried: `DOCKER_HOST` when set, else the default socket/pipe. */
|
||||
endpoint: string;
|
||||
detail: string | null;
|
||||
os: "linux" | "macos" | "windows" | "unknown";
|
||||
}
|
||||
|
||||
export interface InstallOptions {
|
||||
os: "linux" | "macos" | "windows" | "unknown";
|
||||
product_name: string;
|
||||
|
||||
@@ -3,6 +3,7 @@ import type {
|
||||
Project,
|
||||
TerminalSession,
|
||||
AppSettings,
|
||||
DockerStatus,
|
||||
UpdateInfo,
|
||||
ImageUpdateInfo,
|
||||
Note,
|
||||
@@ -243,6 +244,10 @@ interface AppState {
|
||||
setNotesDockWidth: (width: number) => void;
|
||||
dockerAvailable: boolean | null;
|
||||
setDockerAvailable: (available: boolean | null) => void;
|
||||
/** Why Docker is (un)available; `null` until the first check. */
|
||||
dockerStatus: DockerStatus | null;
|
||||
/** Sets `dockerStatus` and derives `dockerAvailable` from it. */
|
||||
setDockerStatus: (status: DockerStatus) => void;
|
||||
imageExists: boolean | null;
|
||||
setImageExists: (exists: boolean | null) => void;
|
||||
// App settings
|
||||
@@ -569,6 +574,9 @@ export const useAppState = create<AppState>((set) => ({
|
||||
},
|
||||
dockerAvailable: null,
|
||||
setDockerAvailable: (available) => set({ dockerAvailable: available }),
|
||||
dockerStatus: null,
|
||||
setDockerStatus: (status) =>
|
||||
set({ dockerStatus: status, dockerAvailable: status.state === "running" }),
|
||||
imageExists: null,
|
||||
setImageExists: (exists) => set({ imageExists: exists }),
|
||||
// App settings
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
# build-ssm-plugin.ps1 - build AWS's session-manager-plugin FROM SOURCE for
|
||||
# Windows and put it where Tauri's bundle.externalBin expects it:
|
||||
#
|
||||
# app\src-tauri\binaries\session-manager-plugin-x86_64-pc-windows-msvc.exe
|
||||
#
|
||||
# The Windows runner's half of scripts/build-ssm-plugin.sh - read that header
|
||||
# for the why. The same pins and the same build, so it must produce the same
|
||||
# bytes (Go builds are reproducible across hosts); keep the two in step.
|
||||
#
|
||||
# 1. Source: AWS's tag 1.2.896.0 by COMMIT, as GitHub's archive of that
|
||||
# commit, SHA-256 checked before extraction (and its top directory must
|
||||
# name the commit).
|
||||
# 2. Toolchain: Go, pinned, SHA-256 as published by go.dev, checked before use.
|
||||
# 3. AWS's own build (GOPATH mode over the vendored deps, -ldflags "-s -w"),
|
||||
# version stamped to the tag, made reproducible (-trimpath, no VCS stamp,
|
||||
# empty build id, CGO off, GOAMD64=v1, nothing inherited).
|
||||
# 4. The output must equal the pinned SHA-256.
|
||||
#
|
||||
# The result is UNSIGNED: in a release build Tauri presents it to the sign
|
||||
# command (windows-sign.ps1 signs it with our certificate), and
|
||||
# windows-verify-signatures.ps1 requires our signature on it in both installers.
|
||||
#
|
||||
# Needs tar.exe (bsdtar, in every Windows 10+). Idempotent.
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
||||
Add-Type -AssemblyName System.IO.Compression.FileSystem
|
||||
|
||||
$PluginVersion = '1.2.896.0'
|
||||
$PluginCommit = '6430675a44032a551be1937fb27a2d3fdfeb27f7'
|
||||
$SourceUrl = "https://codeload.github.com/aws/session-manager-plugin/tar.gz/$PluginCommit"
|
||||
$SourceSha = '7C95BE411AD5F43D14D01460500BFD5A5AA0E28BA94815F8B049AF33A2C381B0'
|
||||
$GoVersion = '1.26.11'
|
||||
$GoSha = '71AE086F0137E665F855A811CC119152B6A783E0BBC1B906E709F46D80141EB0' # go1.26.11.windows-amd64.zip, go.dev
|
||||
$BinarySha = '6D428E5FD77E76D9713F0C42B8EC39F2DE1031E5F3C567FEB73C7FE11B14B226'
|
||||
$Triple = 'x86_64-pc-windows-msvc'
|
||||
|
||||
$repoRoot = Split-Path -Parent $PSScriptRoot
|
||||
$destDir = Join-Path $repoRoot 'app\src-tauri\binaries'
|
||||
$dest = Join-Path $destDir "session-manager-plugin-$Triple.exe"
|
||||
$notices = Join-Path $repoRoot 'app\src-tauri\THIRD_PARTY_NOTICES'
|
||||
|
||||
function Get-Sha256([string]$Path) { (Get-FileHash -LiteralPath $Path -Algorithm SHA256).Hash.ToUpperInvariant() }
|
||||
|
||||
if (-not ((Select-String -LiteralPath $notices -SimpleMatch "Version: $PluginVersion" -Quiet) -and
|
||||
(Select-String -LiteralPath $notices -SimpleMatch "Commit: $PluginCommit" -Quiet))) {
|
||||
throw "$notices does not name plugin $PluginVersion at $PluginCommit - update it with the bump"
|
||||
}
|
||||
|
||||
if ((Test-Path -LiteralPath $dest) -and ((Get-Sha256 $dest) -eq $BinarySha)) {
|
||||
Write-Host "session-manager-plugin-$Triple.exe: already the pinned $PluginVersion build"
|
||||
exit 0
|
||||
}
|
||||
|
||||
# A short work root, not %TEMP% (on the runner that is deep under
|
||||
# systemprofile): the longest extracted path is ~200 characters, and MAX_PATH
|
||||
# is 260 for Windows PowerShell 5.1, tar.exe and the Go build alike.
|
||||
$work = Join-Path "$env:SystemDrive\" ('ssm-' + [guid]::NewGuid().ToString('N').Substring(0, 8))
|
||||
New-Item -ItemType Directory -Path $work | Out-Null
|
||||
# A directory at the drive root inherits C:\'s ACL, where Authenticated Users
|
||||
# may create and modify files - another local user could swap the source, the
|
||||
# toolchain or the output between our checks and their use. So before anything
|
||||
# lands in it: no inheritance, full control for SYSTEM, Administrators and this
|
||||
# process's own user only. Mandatory on Windows; skipped only where there is no
|
||||
# Windows ACL (the Linux pwsh test path).
|
||||
if ($env:OS -eq 'Windows_NT') {
|
||||
$me = [Security.Principal.WindowsIdentity]::GetCurrent().User.Value
|
||||
& icacls.exe $work /inheritance:r /grant:r '*S-1-5-18:(OI)(CI)F' '*S-1-5-32-544:(OI)(CI)F' "*${me}:(OI)(CI)F" | Out-Null
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Remove-Item -LiteralPath $work -Recurse -Force -ErrorAction SilentlyContinue
|
||||
throw "icacls could not restrict $work ($LASTEXITCODE)"
|
||||
}
|
||||
}
|
||||
$ProgressPreference = 'SilentlyContinue'
|
||||
try {
|
||||
$goZip = Join-Path $work 'go.zip'
|
||||
Write-Host "Downloading Go $GoVersion (windows-amd64)"
|
||||
Invoke-WebRequest -Uri "https://go.dev/dl/go$GoVersion.windows-amd64.zip" -OutFile $goZip -UseBasicParsing
|
||||
$actual = Get-Sha256 $goZip
|
||||
if ($actual -ne $GoSha) { throw "SHA-256 mismatch for the Go toolchain: got $actual, pinned $GoSha" }
|
||||
[IO.Compression.ZipFile]::ExtractToDirectory($goZip, (Join-Path $work 'toolchain'))
|
||||
$go = Join-Path $work 'toolchain\go\bin\go.exe'
|
||||
|
||||
$srcTgz = Join-Path $work 'source.tar.gz'
|
||||
Write-Host "Downloading session-manager-plugin $PluginVersion source ($PluginCommit)"
|
||||
Invoke-WebRequest -Uri $SourceUrl -OutFile $srcTgz -UseBasicParsing
|
||||
$actual = Get-Sha256 $srcTgz
|
||||
if ($actual -ne $SourceSha) { throw "SHA-256 mismatch for the plugin source: got $actual, pinned $SourceSha" }
|
||||
$srcDir = Join-Path $work 'src'
|
||||
New-Item -ItemType Directory -Path $srcDir | Out-Null
|
||||
# Only what the build reads, as build-ssm-plugin.sh does: the vendored SDK's
|
||||
# Java codegen/ tree reaches 258 characters inside the archive, past
|
||||
# MAX_PATH, and its snapshot/ files are test data.
|
||||
& tar.exe --exclude='*/codegen/*' --exclude='*/snapshot/*' -xzf $srcTgz -C $srcDir
|
||||
if ($LASTEXITCODE -ne 0) { throw "tar.exe could not extract the source ($LASTEXITCODE)" }
|
||||
$goSpace = Join-Path $srcDir "session-manager-plugin-$PluginCommit"
|
||||
if (-not (Test-Path -LiteralPath (Join-Path $goSpace 'src\sessionmanagerplugin-main'))) {
|
||||
throw "the source archive is not the pinned commit's tree"
|
||||
}
|
||||
|
||||
# A clean, fully specified Go environment for everything below.
|
||||
foreach ($v in 'GOFLAGS', 'GOROOT', 'GOBIN', 'GOEXPERIMENT', 'GOTMPDIR') { Remove-Item "env:$v" -ErrorAction SilentlyContinue }
|
||||
$gopath = Join-Path $work 'gopath'
|
||||
$env:GOENV = 'off'; $env:GOTOOLCHAIN = 'local'; $env:GO111MODULE = 'off'; $env:GOPROXY = 'off'; $env:GOWORK = 'off'
|
||||
$env:GOPATH = "$gopath;$(Join-Path $goSpace 'vendor')"
|
||||
$env:GOCACHE = Join-Path $work 'cache'; $env:GOMODCACHE = Join-Path $work 'modcache'
|
||||
$env:CGO_ENABLED = '0'; $env:GOAMD64 = 'v1'; $env:GOARM64 = 'v8.0'
|
||||
|
||||
# makefile pre-build: stamp the version with AWS's own generator.
|
||||
[IO.File]::WriteAllText((Join-Path $goSpace 'VERSION'), $PluginVersion)
|
||||
# version-gen runs on this host, so no GOOS/GOARCH yet.
|
||||
Remove-Item env:GOOS, env:GOARCH -ErrorAction SilentlyContinue
|
||||
Push-Location $goSpace
|
||||
try { & $go run ./src/version/versiongenerator/version-gen.go | Out-Null } finally { Pop-Location }
|
||||
if ($LASTEXITCODE -ne 0) { throw "version-gen failed ($LASTEXITCODE)" }
|
||||
if (-not (Select-String -LiteralPath (Join-Path $goSpace 'src\version\version.go') -SimpleMatch "const Version = `"$PluginVersion`"" -Quiet)) {
|
||||
throw 'the version stamp did not take'
|
||||
}
|
||||
|
||||
# makefile copy-src: GOPATH mode, from a copy at the import path.
|
||||
$pkgRoot = Join-Path $gopath 'src\github.com\aws\session-manager-plugin'
|
||||
New-Item -ItemType Directory -Force -Path $pkgRoot | Out-Null
|
||||
Copy-Item -Recurse -LiteralPath (Join-Path $goSpace 'src') -Destination $pkgRoot
|
||||
|
||||
$out = Join-Path $work 'session-manager-plugin.exe'
|
||||
Write-Host "Building session-manager-plugin $PluginVersion for windows/amd64"
|
||||
$env:GOOS = 'windows'; $env:GOARCH = 'amd64'
|
||||
Push-Location $pkgRoot
|
||||
try {
|
||||
& $go build -trimpath -buildvcs=false -ldflags '-s -w -buildid=' -o $out `
|
||||
github.com/aws/session-manager-plugin/src/sessionmanagerplugin-main
|
||||
} finally { Pop-Location }
|
||||
if ($LASTEXITCODE -ne 0) { throw "go build failed ($LASTEXITCODE)" }
|
||||
$actual = Get-Sha256 $out
|
||||
if ($actual -ne $BinarySha) {
|
||||
throw "the windows/amd64 build is not the pinned binary: got $actual, pinned $BinarySha (source, toolchain or build flags changed)"
|
||||
}
|
||||
|
||||
New-Item -ItemType Directory -Force -Path $destDir | Out-Null
|
||||
Move-Item -LiteralPath $out -Destination $dest -Force
|
||||
# And what landed is still what was checked.
|
||||
$actual = Get-Sha256 $dest
|
||||
if ($actual -ne $BinarySha) {
|
||||
Remove-Item -LiteralPath $dest -Force -ErrorAction SilentlyContinue
|
||||
throw "$dest changed after it was verified: got $actual, pinned $BinarySha"
|
||||
}
|
||||
Write-Host "session-manager-plugin-$Triple.exe: session-manager-plugin $PluginVersion (unsigned; signed by the release build)"
|
||||
} finally {
|
||||
Remove-Item -LiteralPath $work -Recurse -Force -ErrorAction SilentlyContinue
|
||||
# PS 5.1's Remove-Item can give up on read-only files and deep trees;
|
||||
# rd /s /q is the fallback.
|
||||
if (Test-Path -LiteralPath $work) { cmd /c rd /s /q "`"$work`"" | Out-Null }
|
||||
if (Test-Path -LiteralPath $work) { Write-Warning "could not remove $work" }
|
||||
}
|
||||
Executable
+233
@@ -0,0 +1,233 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# build-ssm-plugin.sh [target-triple ...] - build AWS's session-manager-plugin
|
||||
# FROM SOURCE and put it where Tauri's `bundle.externalBin` expects it:
|
||||
#
|
||||
# app/src-tauri/binaries/session-manager-plugin-<target-triple>[.exe]
|
||||
#
|
||||
# The app runs the plugin to connect to workspaces on AWS; bundling it means
|
||||
# users do not have to install it. We build it ourselves from AWS's Apache-2.0
|
||||
# source (github.com/aws/session-manager-plugin) rather than redistributing
|
||||
# AWS's prebuilt binaries, which AWS ships as "AWS Content" under the AWS
|
||||
# Customer Agreement.
|
||||
#
|
||||
# With no argument the host's triple is used (`rustc -vV`). Every target is a
|
||||
# pure-Go cross-compile (CGO_ENABLED=0), so any host can build any of them; CI
|
||||
# builds each platform's own targets in its own job. scripts/build-ssm-plugin.ps1
|
||||
# is the same build for the Windows runner, which has no bash.
|
||||
#
|
||||
# Supported triples:
|
||||
# x86_64-unknown-linux-gnu linux/amd64
|
||||
# aarch64-unknown-linux-gnu linux/arm64
|
||||
# x86_64-apple-darwin darwin/amd64
|
||||
# aarch64-apple-darwin darwin/arm64
|
||||
# universal-apple-darwin both darwin slices plus the two thin files,
|
||||
# joined with lipo (`tauri build --target
|
||||
# universal-apple-darwin` compiles each arch and
|
||||
# tauri-build wants each arch's sidecar; the
|
||||
# bundler then wants the universal one)
|
||||
# x86_64-pc-windows-msvc windows/amd64 (for local cross-builds; CI uses
|
||||
# the .ps1)
|
||||
#
|
||||
# Trust and reproducibility - the build fails on any miss:
|
||||
# 1. The source is AWS's tag 1.2.896.0, pinned by COMMIT, downloaded as
|
||||
# GitHub's archive of that commit and checked against a pinned SHA-256
|
||||
# BEFORE extraction (the SHA-256 is the check; the archive's top
|
||||
# directory, which names the commit, must also be there). Only what the
|
||||
# build reads is extracted: the vendored SDK's Java `codegen/` tree and its
|
||||
# test `snapshot/` files are skipped, which also keeps every path under
|
||||
# Windows' MAX_PATH (the .ps1 extracts the same way, so both build the
|
||||
# same tree).
|
||||
# 2. The Go toolchain is a pinned release from go.dev, checked against the
|
||||
# SHA-256 go.dev publishes (https://go.dev/dl/?mode=json), before use.
|
||||
# 3. The build is AWS's own (its makefile: GOPATH mode over the vendored
|
||||
# dependencies, `-ldflags "-s -w"`, package sessionmanagerplugin-main),
|
||||
# with VERSION set to the tag so `--version` prints 1.2.896.0 (AWS's
|
||||
# release pipeline stamps it; the repo's VERSION file says 1.3.0.0), plus
|
||||
# what makes it reproducible: -trimpath, no VCS stamping, an empty build
|
||||
# id, CGO off, explicit GOAMD64/GOARM64, no inherited GOFLAGS.
|
||||
# 4. The output must equal a PINNED SHA-256 per target. Go builds are
|
||||
# bit-for-bit reproducible across hosts, so every CI runner must produce
|
||||
# exactly the binary recorded here; a mismatch means the source, the
|
||||
# toolchain or the build changed.
|
||||
#
|
||||
# To bump the plugin or Go: change the pins in this script and in
|
||||
# build-ssm-plugin.ps1, rebuild every target, record the new output hashes
|
||||
# (both scripts), and update the version/commit lines in
|
||||
# app/src-tauri/THIRD_PARTY_NOTICES (checked below) and its dependency licences.
|
||||
#
|
||||
# Idempotent: a destination that already holds the pinned binary is left alone.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
PLUGIN_VERSION="1.2.896.0"
|
||||
PLUGIN_COMMIT="6430675a44032a551be1937fb27a2d3fdfeb27f7"
|
||||
SOURCE_URL="https://codeload.github.com/aws/session-manager-plugin/tar.gz/${PLUGIN_COMMIT}"
|
||||
SOURCE_SHA256="7c95be411ad5f43d14d01460500bfd5a5aa0e28ba94815f8b049af33a2c381b0"
|
||||
|
||||
GO_VERSION="1.26.11"
|
||||
go_pin() { # <goos-goarch of the build host> -> SHA-256 published by go.dev
|
||||
case "$1" in
|
||||
linux-amd64) echo 9849f4e04ee35303714e34fbc3ac8ab44ea3e448a95aa182f91e3b9b79c710ec ;;
|
||||
linux-arm64) echo 6c2f29b458b5add0835f18b776f69c8881a6d88428f1484a6da55755e620757e ;;
|
||||
darwin-amd64) echo 394baae971332f2bc783d6e2004ae57101479bd3b06ed8209a3fe3570d4ce498 ;;
|
||||
darwin-arm64) echo e3a42e67a7a8acf450ebada2b074c7ca863000ca514907b7185b45e8f5cdff57 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# target triple -> GOOS GOARCH SHA-256 of the binary we build
|
||||
target_pin() {
|
||||
case "$1" in
|
||||
x86_64-unknown-linux-gnu) echo "linux amd64 414dafe49a90428cb4271a28ea964ad9242a26cb08a38d9679d808470c3b6b62" ;;
|
||||
aarch64-unknown-linux-gnu) echo "linux arm64 79f00cd41536611e2906a9ea703175ab4f06f9b81107a0357b2304c8bfac61dd" ;;
|
||||
x86_64-apple-darwin) echo "darwin amd64 fc61cd7e30bef3524a3681dc6b1a0f472506d9c98bccf62a67865067c9f2f059" ;;
|
||||
aarch64-apple-darwin) echo "darwin arm64 9f3857f85cbcdc88e3ca686f84ac2a794e19e1778ad47ac3294c39e700de08f8" ;;
|
||||
x86_64-pc-windows-msvc) echo "windows amd64 6d428e5fd77e76d9713f0c42b8ec39f2de1031e5f3c567feb73c7fe11b14b226" ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
dest_dir="$repo_root/app/src-tauri/binaries"
|
||||
notices="$repo_root/app/src-tauri/THIRD_PARTY_NOTICES"
|
||||
|
||||
die() { echo "build-ssm-plugin: $*" >&2; exit 1; }
|
||||
|
||||
sha256() {
|
||||
if command -v sha256sum >/dev/null 2>&1; then
|
||||
sha256sum "$1" | cut -d' ' -f1
|
||||
else
|
||||
shasum -a 256 "$1" | cut -d' ' -f1
|
||||
fi
|
||||
}
|
||||
|
||||
# The notices name the version and commit they describe; a bump updates both.
|
||||
grep -qF "Version: ${PLUGIN_VERSION}" "$notices" && grep -qF "Commit: ${PLUGIN_COMMIT}" "$notices" \
|
||||
|| die "$notices does not name plugin ${PLUGIN_VERSION} at ${PLUGIN_COMMIT} - update it with the bump"
|
||||
|
||||
work="$(mktemp -d)"
|
||||
trap 'rm -rf "$work"' EXIT
|
||||
prepared=false
|
||||
|
||||
download() { # <url> <out>
|
||||
curl -fsSL --proto '=https' --tlsv1.2 --retry 3 --retry-delay 5 -o "$2" "$1" \
|
||||
|| die "download failed: $1"
|
||||
}
|
||||
|
||||
# Toolchain and source, once per run, both verified before they are unpacked.
|
||||
prepare() {
|
||||
[ "$prepared" = true ] && return 0
|
||||
|
||||
local host_os host_arch go_sha go_tgz
|
||||
case "$(uname -s)" in Linux) host_os=linux ;; Darwin) host_os=darwin ;; *) die "unsupported build host $(uname -s)" ;; esac
|
||||
case "$(uname -m)" in x86_64|amd64) host_arch=amd64 ;; arm64|aarch64) host_arch=arm64 ;; *) die "unsupported build host arch $(uname -m)" ;; esac
|
||||
go_sha="$(go_pin "$host_os-$host_arch")" || die "no pinned Go for $host_os-$host_arch"
|
||||
go_tgz="$work/go.tar.gz"
|
||||
echo "Downloading Go ${GO_VERSION} (${host_os}-${host_arch})"
|
||||
download "https://go.dev/dl/go${GO_VERSION}.${host_os}-${host_arch}.tar.gz" "$go_tgz"
|
||||
[ "$(sha256 "$go_tgz")" = "$go_sha" ] \
|
||||
|| die "SHA-256 mismatch for the Go toolchain: got $(sha256 "$go_tgz"), pinned $go_sha"
|
||||
mkdir -p "$work/toolchain"
|
||||
tar -xzf "$go_tgz" -C "$work/toolchain"
|
||||
GO="$work/toolchain/go/bin/go"
|
||||
|
||||
local src_tgz="$work/source.tar.gz"
|
||||
echo "Downloading session-manager-plugin ${PLUGIN_VERSION} source (${PLUGIN_COMMIT})"
|
||||
download "$SOURCE_URL" "$src_tgz"
|
||||
[ "$(sha256 "$src_tgz")" = "$SOURCE_SHA256" ] \
|
||||
|| die "SHA-256 mismatch for the plugin source: got $(sha256 "$src_tgz"), pinned $SOURCE_SHA256"
|
||||
mkdir -p "$work/src"
|
||||
tar --exclude='*/codegen/*' --exclude='*/snapshot/*' -xzf "$src_tgz" -C "$work/src"
|
||||
GO_SPACE="$work/src/session-manager-plugin-${PLUGIN_COMMIT}"
|
||||
[ -d "$GO_SPACE/src/sessionmanagerplugin-main" ] || die "the source archive is not the pinned commit's tree"
|
||||
|
||||
# makefile `pre-build`: stamp the version with AWS's own generator.
|
||||
printf '%s' "$PLUGIN_VERSION" >"$GO_SPACE/VERSION"
|
||||
( cd "$GO_SPACE" && go_env "$(go_host_os)" "$(go_host_arch)" "$GO" run ./src/version/versiongenerator/version-gen.go >/dev/null )
|
||||
grep -qF "const Version = \"${PLUGIN_VERSION}\"" "$GO_SPACE/src/version/version.go" \
|
||||
|| die "the version stamp did not take"
|
||||
|
||||
# makefile `copy-src`: the code builds in GOPATH mode, from a copy at its
|
||||
# import path, with the vendored dependencies as a second GOPATH entry.
|
||||
GOPATH_DIR="$work/gopath"
|
||||
mkdir -p "$GOPATH_DIR/src/github.com/aws/session-manager-plugin"
|
||||
cp -R "$GO_SPACE/src" "$GOPATH_DIR/src/github.com/aws/session-manager-plugin/"
|
||||
prepared=true
|
||||
}
|
||||
|
||||
go_host_os() { "$GO" env GOHOSTOS; }
|
||||
go_host_arch() { "$GO" env GOHOSTARCH; }
|
||||
|
||||
# Run with a clean, fully specified Go environment (nothing inherited).
|
||||
go_env() { # <goos> <goarch> <cmd...>
|
||||
local goos="$1" goarch="$2"; shift 2
|
||||
env -u GOFLAGS -u GOROOT -u GOBIN -u GOEXPERIMENT \
|
||||
GOENV=off GOTOOLCHAIN=local GO111MODULE=off GOPROXY=off GOWORK=off \
|
||||
GOPATH="${GOPATH_DIR:-$work/gopath}:${GO_SPACE}/vendor" \
|
||||
GOCACHE="$work/cache" GOMODCACHE="$work/modcache" GOTMPDIR= \
|
||||
CGO_ENABLED=0 GOOS="$goos" GOARCH="$goarch" GOAMD64=v1 GOARM64=v8.0 \
|
||||
"$@"
|
||||
}
|
||||
|
||||
build_thin() { # <triple> <out>
|
||||
local triple="$1" out="$2" pin goos goarch want
|
||||
pin="$(target_pin "$triple")" || die "unsupported target $triple"
|
||||
read -r goos goarch want <<<"$pin"
|
||||
|
||||
if [ -f "$out" ] && [ "$(sha256 "$out")" = "$want" ]; then
|
||||
echo "$(basename "$out"): already the pinned ${PLUGIN_VERSION} build"
|
||||
return 0
|
||||
fi
|
||||
prepare
|
||||
echo "Building session-manager-plugin ${PLUGIN_VERSION} for ${goos}/${goarch}"
|
||||
( cd "$GOPATH_DIR/src/github.com/aws/session-manager-plugin" && \
|
||||
go_env "$goos" "$goarch" "$GO" build -trimpath -buildvcs=false \
|
||||
-ldflags "-s -w -buildid=" -o "$work/out-$triple" \
|
||||
github.com/aws/session-manager-plugin/src/sessionmanagerplugin-main )
|
||||
local got
|
||||
got="$(sha256 "$work/out-$triple")"
|
||||
[ "$got" = "$want" ] || die "the ${goos}/${goarch} build is not the pinned binary: got $got, pinned $want (source, toolchain or build flags changed)"
|
||||
mkdir -p "$(dirname "$out")"
|
||||
chmod 0755 "$work/out-$triple"
|
||||
mv -f "$work/out-$triple" "$out"
|
||||
echo "$(basename "$out"): session-manager-plugin ${PLUGIN_VERSION}"
|
||||
}
|
||||
|
||||
build_universal() {
|
||||
local lipo
|
||||
lipo="$(command -v lipo || command -v llvm-lipo || true)"
|
||||
[ -n "$lipo" ] || die "universal-apple-darwin needs lipo (Xcode command line tools) or llvm-lipo"
|
||||
local x86="$dest_dir/session-manager-plugin-x86_64-apple-darwin"
|
||||
local arm="$dest_dir/session-manager-plugin-aarch64-apple-darwin"
|
||||
local uni="$dest_dir/session-manager-plugin-universal-apple-darwin"
|
||||
build_thin x86_64-apple-darwin "$x86"
|
||||
build_thin aarch64-apple-darwin "$arm"
|
||||
"$lipo" -create "$x86" "$arm" -output "$work/universal"
|
||||
# Each slice must come back out byte-identical to its pinned thin binary.
|
||||
local pair arch triple
|
||||
for pair in x86_64:x86_64-apple-darwin arm64:aarch64-apple-darwin; do
|
||||
arch="${pair%%:*}" triple="${pair#*:}"
|
||||
"$lipo" "$work/universal" -thin "$arch" -output "$work/slice-$arch"
|
||||
[ "$(sha256 "$work/slice-$arch")" = "$(target_pin "$triple" | cut -d' ' -f3)" ] \
|
||||
|| die "the $arch slice of the universal binary is not the pinned binary"
|
||||
done
|
||||
chmod 0755 "$work/universal"
|
||||
mv -f "$work/universal" "$uni"
|
||||
echo "$(basename "$uni"): session-manager-plugin ${PLUGIN_VERSION} (x86_64 + arm64)"
|
||||
}
|
||||
|
||||
targets=("$@")
|
||||
if [ ${#targets[@]} -eq 0 ]; then
|
||||
host="$(rustc -vV 2>/dev/null | sed -n 's/^host: //p')"
|
||||
[ -n "$host" ] || die "no target given and rustc is not available to name the host's"
|
||||
targets=("$host")
|
||||
fi
|
||||
|
||||
for t in "${targets[@]}"; do
|
||||
case "$t" in
|
||||
universal-apple-darwin) build_universal ;;
|
||||
*-windows-*) build_thin "$t" "$dest_dir/session-manager-plugin-$t.exe" ;;
|
||||
*) build_thin "$t" "$dest_dir/session-manager-plugin-$t" ;;
|
||||
esac
|
||||
done
|
||||
@@ -317,6 +317,22 @@ if [ "$pw_removed" = true ]; then
|
||||
fi
|
||||
[ -x "$out/usr/bin/triple-c" ] || fail "no executable usr/bin/triple-c."
|
||||
|
||||
# The bundled AWS Session Manager plugin (bundle.externalBin, built from
|
||||
# source by build-ssm-plugin.sh) is what AWS workspaces connect through. Tauri copies it
|
||||
# beside the app binary with the target triple stripped, which is where
|
||||
# `host::ssm::find_plugin` looks. It must be the real plugin: an ELF, not the
|
||||
# placeholder a debug build writes (build.rs refuses that for release, and this
|
||||
# is the check on what actually shipped).
|
||||
plugin="$out/usr/bin/session-manager-plugin"
|
||||
[ -x "$plugin" ] || fail "no executable usr/bin/session-manager-plugin (the bundled AWS plugin)."
|
||||
[ "$(head -c 4 "$plugin" | od -An -c | tr -d ' ')" = "177ELF" ] \
|
||||
|| fail "usr/bin/session-manager-plugin is not an ELF binary (a placeholder?)."
|
||||
"$plugin" --version >/dev/null 2>&1 \
|
||||
|| fail "usr/bin/session-manager-plugin does not run (--version)."
|
||||
# Its license and notices travel with it (bundle.resources).
|
||||
notices=("$out"/usr/lib/*/THIRD_PARTY_NOTICES)
|
||||
[ -f "${notices[0]}" ] || fail "THIRD_PARTY_NOTICES is not in the image."
|
||||
|
||||
# Every file readable by all, every program executable by all — what the
|
||||
# `chmod -R a+rX` before the repack promised (AppRun.wrapped used to ship 0770).
|
||||
# Files only: the AppImage runtime's --appimage-extract creates every
|
||||
|
||||
@@ -10,9 +10,10 @@
|
||||
# extension DLLs candle/light load, the NSIS plugins makensis embeds - and
|
||||
# each signature is metered (about 1000 a month), so those are skipped. The
|
||||
# allowlist below is the whole of what reaches users: the app binary, the MSI,
|
||||
# the NSIS installer, and the uninstaller makensis writes to the job's temp
|
||||
# directory. A file that already carries a valid signature is skipped too:
|
||||
# Tauri presents the app binary once per bundle type.
|
||||
# the NSIS installer, the uninstaller makensis writes to the job's temp
|
||||
# directory, and the session-manager-plugin sidecar we build from source. A
|
||||
# file that already carries a valid signature is skipped too: Tauri presents
|
||||
# the app binary once per bundle type.
|
||||
#
|
||||
# This may run as 32-bit PowerShell: the NSIS uninstaller is signed from inside
|
||||
# makensis, which is 32-bit and resolves `powershell` to the SysWOW64 copy. So
|
||||
@@ -46,7 +47,12 @@ try {
|
||||
$full = (Resolve-Path -LiteralPath $Path).ProviderPath
|
||||
Write-Log "== $full"
|
||||
|
||||
$ships = ($full -match '\\target\\release\\[^\\]+\.exe$') -or
|
||||
# The bundled session-manager-plugin sidecar (bundle.externalBin), which we
|
||||
# build from AWS's source (scripts/build-ssm-plugin.ps1) and so ship unsigned
|
||||
# unless signed here. Tauri presents a sidecar to the sign command, in place
|
||||
# under app\src-tauri\binaries, only when `signtool verify /pa` rejects it.
|
||||
$ships = ($full -match '\\src-tauri\\binaries\\session-manager-plugin-x86_64-pc-windows-msvc\.exe$') -or
|
||||
($full -match '\\target\\release\\[^\\]+\.exe$') -or
|
||||
($full -match '\\target\\release\\bundle\\(msi|nsis)\\[^\\]+\.(msi|exe)$') -or
|
||||
$full.StartsWith($env:TRIPLE_C_SIGN_TMP.TrimEnd('\') + '\', [StringComparison]::OrdinalIgnoreCase)
|
||||
if (-not $ships) {
|
||||
|
||||
@@ -14,6 +14,10 @@
|
||||
# unpacked with an administrative install and its binaries checked directly;
|
||||
# the NSIS installer cannot be unpacked that way, so for it the signing log
|
||||
# must show the app binary and the uninstaller were signed.
|
||||
#
|
||||
# The bundled session-manager-plugin (built from source, signed by us) is
|
||||
# checked too: present in the MSI, and in both installers validly signed,
|
||||
# timestamped, and by the same signing identity as the installer itself.
|
||||
|
||||
param([Parameter(Mandatory = $true, ValueFromRemainingArguments = $true)][string[]]$Patterns)
|
||||
|
||||
@@ -47,6 +51,24 @@ function Test-Signature([IO.FileInfo]$File, [string]$Label) {
|
||||
return $false
|
||||
}
|
||||
|
||||
# The session-manager-plugin sidecar is built from AWS's source
|
||||
# (build-ssm-plugin.ps1), so it is unsigned until windows-sign.ps1 signs it. It
|
||||
# must carry OUR signature: valid, timestamped, and from the same signing
|
||||
# identity (subject and issuer) as the installer that ships it.
|
||||
$sidecarName = 'session-manager-plugin.exe'
|
||||
$sidecarSource = Join-Path (Split-Path -Parent $PSScriptRoot) 'app\src-tauri\binaries\session-manager-plugin-x86_64-pc-windows-msvc.exe'
|
||||
function Test-OurSigner([IO.FileInfo]$File, [string]$Label, [IO.FileInfo]$Installer) {
|
||||
if (-not (Test-Signature $File $Label)) { return $false }
|
||||
$ours = (Get-AuthenticodeSignature -FilePath $Installer.FullName).SignerCertificate
|
||||
$theirs = (Get-AuthenticodeSignature -FilePath $File.FullName).SignerCertificate
|
||||
# Subject + Issuer, not the thumbprint: Azure Artifact Signing issues a
|
||||
# fresh short-lived certificate (daily), so the plugin and the installer
|
||||
# can legitimately carry different thumbprints within one build.
|
||||
if ($ours -and $theirs -and $ours.Subject -eq $theirs.Subject -and $ours.Issuer -eq $theirs.Issuer) { return $true }
|
||||
Write-Host "FAIL $Label - signed by '$($theirs.Subject)' (issuer '$($theirs.Issuer)'), not the identity that signed $($Installer.Name)"
|
||||
return $false
|
||||
}
|
||||
|
||||
function Get-SignedLog {
|
||||
if ($env:TRIPLE_C_SIGN_LOG -and (Test-Path $env:TRIPLE_C_SIGN_LOG)) { return @(Get-Content $env:TRIPLE_C_SIGN_LOG) }
|
||||
return @()
|
||||
@@ -56,7 +78,7 @@ $failed = @()
|
||||
$nsisBuilt = $false
|
||||
foreach ($file in $files) {
|
||||
if (-not (Test-Signature $file $file.Name)) { $failed += $file.Name }
|
||||
if ($file.FullName -match '\\bundle\\nsis\\') { $nsisBuilt = $true }
|
||||
if ($file.FullName -match '\\bundle\\nsis\\') { $nsisBuilt = $true; $nsisInstaller = $file }
|
||||
|
||||
if ($file.Extension -eq '.msi') {
|
||||
$extract = Join-Path ([IO.Path]::GetTempPath()) ('msi-verify-' + [guid]::NewGuid().ToString('N'))
|
||||
@@ -74,6 +96,21 @@ foreach ($file in $files) {
|
||||
foreach ($f in $inner) {
|
||||
if (-not (Test-Signature $f "$($file.Name) > $($f.Name)")) { $failed += "$($file.Name) > $($f.Name)" }
|
||||
}
|
||||
# Its licence notices travel with it (bundle.resources).
|
||||
if ($proc.ExitCode -eq 0 -and -not @(Get-ChildItem -Path $extract -Recurse -File -Filter 'THIRD_PARTY_NOTICES').Count) {
|
||||
Write-Host "FAIL $($file.Name) - carries no THIRD_PARTY_NOTICES"
|
||||
$failed += "$($file.Name) > THIRD_PARTY_NOTICES (missing)"
|
||||
}
|
||||
# The bundled plugin must be in there, under our signature.
|
||||
if ($proc.ExitCode -eq 0) {
|
||||
$plugin = @($inner | Where-Object { $_.Name -eq $sidecarName })
|
||||
if ($plugin.Count -ne 1) {
|
||||
Write-Host "FAIL $($file.Name) - carries $($plugin.Count) $sidecarName, expected 1"
|
||||
$failed += "$($file.Name) > $sidecarName (missing)"
|
||||
} elseif (-not (Test-OurSigner $plugin[0] "$($file.Name) > $sidecarName" $file)) {
|
||||
$failed += "$($file.Name) > $sidecarName (signer)"
|
||||
}
|
||||
}
|
||||
Remove-Item -Recurse -Force $extract -ErrorAction SilentlyContinue
|
||||
}
|
||||
}
|
||||
@@ -92,6 +129,18 @@ if ($nsisBuilt) {
|
||||
} else {
|
||||
Write-Host "OK app binary - signed before packaging ($($appSigned.Count)x)"
|
||||
}
|
||||
# makensis packs the sidecar straight from app\src-tauri\binaries, where
|
||||
# Tauri had it signed in place before any bundle: so that file, and a
|
||||
# logged signature for it, are what NSIS shipped.
|
||||
if (-not (Test-Path -LiteralPath $sidecarSource)) {
|
||||
Write-Host "FAIL $sidecarName - $sidecarSource is missing"
|
||||
$failed += "NSIS > $sidecarName (missing)"
|
||||
} elseif (-not (Test-OurSigner (Get-Item -LiteralPath $sidecarSource) "NSIS > $sidecarName (as packed)" $nsisInstaller)) {
|
||||
$failed += "NSIS > $sidecarName (signer)"
|
||||
} elseif (-not @($log | Where-Object { $_ -match '\\src-tauri\\binaries\\session-manager-plugin-x86_64-pc-windows-msvc\.exe$' }).Count) {
|
||||
Write-Host "FAIL $sidecarName - no signature was logged for it"
|
||||
$failed += "NSIS > $sidecarName (not logged)"
|
||||
}
|
||||
$tmp = $env:TRIPLE_C_SIGN_TMP
|
||||
$uninstaller = @()
|
||||
if ($tmp) { $uninstaller = @($log | Where-Object { $_.StartsWith($tmp, [StringComparison]::OrdinalIgnoreCase) }) }
|
||||
|
||||
Reference in new issue
Block a user