778e775c35
## Thinking Path > - Paperclip orchestrates AI-agent companies and needs secrets handling to work across local development, hosted operators, and governed agent execution. > - The affected subsystem is the company-scoped secrets control plane: database schema, server services/routes, CLI workflows, and the Secrets settings UI. > - The gap was that secrets were local-only and operators could not manage provider vaults or import existing remote references without exposing plaintext. > - This branch adds provider vault configuration plus an AWS Secrets Manager remote-import path while preserving company boundaries, binding context, and audit trails. > - I kept the PR to a single branch PR, removed unrelated lockfile/package drift, rebased the full branch onto the current `public-gh/master`, and addressed fresh Greptile findings. > - The benefit is a reviewable implementation of provider-backed secrets with focused tests covering provider selection, import conflicts, deleted secret reuse, rotation guards, and AWS signing behavior. ## What Changed - Added provider vault support for company secrets, including provider config storage, default vault handling, health checks, binding usage, access events, and remote import preview/commit. - Added an AWS Secrets Manager provider using SigV4 request signing, bounded request timeouts, namespace guardrails, cached runtime credential resolution, and external-reference linking without plaintext reads. - Added Secrets UI surfaces for vault management and remote import, plus CLI/API documentation for setup and operations. - Stabilized routine webhook secret binding paths and SSH environment-driver fixture bindings discovered during verification. - Addressed Greptile and CI findings: no lockfile/package drift, monotonic migration metadata, disabled-vault default races, soft-deleted secret hiding/recreate behavior, remove behavior with disabled vaults, soft-deleted external-reference re-import, non-active rotation guards, managed-secret soft deletion through PATCH, and per-call AWS SDK credential client churn. - Rebased this branch onto `public-gh/master` at `0e1a5828` and force-pushed with lease to keep this as the single PR for the branch. ## Verification - `git fetch public-gh master` - `git rebase public-gh/master` - `git diff --name-only public-gh/master...HEAD | grep '^pnpm-lock\.yaml$' || true` confirmed `pnpm-lock.yaml` is not in the PR diff. - Confirmed migration ordering: master ends at `0081_optimal_dormammu`; this PR adds `0082_dry_vision` and `0083_company_secret_provider_configs`. - Inspected migrations for repeat safety: new tables/indexes use `IF NOT EXISTS`; foreign keys are guarded by `DO $$ ... IF NOT EXISTS`; column additions use `ADD COLUMN IF NOT EXISTS`. - `pnpm -r typecheck` passed before the Greptile follow-up commits. - `pnpm test:run` ran the full stable Vitest path before the Greptile follow-up commits; it completed with 3 timing-related failures under parallel load: `codex-local-execute.test.ts`, `cursor-local-execute.test.ts`, and `environment-service.test.ts`. - `pnpm --filter @paperclipai/server exec vitest run src/__tests__/codex-local-execute.test.ts src/__tests__/cursor-local-execute.test.ts src/__tests__/environment-service.test.ts` passed on targeted rerun (`24/24`). - `pnpm build` passed before the Greptile follow-up commits. Vite reported existing chunk-size/dynamic-import warnings. - After Greptile follow-up commits: `pnpm --filter @paperclipai/server exec vitest run src/__tests__/secrets-service.test.ts` passed (`26/26`). - After Greptile follow-up commits: `pnpm --filter @paperclipai/server exec vitest run src/__tests__/aws-secrets-manager-provider.test.ts src/__tests__/secrets-service.test.ts` passed (`39/39`). - After Greptile follow-up commits: `pnpm --filter @paperclipai/server typecheck` passed. - Captured Storybook screenshots from `ui/storybook-static` for visual review. - Latest PR checks on `5ca3a5cf`: `policy`, serialized server suites 1/4-4/4, `Canary Dry Run`, `e2e`, `security/snyk`, and `Greptile Review` pass; aggregate `verify` is still registering the completed child checks. - Greptile review loop continued through the latest requested pass; all Greptile review threads are resolved and the latest `Greptile Review` check on `5ca3a5cf` passed with 0 comments added. ## Screenshots Before: the provider-vault and remote-import surfaces did not exist on `master`; these are after-state screenshots from the Storybook fixtures.    ## Risks - Migration risk: this adds new secret provider tables and extends existing secret rows. The migrations were checked for monotonic ordering and idempotent guards, but reviewers should still inspect upgrade behavior carefully. - Provider risk: AWS support uses direct SigV4 requests. Automated tests cover signing, request timeouts, vault-config selection, namespace guardrails, pending-version archival, sanitized provider errors, and service-level cleanup paths. A real-vault AWS smoke test remains deployment validation for an operator with AWS credentials rather than an unverified merge blocker in this local branch. - UI risk: the Secrets page and import dialog are large new surfaces; screenshots are included above for reviewer inspection. - Verification risk: the full local stable test command hit parallel-load timing failures, although the exact failed files passed when rerun directly. - Operational risk: remote import intentionally avoids plaintext reads; operators must understand that imported external references resolve at runtime and may fail if AWS permissions change. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex, GPT-5 coding agent with local shell/tool use in the Paperclip worktree. Exact context-window size was not exposed by the runtime. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [ ] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
185 lines
5.9 KiB
TypeScript
185 lines
5.9 KiB
TypeScript
import { readFile } from "node:fs/promises";
|
|
import path from "node:path";
|
|
import { afterAll, describe, expect, it } from "vitest";
|
|
import {
|
|
buildSshEnvLabFixtureConfig,
|
|
ensureSshWorkspaceReady,
|
|
readSshEnvLabFixtureStatus,
|
|
runSshCommand,
|
|
startSshEnvLabFixture,
|
|
stopSshEnvLabFixture,
|
|
type SshConnectionConfig,
|
|
} from "@paperclipai/adapter-utils/ssh";
|
|
|
|
async function readOptionalSecret(
|
|
value: string | undefined,
|
|
filePath: string | undefined,
|
|
): Promise<string | null> {
|
|
if (value && value.trim().length > 0) {
|
|
return value;
|
|
}
|
|
if (filePath && filePath.trim().length > 0) {
|
|
return await readFile(filePath, "utf8");
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Resolve the env-lab state path for this instance. Falls back to a temp
|
|
* directory scoped to the test run so parallel runs don't collide.
|
|
*/
|
|
function resolveEnvLabStatePath(): string {
|
|
const instanceRoot =
|
|
process.env.PAPERCLIP_INSTANCE_ROOT?.trim() ||
|
|
path.join(process.env.HOME ?? "/tmp", ".paperclip-worktrees", "instances", "live-ssh-test");
|
|
return path.join(instanceRoot, "env-lab", "ssh-fixture", "state.json");
|
|
}
|
|
|
|
/** Attempt to build config from explicit PAPERCLIP_ENV_LIVE_SSH_* env vars. */
|
|
function tryExplicitConfig(): {
|
|
host: string;
|
|
port: number;
|
|
username: string;
|
|
remoteWorkspacePath: string;
|
|
} | null {
|
|
const host = process.env.PAPERCLIP_ENV_LIVE_SSH_HOST?.trim() ?? "";
|
|
const username = process.env.PAPERCLIP_ENV_LIVE_SSH_USERNAME?.trim() ?? "";
|
|
const remoteWorkspacePath =
|
|
process.env.PAPERCLIP_ENV_LIVE_SSH_REMOTE_WORKSPACE_PATH?.trim() ?? "";
|
|
const port = Number.parseInt(process.env.PAPERCLIP_ENV_LIVE_SSH_PORT ?? "22", 10);
|
|
|
|
if (!host || !username || !remoteWorkspacePath || !Number.isInteger(port) || port < 1 || port > 65535) {
|
|
return null;
|
|
}
|
|
return { host, port, username, remoteWorkspacePath };
|
|
}
|
|
|
|
/** Try to use an already-running env-lab fixture. */
|
|
async function tryEnvLabFixture(): Promise<SshConnectionConfig | null> {
|
|
const statePath = resolveEnvLabStatePath();
|
|
const status = await readSshEnvLabFixtureStatus(statePath);
|
|
if (status.running && status.state) {
|
|
return buildSshEnvLabFixtureConfig(status.state);
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Start a fresh env-lab SSH fixture for this test run. Returns the config
|
|
* and a cleanup function to stop it afterwards.
|
|
*/
|
|
async function startEnvLabForTest(): Promise<{
|
|
config: SshConnectionConfig;
|
|
cleanup: () => Promise<void>;
|
|
} | null> {
|
|
const statePath = resolveEnvLabStatePath();
|
|
try {
|
|
const state = await startSshEnvLabFixture({ statePath });
|
|
const config = await buildSshEnvLabFixtureConfig(state);
|
|
return {
|
|
config,
|
|
cleanup: async () => {
|
|
await stopSshEnvLabFixture(statePath);
|
|
},
|
|
};
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
let envLabCleanup: (() => Promise<void>) | null = null;
|
|
|
|
/**
|
|
* Resolve an SSH connection config from (in order):
|
|
* 1. Explicit PAPERCLIP_ENV_LIVE_SSH_* env vars
|
|
* 2. An already-running env-lab fixture
|
|
* 3. Auto-starting an env-lab fixture
|
|
*/
|
|
async function resolveSshConfig(): Promise<SshConnectionConfig | null> {
|
|
// 1. Explicit env vars
|
|
const explicit = tryExplicitConfig();
|
|
if (explicit) {
|
|
return {
|
|
...explicit,
|
|
privateKey: await readOptionalSecret(
|
|
process.env.PAPERCLIP_ENV_LIVE_SSH_PRIVATE_KEY,
|
|
process.env.PAPERCLIP_ENV_LIVE_SSH_PRIVATE_KEY_PATH,
|
|
),
|
|
knownHosts: await readOptionalSecret(
|
|
process.env.PAPERCLIP_ENV_LIVE_SSH_KNOWN_HOSTS,
|
|
process.env.PAPERCLIP_ENV_LIVE_SSH_KNOWN_HOSTS_PATH,
|
|
),
|
|
strictHostKeyChecking:
|
|
(process.env.PAPERCLIP_ENV_LIVE_SSH_STRICT_HOST_KEY_CHECKING ?? "true").toLowerCase() !== "false",
|
|
};
|
|
}
|
|
|
|
// 2. Already-running env-lab
|
|
const running = await tryEnvLabFixture();
|
|
if (running) return running;
|
|
|
|
// 3. Auto-start env-lab
|
|
if (process.env.PAPERCLIP_ENV_LIVE_SSH_NO_AUTO_FIXTURE !== "true") {
|
|
const started = await startEnvLabForTest();
|
|
if (started) {
|
|
envLabCleanup = started.cleanup;
|
|
return started.config;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
let resolvedConfig: SshConnectionConfig | null | undefined;
|
|
|
|
const describeLiveSsh = (() => {
|
|
// Eagerly check explicit env vars for sync skip decision.
|
|
// If explicit vars are set, use them. Otherwise, we'll attempt env-lab in beforeAll.
|
|
if (tryExplicitConfig()) return describe;
|
|
// If NO_AUTO_FIXTURE is set and no explicit config, skip immediately
|
|
if (process.env.PAPERCLIP_ENV_LIVE_SSH_NO_AUTO_FIXTURE === "true") {
|
|
console.warn(
|
|
"Skipping live SSH smoke test. Set PAPERCLIP_ENV_LIVE_SSH_HOST, PAPERCLIP_ENV_LIVE_SSH_USERNAME, and PAPERCLIP_ENV_LIVE_SSH_REMOTE_WORKSPACE_PATH to enable it, or remove PAPERCLIP_ENV_LIVE_SSH_NO_AUTO_FIXTURE to auto-start env-lab.",
|
|
);
|
|
return describe.skip;
|
|
}
|
|
// Will attempt env-lab — don't skip yet
|
|
return describe;
|
|
})();
|
|
|
|
describeLiveSsh("live SSH environment smoke", () => {
|
|
afterAll(async () => {
|
|
if (envLabCleanup) {
|
|
await envLabCleanup();
|
|
envLabCleanup = null;
|
|
}
|
|
});
|
|
|
|
it("connects to the configured SSH environment and verifies basic runtime tools", async () => {
|
|
if (resolvedConfig === undefined) {
|
|
resolvedConfig = await resolveSshConfig();
|
|
}
|
|
|
|
if (!resolvedConfig) {
|
|
console.warn(
|
|
"Live SSH smoke test could not resolve SSH config from env vars or env-lab fixture. Set PAPERCLIP_ENV_LIVE_SSH_NO_AUTO_FIXTURE=true to mark this suite skipped intentionally.",
|
|
);
|
|
return;
|
|
}
|
|
|
|
const config = resolvedConfig;
|
|
const ready = await ensureSshWorkspaceReady(config);
|
|
const quotedRemoteWorkspacePath = JSON.stringify(config.remoteWorkspacePath);
|
|
const result = await runSshCommand(
|
|
config,
|
|
`cd ${quotedRemoteWorkspacePath} && which git && which tar && pwd`,
|
|
{ timeoutMs: 30000, maxBuffer: 256 * 1024 },
|
|
);
|
|
|
|
expect(ready.remoteCwd).toBe(config.remoteWorkspacePath);
|
|
expect(result.stdout).toContain(config.remoteWorkspacePath);
|
|
expect(result.stdout).toContain("git");
|
|
expect(result.stdout).toContain("tar");
|
|
});
|
|
});
|