mirror of
https://github.com/multica-ai/multica.git
synced 2026-08-13 03:15:34 +02:00
* feat(agents): remove custom_env from agent resources, add audited env endpoint (MUL-2600)
The agent resource shape (list / get / create / update / archive /
restore responses + WebSocket events) no longer carries `custom_env`
values. Reads/writes of env now flow exclusively through a dedicated
`/api/agents/{id}/env` endpoint that is owner/admin-only, rejects
agent-actor sessions, applies a "****" sentinel preserve guard on
PUT, and writes a persistent audit row per reveal/update.
Why
- `multica agent list --output json` historically returned plaintext
`custom_env` for owner/admin callers (the redaction gate gave only
members the masked map). Any agent token running on the workspace
inherits its owner's role and could read every other agent's
secrets just by listing.
- Patching list/get redaction alone (PR #3175 direction) left
symmetric leaks via mutation responses, WS events, the "reveal"
path itself (no actor-aware auth), and a `****` overwrite footgun
on UpdateAgent.
What changed
- Backend: drop `custom_env` from AgentResponse; add coarse
`has_custom_env` + `custom_env_key_count`. Strip env handling from
UpdateAgent (silently ignored if sent). Keep CreateAgent's
custom_env acceptance.
- Backend: new GET/PUT `/api/agents/{id}/env` handlers in
`internal/handler/agent_env.go`:
- resolveActor → 403 for agent actors (closes the lateral-movement
path).
- Owner/admin role gate via existing helper.
- PUT honours value == "****" as "preserve existing value".
- Both write to `activity_log` with `agent_env_revealed` /
`agent_env_updated` actions. Audit details record key names only,
never values.
- Daemon claim path (`ClaimAgentTask`) unchanged — `TaskAgentData`
still carries plaintext env for runtime injection.
- SQL: new `UpdateAgentCustomEnv` query; sqlc regenerated (v1.31.1).
- CLI: new `multica agent env get|set` subcommands. `--custom-env*`
flags removed from `multica agent update`; the no-fields error
now points to the new path.
- Frontend: drop env fields from `Agent` + `UpdateAgentRequest`; add
`getAgentEnv` / `updateAgentEnv` client methods; rewrite env-tab
to show "N variables configured" + explicit "Reveal & edit"
button, fetching values only on intentional reveal.
- Locales: parity-safe additions to en + zh-Hans.
- Docs: agents-create.{mdx,zh.mdx} reflect the new threat model and
endpoint.
- Mobile: schema drops `custom_env` / `custom_env_redacted`, adds
metadata fields.
Tests
- Handler tests pinned the new invariants: no env in list/get
responses, owner reveal happy-path + audit row, agent-actor 403,
`****` sentinel preserves real values, UpdateAgent silently
ignores `custom_env`, pure `mergeAgentEnv` cases.
- CLI tests pivot to the new flag surface: `agent update` MUST NOT
expose the env flags; `agent env set` MUST expose
--custom-env-stdin/--custom-env-file.
- Frontend test fixtures updated; pnpm typecheck / test / lint
pass cleanly.
This is a breaking API change. Scripts that read `custom_env` from
`/api/agents` must migrate to `GET /api/agents/{id}/env`.
Co-authored-by: multica-agent <github@multica.ai>
* fix(agents): close actor-spoofing + audit fail-closed in env endpoints (MUL-2600)
Addresses Elon's review of #3209:
* Mint a task-scoped `mat_` token per claim, bound to (agent, task,
workspace, owner). Daemon injects it into the agent process in place
of its own credential. Auth middleware authoritatively rebuilds
X-User-ID / X-Agent-ID / X-Task-ID from the token row and sets
X-Actor-Source=task_token; that header is server-set only — incoming
values are stripped before any auth branch runs. resolveActor honors
the header so an agent that strips X-Agent-ID / X-Task-ID still
resolves as actor=agent.
* GetAgentEnv / UpdateAgentEnv are now fail-closed on audit-log
failures: GET refuses to return plaintext, PUT persists inside the
same tx as the audit row so they commit/roll back together.
* PUT /api/agents/{id} returns 400 when the body carries custom_env
instead of silently dropping it — directs callers to the audited env
endpoint.
* Agent actors never see mcp_config, even when the underlying member
is owner/admin; mutation broadcasts go through a redaction shim so
WS subscribers don't pick it up either.
* Fix backend test that asserted dense JSON (jsonb::text renders
whitespace) and frontend test that assumed a unique "Test User"
match.
Co-authored-by: multica-agent <github@multica.ai>
* fix(agents): close residual MUL-2600 gaps from review (MUL-2600)
Migration 108 FK now correctly references agent_task_queue(id) instead
of the non-existent agent_task table; the previous name blocked CI
backend migrations.
Task-token-authenticated requests can no longer be re-routed at a
different workspace by passing workspace_slug / workspace_id /
?workspace_id / a URL workspace param. ResolveWorkspaceIDFromRequest
and resolveWorkspaceUUID both short-circuit on X-Actor-Source=task_token
and return only the token-bound X-Workspace-ID; buildMiddleware adds a
defence-in-depth 403 if any URL-resolved workspace disagrees with the
token binding.
mcp_config no longer leaks back to agent actors through UpdateAgent /
CreateAgent / ArchiveAgent / RestoreAgent HTTP responses — the same
redactAgentResponseForActor helper that GetAgent/ListAgents use is now
applied to mutation responses too. WS broadcasts were already redacted
via broadcastAgentResponse.
FailTask and every TaskService cancel path (CancelTask /
CancelTasksForIssue / CancelTasksForAgent / CancelTasksByTriggerComment
/ BroadcastCancelledTasks) now eagerly DeleteTaskTokensByTask so the
mat_ token's 24h window doesn't outlive a terminated task. Failure is
non-fatal — the FK cascade and expiry remain durable guards.
Doc-only: clarify that PUT /api/agents/{id} now hard-rejects bodies
that carry custom_env (was previously "silently ignores").
Tests:
- middleware: TestResolveWorkspaceIDFromRequest gains a task_token
case asserting client-supplied slug/id/query cannot override the
bound workspace.
- handler: TestUpdateAgent_RedactsMcpConfigForAgentActor and
TestUpdateAgent_KeepsMcpConfigForMemberActor pin the mutation-
response redaction contract per actor type.
Co-authored-by: multica-agent <github@multica.ai>
* fix(agents): match redacted mcp_config as JSON null, not Go nil (MUL-2600)
`AgentResponse.McpConfig` is `json.RawMessage` without `omitempty`, so
the redacted response serialises as `"mcp_config": null`. On decode,
`json.RawMessage` keeps the literal bytes `null` rather than collapsing
to Go nil, which made the assertion fire on a non-leak.
The product contract (field always present, distinguished from "no
config" via `mcp_config_redacted`) is intentional, so adjust the test
to check for "no secret-bearing content" instead of weakening the
contract via `omitempty`.
Co-authored-by: multica-agent <github@multica.ai>
---------
Co-authored-by: multica-agent <github@multica.ai>
307 lines
9.6 KiB
TypeScript
307 lines
9.6 KiB
TypeScript
"use client";
|
|
|
|
import { useCallback, useEffect, useState } from "react";
|
|
import {
|
|
Eye,
|
|
EyeOff,
|
|
Loader2,
|
|
Lock,
|
|
Plus,
|
|
Save,
|
|
Trash2,
|
|
} from "lucide-react";
|
|
import { api } from "@multica/core/api";
|
|
import type { Agent } from "@multica/core/types";
|
|
import { Button } from "@multica/ui/components/ui/button";
|
|
import { Input } from "@multica/ui/components/ui/input";
|
|
import { toast } from "sonner";
|
|
import { useT } from "../../../i18n";
|
|
|
|
// Env values never reach this component until the user clicks
|
|
// "Reveal & edit" — the agent resource feed no longer carries
|
|
// custom_env at all after MUL-2600. Until then we display only the
|
|
// configured-key count from `agent.custom_env_key_count`, which is
|
|
// safe because it's not the values themselves.
|
|
|
|
let nextEnvId = 0;
|
|
|
|
interface EnvEntry {
|
|
id: number;
|
|
key: string;
|
|
value: string;
|
|
visible: boolean;
|
|
}
|
|
|
|
function envMapToEntries(env: Record<string, string>): EnvEntry[] {
|
|
return Object.entries(env).map(([key, value]) => ({
|
|
id: nextEnvId++,
|
|
key,
|
|
value,
|
|
visible: false,
|
|
}));
|
|
}
|
|
|
|
function entriesToEnvMap(entries: EnvEntry[]): Record<string, string> {
|
|
const map: Record<string, string> = {};
|
|
for (const entry of entries) {
|
|
const key = entry.key.trim();
|
|
if (key) {
|
|
map[key] = entry.value;
|
|
}
|
|
}
|
|
return map;
|
|
}
|
|
|
|
export function EnvTab({
|
|
agent,
|
|
onDirtyChange,
|
|
onSaved,
|
|
}: {
|
|
agent: Agent;
|
|
onDirtyChange?: (dirty: boolean) => void;
|
|
// Notifier so the parent page can refresh its agent cache after a
|
|
// successful PUT — the parent owns the `Agent` object the rest of
|
|
// the page reads (name, has_custom_env, etc.). Optional so call
|
|
// sites without invalidation logic stay simple.
|
|
onSaved?: () => void;
|
|
}) {
|
|
const { t } = useT("agents");
|
|
|
|
// revealed === null means "haven't fetched yet"; revealed === [] is
|
|
// a legitimate empty map after a successful reveal. We do NOT
|
|
// pre-populate from `agent` here because the agent resource shape
|
|
// no longer carries values — only the dedicated `/env` endpoint
|
|
// does, and that endpoint writes an audit row per call so we never
|
|
// fetch implicitly on mount.
|
|
const [revealed, setRevealed] = useState<EnvEntry[] | null>(null);
|
|
const [originalMap, setOriginalMap] = useState<Record<string, string>>({});
|
|
const [revealing, setRevealing] = useState(false);
|
|
const [saving, setSaving] = useState(false);
|
|
|
|
const keyCount = agent.custom_env_key_count ?? 0;
|
|
|
|
const currentEnvMap = revealed ? entriesToEnvMap(revealed) : originalMap;
|
|
const dirty =
|
|
revealed !== null &&
|
|
JSON.stringify(currentEnvMap) !== JSON.stringify(originalMap);
|
|
|
|
useEffect(() => {
|
|
onDirtyChange?.(dirty);
|
|
}, [dirty, onDirtyChange]);
|
|
|
|
const handleReveal = useCallback(async () => {
|
|
setRevealing(true);
|
|
try {
|
|
const resp = await api.getAgentEnv(agent.id);
|
|
const env = resp.custom_env ?? {};
|
|
setOriginalMap(env);
|
|
setRevealed(envMapToEntries(env));
|
|
} catch (err) {
|
|
toast.error(
|
|
err instanceof Error && err.message
|
|
? err.message
|
|
: t(($) => $.tab_body.env.reveal_failed_toast),
|
|
);
|
|
} finally {
|
|
setRevealing(false);
|
|
}
|
|
}, [agent.id, t]);
|
|
|
|
const addEnvEntry = () => {
|
|
setRevealed((prev) => [
|
|
...(prev ?? []),
|
|
{ id: nextEnvId++, key: "", value: "", visible: true },
|
|
]);
|
|
};
|
|
|
|
const removeEnvEntry = (index: number) => {
|
|
setRevealed((prev) => (prev ?? []).filter((_, i) => i !== index));
|
|
};
|
|
|
|
const updateEnvEntry = (
|
|
index: number,
|
|
field: "key" | "value",
|
|
val: string,
|
|
) => {
|
|
setRevealed((prev) =>
|
|
(prev ?? []).map((entry, i) =>
|
|
i === index ? { ...entry, [field]: val } : entry,
|
|
),
|
|
);
|
|
};
|
|
|
|
const toggleEnvVisibility = (index: number) => {
|
|
setRevealed((prev) =>
|
|
(prev ?? []).map((entry, i) =>
|
|
i === index ? { ...entry, visible: !entry.visible } : entry,
|
|
),
|
|
);
|
|
};
|
|
|
|
const handleSave = async () => {
|
|
if (revealed === null) return;
|
|
const keys = revealed.filter((e) => e.key.trim()).map((e) => e.key.trim());
|
|
const uniqueKeys = new Set(keys);
|
|
if (uniqueKeys.size < keys.length) {
|
|
toast.error(t(($) => $.tab_body.env.duplicate_keys_toast));
|
|
return;
|
|
}
|
|
|
|
setSaving(true);
|
|
try {
|
|
const resp = await api.updateAgentEnv(agent.id, {
|
|
custom_env: currentEnvMap,
|
|
});
|
|
const env = resp.custom_env ?? {};
|
|
setOriginalMap(env);
|
|
setRevealed(envMapToEntries(env));
|
|
toast.success(t(($) => $.tab_body.env.saved_toast));
|
|
onSaved?.();
|
|
} catch (err) {
|
|
toast.error(
|
|
err instanceof Error && err.message
|
|
? err.message
|
|
: t(($) => $.tab_body.env.save_failed_toast),
|
|
);
|
|
} finally {
|
|
setSaving(false);
|
|
}
|
|
};
|
|
|
|
// Pre-reveal state: show count + Reveal button. We never auto-fetch
|
|
// on mount so a member just navigating between tabs doesn't trigger
|
|
// an audit-log entry; the reveal must be intentional.
|
|
if (revealed === null) {
|
|
return (
|
|
<div className="space-y-4">
|
|
<div className="flex items-start justify-between gap-3">
|
|
<div className="space-y-1">
|
|
<p className="flex items-center gap-2 text-sm font-medium">
|
|
<Lock className="h-3.5 w-3.5 text-muted-foreground" />
|
|
{keyCount > 0
|
|
? t(($) => $.tab_body.env.not_revealed_title, {
|
|
count: keyCount,
|
|
})
|
|
: t(($) => $.tab_body.env.not_revealed_empty)}
|
|
</p>
|
|
<p className="text-xs text-muted-foreground">
|
|
{t(($) => $.tab_body.env.not_revealed_hint)}
|
|
</p>
|
|
</div>
|
|
<Button
|
|
type="button"
|
|
variant="outline"
|
|
size="sm"
|
|
disabled={revealing}
|
|
onClick={handleReveal}
|
|
className="shrink-0"
|
|
>
|
|
{revealing ? (
|
|
<Loader2 className="h-3.5 w-3.5 animate-spin" />
|
|
) : (
|
|
<Eye className="h-3.5 w-3.5" />
|
|
)}
|
|
{revealing
|
|
? t(($) => $.tab_body.env.revealing)
|
|
: t(($) => $.tab_body.env.reveal_action)}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
// Editable state — only entered after a successful reveal.
|
|
return (
|
|
<div className="space-y-4">
|
|
<div className="flex items-start justify-between gap-3">
|
|
<p className="text-xs text-muted-foreground">
|
|
{t(($) => $.tab_body.env.intro_prefix)}
|
|
<code className="rounded bg-muted px-1 py-0.5 font-mono text-[11px]">
|
|
{"ANTHROPIC_API_KEY"}
|
|
</code>
|
|
{t(($) => $.tab_body.env.intro_separator)}
|
|
<code className="rounded bg-muted px-1 py-0.5 font-mono text-[11px]">
|
|
{"ANTHROPIC_BASE_URL"}
|
|
</code>
|
|
{t(($) => $.tab_body.env.intro_suffix)}
|
|
</p>
|
|
<Button
|
|
type="button"
|
|
variant="outline"
|
|
size="sm"
|
|
onClick={addEnvEntry}
|
|
className="shrink-0"
|
|
>
|
|
<Plus className="h-3 w-3" />
|
|
{t(($) => $.tab_body.common.add)}
|
|
</Button>
|
|
</div>
|
|
|
|
{revealed.length > 0 ? (
|
|
<div className="space-y-2">
|
|
{revealed.map((entry, index) => (
|
|
<div key={entry.id} className="flex items-center gap-2">
|
|
<Input
|
|
value={entry.key}
|
|
onChange={(e) => updateEnvEntry(index, "key", e.target.value)}
|
|
placeholder={t(($) => $.tab_body.env.key_placeholder)}
|
|
className="w-[40%] font-mono text-xs"
|
|
/>
|
|
<div className="relative flex-1">
|
|
<Input
|
|
type={entry.visible ? "text" : "password"}
|
|
value={entry.value}
|
|
onChange={(e) =>
|
|
updateEnvEntry(index, "value", e.target.value)
|
|
}
|
|
placeholder={t(($) => $.tab_body.env.value_placeholder)}
|
|
className="pr-8 font-mono text-xs"
|
|
/>
|
|
<button
|
|
type="button"
|
|
onClick={() => toggleEnvVisibility(index)}
|
|
className="absolute right-2 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
|
|
aria-label={entry.visible ? t(($) => $.tab_body.env.hide_value_aria) : t(($) => $.tab_body.env.show_value_aria)}
|
|
>
|
|
{entry.visible ? (
|
|
<EyeOff className="h-3.5 w-3.5" />
|
|
) : (
|
|
<Eye className="h-3.5 w-3.5" />
|
|
)}
|
|
</button>
|
|
</div>
|
|
<Button
|
|
variant="ghost"
|
|
size="icon-sm"
|
|
onClick={() => removeEnvEntry(index)}
|
|
className="text-muted-foreground hover:text-destructive"
|
|
aria-label={t(($) => $.tab_body.env.remove_aria)}
|
|
>
|
|
<Trash2 className="h-3.5 w-3.5" />
|
|
</Button>
|
|
</div>
|
|
))}
|
|
</div>
|
|
) : (
|
|
<p className="text-xs italic text-muted-foreground">
|
|
{t(($) => $.tab_body.env.empty_editable)}
|
|
</p>
|
|
)}
|
|
|
|
<div className="flex items-center justify-end gap-3">
|
|
{dirty && (
|
|
<span className="text-xs text-muted-foreground">{t(($) => $.tab_body.common.unsaved_changes)}</span>
|
|
)}
|
|
<Button onClick={handleSave} disabled={!dirty || saving} size="sm">
|
|
{saving ? (
|
|
<Loader2 className="h-3.5 w-3.5 animate-spin" />
|
|
) : (
|
|
<Save className="h-3.5 w-3.5" />
|
|
)}
|
|
{t(($) => $.tab_body.common.save)}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|