mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-10-01 23:13:15 +00:00
a33aaec495
* fix: enforce a replay window on Linear webhooks (AUTHZ-001) verify_linear_signature accepted any correctly-signed body with no freshness check, so a captured request could be replayed indefinitely. Parse the signed webhookTimestamp (Unix ms) and reject requests outside a 60s window, failing closed when the field is missing or malformed — mirroring the Slack verifier. * fix: stop leaking upstream auth-error bodies into user comments get_github_token_for_user folded the raw upstream response text into the error string that becomes a Slack/Linear comment (AUTH-RESP-LEAK-01). Log the full body server-side only and return a generic "GitHub auth failed (status <code>)". Also document the accepted shared-installation-token blast radius on the bot-token-only path (AUTHZ-003). * fix: bind sandbox and token caches to repo to prevent thread-id collision A PR head-branch name is attacker-controllable and get_thread_id_from_branch derives a thread_id from its first UUID with no repo binding (TID-COLLIDE-01). The in-memory sandbox cache and the per-thread GitHub-token cache were keyed on thread_id alone, and a cached sandbox was reused after only an echo-ping, so a different repo's webhook could bind to another thread's sandbox or token. Without changing the persistent thread-id scheme: - Persist the bound repo (owner/name) in thread metadata on sandbox creation and refuse to reuse a sandbox whose bound repo does not match the current event (SandboxRepoMismatchError); the in-memory proxy also carries the binding. - Bind the GitHub-token cache entries to their repo and evict on a cross-repo read so a colliding thread_id cannot be served another repo's token. - Thread repo through the reviewer and the webhook token resolvers. * fix: scope s3:ListBucket to the releases/ prefix (F-1/IAC-04) The instance role and the GitHub deploy app role granted s3:ListBucket on the whole assets bucket. Every caller (deploy.sh, the publish/rollback scripts) only ever lists under releases/, so add a StringLike s3:prefix=releases/* condition. GetBucketLocation has no s3:prefix in its request context, so it moves to its own unconditioned statement. Also document the accepted F-2 cross-env existence-oracle residual on BatchGetSecretValue. * chore: suppress test-fixture credential false positive; document AUTHZ-002 Add a machine-level suppression for the fake Datadog key in the test_team_credentials encryption-roundtrip fixture (CWE-798, not a real credential). Clarify that the within-org thread-write path is intentional by design (AUTHZ-002) — comment only, no behavior change. * fix: casefold repo-binding keys to avoid spurious cross-repo mismatch GitHub owner/name are case-insensitive. Casefold the owner/name key on both the write (binding) and read (compare) sides — repo_cache_key and the metadata bound_repo read — so Org/Repo and org/repo resolve to one repo and a legitimate same-repo run cannot raise a spurious SandboxRepoMismatchError (Gap 2). * fix: stop leaking upstream auth body in unexpected-result branch The 2xx-but-missing-token/url branch echoed the parsed upstream response body into the user-facing error. Return a generic message and log response_data server-side only, mirroring the existing HTTPStatusError fix (Gap 4). * fix: fail closed for unbound-legacy sandboxes and catch repo mismatch Gap 1: a thread with a persisted sandbox_id but no in-memory cache and no recorded bound_repo (a pre-binding legacy thread, post-deploy) previously reconnected-and-served the sandbox to the current repo, then rebound it. Now fail closed: drop the stale id and recreate a fresh sandbox bound to this repo, logging a reconnect-with-missing-binding event. A sandbox is never served to a repo unless its binding is known and matches; new threads bind on first run unchanged. Gap 3: catch SandboxRepoMismatchError at the agent and reviewer run entrypoints, log it for alarming, and surface a clean sanitized error instead of letting an opaque deep-stack exception crash-loop the worker. * chore: suppress test-fixture credential false positive in token-TTL tests Add a machine-level suppression for the fake "ghp_secret" GitHub token used by the cached-token TTL/revocation unit tests (CWE-798). Not a real credential and not a valid PAT; scoped to the unit test only.
71 lines
2.3 KiB
TypeScript
71 lines
2.3 KiB
TypeScript
import * as cdk from "aws-cdk-lib";
|
|
import { Match, Template } from "aws-cdk-lib/assertions";
|
|
import { OpenSweIamStack } from "../lib/open-swe-iam-stack";
|
|
import { OpenSweStack } from "../lib/open-swe-stack";
|
|
|
|
const ENV = { account: "328440206208", region: "us-east-1" };
|
|
|
|
// F-1 / IAC-04: s3:ListBucket must be constrained to the releases/ prefix so a
|
|
// compromised box / leaked CI token cannot enumerate the rest of the bucket.
|
|
const RELEASES_PREFIX_CONDITION = { StringLike: { "s3:prefix": ["releases/*"] } };
|
|
|
|
describe("S3 ListBucket prefix scoping (F-1/IAC-04)", () => {
|
|
it("instance role ListBucket is constrained to releases/*", () => {
|
|
const app = new cdk.App();
|
|
const stack = new OpenSweStack(app, "OpenSweDevStack", {
|
|
stackName: "open-swe-dev",
|
|
env: ENV,
|
|
envName: "dev",
|
|
});
|
|
Template.fromStack(stack).hasResourceProperties("AWS::IAM::Policy", {
|
|
PolicyDocument: Match.objectLike({
|
|
Statement: Match.arrayWith([
|
|
Match.objectLike({
|
|
Sid: "ListArtifactBucket",
|
|
Action: "s3:ListBucket",
|
|
Condition: RELEASES_PREFIX_CONDITION,
|
|
}),
|
|
]),
|
|
}),
|
|
});
|
|
});
|
|
|
|
it("github deploy app role ListBucket is constrained to releases/*", () => {
|
|
const app = new cdk.App();
|
|
const stack = new OpenSweIamStack(app, "OpenSweIamStack", {
|
|
stackName: "open-swe-iam",
|
|
env: ENV,
|
|
});
|
|
Template.fromStack(stack).hasResourceProperties("AWS::IAM::Policy", {
|
|
PolicyDocument: Match.objectLike({
|
|
Statement: Match.arrayWith([
|
|
Match.objectLike({
|
|
Sid: "ListArtifactBucket",
|
|
Action: "s3:ListBucket",
|
|
Condition: RELEASES_PREFIX_CONDITION,
|
|
}),
|
|
]),
|
|
}),
|
|
});
|
|
});
|
|
|
|
it("GetBucketLocation stays a separate, unconditioned statement", () => {
|
|
const app = new cdk.App();
|
|
const stack = new OpenSweStack(app, "OpenSweDevStack", {
|
|
stackName: "open-swe-dev",
|
|
env: ENV,
|
|
envName: "dev",
|
|
});
|
|
Template.fromStack(stack).hasResourceProperties("AWS::IAM::Policy", {
|
|
PolicyDocument: Match.objectLike({
|
|
Statement: Match.arrayWith([
|
|
Match.objectLike({
|
|
Sid: "GetArtifactBucketLocation",
|
|
Action: "s3:GetBucketLocation",
|
|
Condition: Match.absent(),
|
|
}),
|
|
]),
|
|
}),
|
|
});
|
|
});
|
|
});
|