fix(planner): keep journal callback token off the client (#2 Phase A)
The Save-to-Journal flow had the browser fetch the journal with a
\`Bearer \${callbackToken}\` header. The JWT was visible in DevTools,
exfiltratable via any XSS or browser extension, and the planner's
\`loader\` shipped it down to the client as part of the page payload.
Now:
- **New action**: \`POST /api/save-to-journal\` (\`routes/api.save-to-journal.ts\`).
Body: \`{ sessionId, gpx }\`. The action loads \`callbackUrl\` +
\`callbackToken\` from \`planner.sessions\` (set at /new time when the
user came from the journal), POSTs to the journal server-to-server
with the Bearer, and forwards the response.
- **\`SaveToJournalButton\`**: drops the \`callbackUrl\` + \`callbackToken\`
props. Takes \`sessionId\` only and POSTs to the planner action.
- **\`session.\$id.tsx\` loader**: stops returning \`callbackUrl\` /
\`callbackToken\` to the client. Returns a single \`hasJournalCallback\`
boolean so the button still knows whether to render.
- **\`SessionView\`**: same prop simplification.
Trust model is unchanged: the same \`sessionId\` that grants Yjs
membership grants save authority. Knowing the URL = ability to act.
The action only adds a server-side hop so the JWT never reaches
browser JS.
Phase B (jti single-use enforcement on the journal side) follows in
a separate PR — needs a journal DB column + verifier change.
Full repo: pnpm typecheck / lint / test all green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
3dcc17152b
commit
0917de6080
5 changed files with 101 additions and 21 deletions
|
|
@ -8,12 +8,11 @@ import { waypointFromYMap } from "~/lib/waypoint-ymap";
|
||||||
|
|
||||||
interface SaveToJournalButtonProps {
|
interface SaveToJournalButtonProps {
|
||||||
yjs: YjsState;
|
yjs: YjsState;
|
||||||
callbackUrl: string;
|
sessionId: string;
|
||||||
callbackToken: string;
|
|
||||||
returnUrl?: string;
|
returnUrl?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SaveToJournalButton({ yjs, callbackUrl, callbackToken, returnUrl }: SaveToJournalButtonProps) {
|
export function SaveToJournalButton({ yjs, sessionId, returnUrl }: SaveToJournalButtonProps) {
|
||||||
const { t } = useTranslation("planner");
|
const { t } = useTranslation("planner");
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
const [saved, setSaved] = useState(false);
|
const [saved, setSaved] = useState(false);
|
||||||
|
|
@ -47,14 +46,14 @@ export function SaveToJournalButton({ yjs, callbackUrl, callbackToken, returnUrl
|
||||||
const notes = yjs.notes.toString() || undefined;
|
const notes = yjs.notes.toString() || undefined;
|
||||||
const gpx = generateGpx({ name: "trails.cool route", description: notes, waypoints, tracks, noGoAreas });
|
const gpx = generateGpx({ name: "trails.cool route", description: notes, waypoints, tracks, noGoAreas });
|
||||||
|
|
||||||
// POST to Journal callback
|
// POST to the planner's server-side proxy. The proxy attaches the
|
||||||
const response = await fetch(callbackUrl, {
|
// journal Bearer token (stored on the session row) and forwards
|
||||||
|
// the GPX. Token never leaves the planner server — see
|
||||||
|
// routes/api.save-to-journal.ts.
|
||||||
|
const response = await fetch("/api/save-to-journal", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: { "Content-Type": "application/json" },
|
||||||
"Content-Type": "application/json",
|
body: JSON.stringify({ sessionId, gpx }),
|
||||||
"Authorization": `Bearer ${callbackToken}`,
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ gpx }),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
|
|
@ -68,7 +67,7 @@ export function SaveToJournalButton({ yjs, callbackUrl, callbackToken, returnUrl
|
||||||
} finally {
|
} finally {
|
||||||
setSaving(false);
|
setSaving(false);
|
||||||
}
|
}
|
||||||
}, [yjs, callbackUrl, callbackToken]);
|
}, [yjs, sessionId]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
|
|
|
||||||
|
|
@ -148,15 +148,20 @@ function SidebarTabs({ yjs, routeStats, days, onWaypointHover, onWaypointSelect
|
||||||
|
|
||||||
interface SessionViewProps {
|
interface SessionViewProps {
|
||||||
sessionId: string;
|
sessionId: string;
|
||||||
callbackUrl?: string;
|
/**
|
||||||
callbackToken?: string;
|
* True when the session was created with a journal callback URL +
|
||||||
|
* token (i.e. the user came in from /journal/.../edit-in-planner).
|
||||||
|
* The actual URL + token live server-side; the browser only needs
|
||||||
|
* to know whether to render the Save-to-Journal button.
|
||||||
|
*/
|
||||||
|
hasJournalCallback?: boolean;
|
||||||
returnUrl?: string;
|
returnUrl?: string;
|
||||||
initialWaypoints?: Array<{ lat: number; lon: number; name?: string; isDayBreak?: boolean }>;
|
initialWaypoints?: Array<{ lat: number; lon: number; name?: string; isDayBreak?: boolean }>;
|
||||||
initialNoGoAreas?: Array<{ points: Array<{ lat: number; lon: number }> }>;
|
initialNoGoAreas?: Array<{ points: Array<{ lat: number; lon: number }> }>;
|
||||||
initialNotes?: string;
|
initialNotes?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SessionView({ sessionId, callbackUrl, callbackToken, returnUrl, initialWaypoints, initialNoGoAreas, initialNotes }: SessionViewProps) {
|
export function SessionView({ sessionId, hasJournalCallback, returnUrl, initialWaypoints, initialNoGoAreas, initialNotes }: SessionViewProps) {
|
||||||
const { t } = useTranslation("planner");
|
const { t } = useTranslation("planner");
|
||||||
useEffect(() => { Sentry.setTag("session_id", sessionId); }, [sessionId]);
|
useEffect(() => { Sentry.setTag("session_id", sessionId); }, [sessionId]);
|
||||||
const yjs = useYjs(sessionId, initialWaypoints, initialNoGoAreas, initialNotes);
|
const yjs = useYjs(sessionId, initialWaypoints, initialNoGoAreas, initialNotes);
|
||||||
|
|
@ -253,11 +258,10 @@ export function SessionView({ sessionId, callbackUrl, callbackToken, returnUrl,
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-2 sm:gap-3 shrink-0">
|
<div className="flex items-center gap-2 sm:gap-3 shrink-0">
|
||||||
{callbackUrl && callbackToken && (
|
{hasJournalCallback && (
|
||||||
<SaveToJournalButton
|
<SaveToJournalButton
|
||||||
yjs={yjs}
|
yjs={yjs}
|
||||||
callbackUrl={callbackUrl}
|
sessionId={sessionId}
|
||||||
callbackToken={callbackToken}
|
|
||||||
returnUrl={returnUrl}
|
returnUrl={returnUrl}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
|
||||||
|
|
@ -7,5 +7,6 @@ export default [
|
||||||
route("api/route", "routes/api.route.ts"),
|
route("api/route", "routes/api.route.ts"),
|
||||||
route("api/route-segments", "routes/api.route-segments.ts"),
|
route("api/route-segments", "routes/api.route-segments.ts"),
|
||||||
route("api/overpass", "routes/api.overpass.ts"),
|
route("api/overpass", "routes/api.overpass.ts"),
|
||||||
|
route("api/save-to-journal", "routes/api.save-to-journal.ts"),
|
||||||
route("session/:id", "routes/session.$id.tsx"),
|
route("session/:id", "routes/session.$id.tsx"),
|
||||||
] satisfies RouteConfig;
|
] satisfies RouteConfig;
|
||||||
|
|
|
||||||
74
apps/planner/app/routes/api.save-to-journal.ts
Normal file
74
apps/planner/app/routes/api.save-to-journal.ts
Normal file
|
|
@ -0,0 +1,74 @@
|
||||||
|
// Server-side proxy for "Save to Journal". Looks up the session's
|
||||||
|
// callbackUrl + callbackToken (stored at /new time when the user came
|
||||||
|
// from the journal) and POSTs the GPX to the journal as a Bearer.
|
||||||
|
//
|
||||||
|
// Why this exists (planner-audit #2, Phase A): the previous flow had
|
||||||
|
// the browser fetch with the bearer token directly, exposing it in
|
||||||
|
// DevTools / to any XSS / browser extension. Now the token never
|
||||||
|
// leaves the planner's server-side trust boundary.
|
||||||
|
//
|
||||||
|
// Trust model: the same sessionId that grants Yjs membership grants
|
||||||
|
// save authority. Knowing the URL = ability to act. This matches the
|
||||||
|
// existing model — we're not strengthening or weakening it, just
|
||||||
|
// keeping the JWT off the wire to the browser.
|
||||||
|
|
||||||
|
import { data } from "react-router";
|
||||||
|
import type { Route } from "./+types/api.save-to-journal";
|
||||||
|
import { getSession } from "~/lib/sessions";
|
||||||
|
import { fetchWithTimeout } from "~/lib/http.server";
|
||||||
|
|
||||||
|
interface SaveRequestBody {
|
||||||
|
sessionId?: unknown;
|
||||||
|
gpx?: unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
const MAX_GPX_BYTES = 5 * 1024 * 1024; // 5 MB — same ceiling as the Yjs doc cap
|
||||||
|
|
||||||
|
export async function action({ request }: Route.ActionArgs) {
|
||||||
|
if (request.method !== "POST") {
|
||||||
|
return data({ error: "Method not allowed" }, { status: 405 });
|
||||||
|
}
|
||||||
|
|
||||||
|
let body: SaveRequestBody;
|
||||||
|
try {
|
||||||
|
body = (await request.json()) as SaveRequestBody;
|
||||||
|
} catch {
|
||||||
|
return data({ error: "Invalid JSON" }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const sessionId = typeof body.sessionId === "string" ? body.sessionId : "";
|
||||||
|
const gpx = typeof body.gpx === "string" ? body.gpx : "";
|
||||||
|
|
||||||
|
if (!sessionId) return data({ error: "sessionId required" }, { status: 400 });
|
||||||
|
if (!gpx) return data({ error: "gpx required" }, { status: 400 });
|
||||||
|
if (gpx.length > MAX_GPX_BYTES) {
|
||||||
|
return data({ error: "gpx too large" }, { status: 413 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const session = await getSession(sessionId);
|
||||||
|
if (!session) return data({ error: "session not found" }, { status: 404 });
|
||||||
|
if (!session.callbackUrl || !session.callbackToken) {
|
||||||
|
return data({ error: "session has no journal callback" }, { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
let resp: Response;
|
||||||
|
try {
|
||||||
|
resp = await fetchWithTimeout(session.callbackUrl, {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Authorization: `Bearer ${session.callbackToken}`,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ gpx }),
|
||||||
|
});
|
||||||
|
} catch {
|
||||||
|
return data({ error: "journal unreachable" }, { status: 502 });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Forward the journal's response (status + body) so the client UI
|
||||||
|
// can render the same error/success it would have before.
|
||||||
|
const text = await resp.text();
|
||||||
|
let payload: unknown;
|
||||||
|
try { payload = JSON.parse(text); } catch { payload = { raw: text }; }
|
||||||
|
return data(payload, { status: resp.status });
|
||||||
|
}
|
||||||
|
|
@ -20,10 +20,13 @@ export async function loader({ params }: Route.LoaderArgs) {
|
||||||
if (!session) {
|
if (!session) {
|
||||||
throw data({ error: "Session not found" }, { status: 404 });
|
throw data({ error: "Session not found" }, { status: 404 });
|
||||||
}
|
}
|
||||||
|
// Don't leak the JWT token to the client. The save flow uses
|
||||||
|
// /api/save-to-journal, which loads token + URL from the DB
|
||||||
|
// server-side. The browser only needs to know whether the button
|
||||||
|
// should render.
|
||||||
return data({
|
return data({
|
||||||
sessionId: session.id,
|
sessionId: session.id,
|
||||||
callbackUrl: session.callbackUrl ?? null,
|
hasJournalCallback: Boolean(session.callbackUrl && session.callbackToken),
|
||||||
callbackToken: session.callbackToken ?? null,
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -89,8 +92,7 @@ export default function SessionPage({ loaderData }: Route.ComponentProps) {
|
||||||
>
|
>
|
||||||
<SessionView
|
<SessionView
|
||||||
sessionId={id!}
|
sessionId={id!}
|
||||||
callbackUrl={loaderData.callbackUrl ?? undefined}
|
hasJournalCallback={loaderData.hasJournalCallback}
|
||||||
callbackToken={loaderData.callbackToken ?? undefined}
|
|
||||||
returnUrl={returnUrl}
|
returnUrl={returnUrl}
|
||||||
initialWaypoints={initialWaypoints}
|
initialWaypoints={initialWaypoints}
|
||||||
initialNoGoAreas={initialNoGoAreas}
|
initialNoGoAreas={initialNoGoAreas}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue