mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-10-07 16:19:09 +00:00
Some checks are pending
CI / Lint (push) Waiting to run
CI / Format check (push) Waiting to run
CI / Unit tests (push) Waiting to run
CI / Playwright E2E (push) Waiting to run
CI / Docker build smoke (push) Waiting to run
CI / Triage ledger up to date (push) Waiting to run
CI / ui bun.lock in sync (push) Waiting to run
* feat: port plan-review & workflow-approval UX (#135)
Port six upstream commits onto dev:
- c03a6be7 (already ported): keep plan guidance high-level
- 546042a4: add workflow approval UI with diff preview, approval URLs,
web review links, and polling for approval status during active runs
- 216cf181: remove workflow token elevation; approved pushes pass
through directly without proxy token rewriting
- 3dbc0282: preserve plan redirects after login by accepting relative
same-origin redirect_to values and rejecting blocked paths
- bb104d93: submit plan comments with cmd+enter
- 90cb6caa: terse Slack replies, shared content via save_plan outside
plan mode (PLAN_STATUS_SHARED), reject shared-content mutations
Refs: #135
* fix: restore login page render and clear CI lint/format
The plan-review port removed the authRedirectUrl import from login.tsx
but left its call site, crashing the login page at runtime (blank page,
no 'Sign in to open-swe'). Pass the relative path straight to loginUrl,
matching the plan route and the backend relative-redirect handling.
Also drop an unused os import in the guard test and reformat
workflow_push_guard.py to satisfy ruff.
* fix: carry workflows:write on the standing proxy token
Complete the half-ported upstream 216cf181 cascade. The port dropped
_run_with_workflow_token from the guard but missed the paired github_app
change, so an approved .github/workflows push ran with the base token
(no workflows:write) and GitHub 403'd it.
Add workflows:write to BASE_RUNTIME_PROXY_TOKEN_PERMISSIONS and delete the
now-orphaned WORKFLOW_RUNTIME_PROXY_TOKEN_PERMISSIONS constant; update the
github_app and proxy_auth tests to match. The HITL approval gate in
workflow_push_guard.py is unchanged — this only lets the standing token
push once a human approves.
* fix: restore transient workflow-token elevation (revert standing workflows:write)
The standing GitHub-App proxy token (BASE_RUNTIME_PROXY_TOKEN_PERMISSIONS) is
ALWAYS-ON, so carrying workflows:write on it made the fork's HITL workflow-push
guard the sole control over unapproved workflow pushes. The guard's git-push
parser has gaps (obfuscated-expansion push, `gh api` REST contents PUT,
fully-qualified cross-branch refspecs); with a permanently workflows-scoped
token those gaps become live unapproved-workflow-push exploits (1 critical, 2
high — security review BLOCK on #159).
Restore dev's transient-elevation model:
- Drop workflows:write from BASE_RUNTIME_PROXY_TOKEN_PERMISSIONS; re-add the
WORKFLOW_RUNTIME_PROXY_TOKEN_PERMISSIONS constant (base + workflows:write).
- Re-introduce _run_with_workflow_token in the guard: it mints the
workflows-scoped token via refresh_proxy_token around the approved,
guard-normalized fixed_command, then downscopes to RUNTIME then BASE in a
finally. Route the approval branch through it.
- Restore the dev token/elevation tests.
The standing token no longer carries workflows:write, so the three parser
bypasses hit GitHub 403 again; an approved push still succeeds because the
elevation grants workflows:write only around the normalized command. Keeps all
of #159's diff-preview / approval-URL / Slack-card guard additions.
* fix: reject protocol-relative path from sanitizeAuthRedirect (open redirect)
sanitizeAuthRedirect returned parsed.pathname+search+hash, which `new URL` can
resolve to a protocol-relative `//host` (e.g. input `/..//evil.com` normalizes
same-origin, passing the origin check, but yields a path starting with `//`).
ClientRedirect / login.tsx feed that path to window.location.replace, so it
navigates cross-origin — an open redirect. Reject any resolved path that is not
a single-leading-slash path (`^/[^/]`), falling back to the default. Adds
coverage for `/..//evil.com`, `/.//evil.com`, and `//evil.com`.
* fix: log SECURITY error when workflow-token downscope fails
The elevate->push->downscope finally block was silent on failure. If both
refresh_proxy_token calls fail, the sandbox retains workflows:write for the
rest of the run with no signal. Log a SECURITY error on the partial and full
downscope-failure paths so the retention is observable.
Addresses the GPT-4.1 cross-family review of the token-scope remediation.
---------
Co-authored-by: amoussa1229 <166072409+amoussa1229@users.noreply.github.com>
Co-authored-by: Adam Moussa <adam@seahavenind.com>
125 lines
3.5 KiB
TypeScript
125 lines
3.5 KiB
TypeScript
import { Link, createFileRoute } from "@tanstack/react-router"
|
|
import { useQuery } from "@tanstack/react-query"
|
|
import { useEffect, useState } from "react"
|
|
import { ArrowLeft } from "lucide-react"
|
|
|
|
import { PlanReview } from "@/components/agents/PlanReview"
|
|
import { buttonVariants } from "@/components/ui/button"
|
|
import { Skeleton } from "@/components/ui/skeleton"
|
|
import { loginUrl } from "@/lib/api"
|
|
import { currentAuthRedirectPath } from "@/lib/auth-redirect"
|
|
import { PlanApiError, getPlan } from "@/lib/plan"
|
|
|
|
export const Route = createFileRoute("/agents/$threadId_/plan")({
|
|
component: PlanPage,
|
|
})
|
|
|
|
function Centered({ children }: { children: React.ReactNode }) {
|
|
return (
|
|
<div className="flex min-w-0 flex-1 items-center justify-center px-4 py-6 max-md:pt-14 md:p-6">
|
|
{children}
|
|
</div>
|
|
)
|
|
}
|
|
|
|
function BackLink({ threadId }: { threadId: string }) {
|
|
return (
|
|
<Link
|
|
to="/agents/$threadId"
|
|
params={{ threadId }}
|
|
className="inline-flex items-center gap-1 text-xs text-[var(--ui-text-dim)] hover:text-[var(--ui-text)]"
|
|
>
|
|
<ArrowLeft className="size-3.5" />
|
|
Back to conversation
|
|
</Link>
|
|
)
|
|
}
|
|
|
|
export function planSignInHref(): string {
|
|
return loginUrl(currentAuthRedirectPath())
|
|
}
|
|
|
|
export function PlanSignInButton() {
|
|
return (
|
|
<a href={planSignInHref()} className={buttonVariants({ size: "sm" })}>
|
|
Sign in to view this plan
|
|
</a>
|
|
)
|
|
}
|
|
|
|
function PlanPage() {
|
|
const { threadId } = Route.useParams()
|
|
|
|
// BlockNote + Yjs are browser-only; mount client-side before rendering.
|
|
const [mounted, setMounted] = useState(false)
|
|
useEffect(() => setMounted(true), [])
|
|
|
|
const query = useQuery({
|
|
queryKey: ["plan", threadId],
|
|
queryFn: () => getPlan(threadId),
|
|
// The agent shares the link as soon as it enters plan mode, before the plan
|
|
// is written — poll until the plan content is published.
|
|
refetchInterval: (q) => (q.state.data?.markdown ? false : 2000),
|
|
retry: (count, error) =>
|
|
!(
|
|
error instanceof PlanApiError &&
|
|
(error.status === 401 || error.status === 404)
|
|
) && count < 3,
|
|
})
|
|
|
|
if (!mounted || query.isLoading) {
|
|
return (
|
|
<Centered>
|
|
<Skeleton className="h-48 w-full max-w-2xl" />
|
|
</Centered>
|
|
)
|
|
}
|
|
|
|
if (query.isError) {
|
|
const status = query.error instanceof PlanApiError ? query.error.status : 0
|
|
return (
|
|
<Centered>
|
|
<div className="space-y-3 text-center text-sm text-[var(--ui-text-dim)]">
|
|
<p>
|
|
{status === 401
|
|
? "Please sign in to view this plan."
|
|
: "This plan could not be found."}
|
|
</p>
|
|
{status === 401 ? <PlanSignInButton /> : null}
|
|
<BackLink threadId={threadId} />
|
|
</div>
|
|
</Centered>
|
|
)
|
|
}
|
|
|
|
const plan = query.data
|
|
if (!plan) {
|
|
return (
|
|
<Centered>
|
|
<Skeleton className="h-48 w-full max-w-2xl" />
|
|
</Centered>
|
|
)
|
|
}
|
|
if (!plan.markdown.trim()) {
|
|
return (
|
|
<Centered>
|
|
<div className="space-y-3 text-center text-sm text-[var(--ui-text-dim)]">
|
|
<p>
|
|
The agent is still writing the plan. This page will update
|
|
automatically…
|
|
</p>
|
|
<BackLink threadId={threadId} />
|
|
</div>
|
|
</Centered>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<div className="flex min-w-0 flex-1 flex-col">
|
|
<div className="border-b border-[var(--ui-border)] px-4 pt-14 md:px-6 md:pt-3">
|
|
<BackLink threadId={threadId} />
|
|
</div>
|
|
<PlanReview plan={plan} />
|
|
</div>
|
|
)
|
|
}
|