eve-hub 0.16.8 → 0.16.10

package/hub-oidc.d.mts

@@ -2,4 +2,5 @@ export type TeamClaims = { iss: string; owner_id: string; project_id?: string; e
 export function looksLikeJwt(token: string | null | undefined): boolean;
 export function verifyIssuerToken(token: string, options: { iss: string; jwksUrl?: string; audience?: string; fetchImpl?: typeof fetch; now?: number }): Promise<Record<string, unknown> | undefined>;
 export function verifyTeamToken(token: string, own: string, options?: { fetchImpl?: typeof fetch; now?: number; audience?: string }): Promise<TeamClaims | undefined>;
+export function projectOf(token: string): string | 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

@@ -48,22 +48,33 @@ export async function verifyTeamToken(token, own, { fetchImpl = fetch, now = Dat
   }
 }
 
+/** The project a Vercel OIDC token was issued to (`project_id`), unverified: for reading one's own token. */
+export const projectOf = (token) => { const id = decodeJwt(token).project_id; return typeof id === "string" ? id : undefined; };
+
 /**
  * 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'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.
+ * and either this deployment's own project's (the workspace's hub service deploys in the project with its bots, so its token
+ * is the project's own, in the same environment) or the central hub project's production deployment (HUB_PROJECT_ID; a
+ * preview of it is any branch push). Either way it is issued for this deployment's own project as audience. Both serve until the central hub
+ * stops serving the workspace plane. 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 } = {}) {
   const token = request.headers.get("x-hub-oidc-token");
   if (!token) return isBotToken(request.headers.get("authorization"), env.BOT_TOKEN);
-  if (!env.HUB_PROJECT_ID) return false;
-  let claims;
+  let mine, claims;
   try {
-    const mine = await own(), audience = decodeJwt(mine).project_id;
-    if (typeof audience !== "string") return false;
-    claims = await verifyTeamToken(token, mine, { ...options, audience });
+    mine = await own();
+    claims = await verifyTeamToken(token, mine, options);
   }
   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";
+  if (claims === undefined) return false;
+  const { project_id: project, environment } = decodeJwt(mine);
+  if (typeof project !== "string") return false;
+  const sameProject = claims.project_id === project && claims.environment === environment;
+  const central = env.HUB_PROJECT_ID && claims.project_id === env.HUB_PROJECT_ID && claims.environment === "production";
+  if (!sameProject && !central) return false;
+  // Either hub's token names this project as its audience; the default audience (what AI Gateway and Connect take) is not it.
+  const aud = claims.aud;
+  return aud === project || (Array.isArray(aud) && aud.includes(project));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-hub",
-  "version": "0.16.8",
+  "version": "0.16.10",
   "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",