eve-hub 0.8.2 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # eve-hub
 
+## 0.9.1
+
+### Patch Changes
+
+- Hosted bots take a call as the hub's only if its `x-hub-oidc-token` is the hub project's production token, issued for this bots project as audience (a preview of the hub is any branch push). A call with no such header is judged by BOT_TOKEN as before.
+
+## 0.9.0
+
+### Minor Changes
+
+- The bots no longer write the hub's tables. A bot's append goes to its own session stream, and the hub folds that stream into turns and replies after a wake (`/api/fold`). Needs a hub that serves `/api/fold`.
+
 ## 0.8.2
 
 ### Patch Changes

package/hub-oidc.d.mts

@@ -1,4 +1,4 @@
 export type TeamClaims = { iss: string; owner_id: string; project_id?: string; environment?: string; user_id?: string; exp: number; [claim: string]: unknown };
 export function looksLikeJwt(token: string | null | undefined): boolean;
-export function verifyTeamToken(token: string, own: string, options?: { fetchImpl?: typeof fetch; now?: number }): Promise<TeamClaims | undefined>;
+export function verifyTeamToken(token: string, own: string, options?: { fetchImpl?: typeof fetch; now?: number; audience?: string }): Promise<TeamClaims | undefined>;
 export function isHubRequest(request: Request, own: () => Promise<string>, options?: { env?: Record<string, string | undefined>; fetchImpl?: typeof fetch; now?: number }): Promise<boolean>;

package/hub-oidc.mjs

@@ -1,5 +1,6 @@
 // Who a Vercel OIDC token says its caller is, for the hub and its bots to check each other with:
-// a bot calls the hub with its bots project's token, the hub calls a bot with its own (`x-hub-oidc-token`).
+// a bot calls the hub with its bots project's token, the hub calls a bot with its own, issued for that bots project
+// as audience (`x-hub-oidc-token`): a copy of it is of no use against any other workspace's bot.
 // A token counts when the team's keys signed it (RS256, JWKS at `<iss>/.well-known/jwks.json`), it is within
 // its `nbf`/`exp`, and it comes from the checker's own team: both `iss` and `owner_id` equal those of the checker's
 // own token, so nothing is configured. The caller then checks which project (`project_id`) it may be.
@@ -22,13 +23,13 @@ export const looksLikeJwt = (token) => /^[\w-]+\.[\w-]+\.[\w-]*$/.test(String(to
 
 /**
  * The verified claims of `token`, or undefined for any token that is not the checker's team's.
- * `own` is the checker's own token (its `iss` and `owner_id` say which team to trust).
+ * `own` is the checker's own token (its `iss` and `owner_id` say which team to trust). With `audience`, the token's `aud` must be it.
  */
-export async function verifyTeamToken(token, own, { fetchImpl = fetch, now = Date.now() } = {}) {
+export async function verifyTeamToken(token, own, { fetchImpl = fetch, now = Date.now(), audience } = {}) {
   const { iss, owner_id: owner } = decodeJwt(own);
   if (!iss || !owner) return undefined;
   try {
-    const { payload } = await jwtVerify(token, keysOf(iss, fetchImpl), { issuer: iss, algorithms: ["RS256"], requiredClaims: ["exp"], currentDate: new Date(now) });
+    const { payload } = await jwtVerify(token, keysOf(iss, fetchImpl), { issuer: iss, algorithms: ["RS256"], requiredClaims: ["exp"], ...(audience === undefined ? {} : { audience }), currentDate: new Date(now) });
     return payload.owner_id === owner ? payload : undefined;
   } catch (error) {
     if (error instanceof errors.JOSEError && !KEY_FETCH_FAILED.has(error.code)) return undefined;
@@ -38,7 +39,8 @@ export async function verifyTeamToken(token, own, { fetchImpl = fetch, now = Dat
 
 /**
  * Whether `request` comes from the hub. A call carrying `x-hub-oidc-token` is decided by that token alone: it is of this team's,
- * from the hub project (HUB_PROJECT_ID) and no development token (the hub's own function minted it). A call without one
+ * from the hub project's production deployment (HUB_PROJECT_ID; a preview of it is any branch push), and issued for this
+ * deployment's own project as audience. A call without one
  * (a hub that does not send it yet) is the workspace's BOT_TOKEN. `own` is this deployment's own token.
  */
 export async function isHubRequest(request, own, { env = process.env, ...options } = {}) {
@@ -46,7 +48,11 @@ export async function isHubRequest(request, own, { env = process.env, ...options
   if (!token) return isBotToken(request.headers.get("authorization"), env.BOT_TOKEN);
   if (!env.HUB_PROJECT_ID) return false;
   let claims;
-  try { claims = await verifyTeamToken(token, await own(), options); }
+  try {
+    const mine = await own(), audience = decodeJwt(mine).project_id;
+    if (typeof audience !== "string") return false;
+    claims = await verifyTeamToken(token, mine, { ...options, audience });
+  }
   catch (error) { console.error(`[eve-hub] could not check the hub's token: ${error?.message}`); return false; }
-  return claims !== undefined && claims.project_id === env.HUB_PROJECT_ID && (claims.environment === "production" || claims.environment === "preview");
+  return claims !== undefined && claims.project_id === env.HUB_PROJECT_ID && claims.environment === "production";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-hub",
-  "version": "0.8.2",
+  "version": "0.9.1",
   "license": "Apache-2.0",
   "description": "Bot-side code shared by every hub agent: registry tools, the roster hook, the eve channel, the host sandbox and browser, and model helpers.",
   "type": "module",