Skip to content

The open-source app everyone uses to manage agents at work

Show all companies' agents on instance heartbeats page

dotta3b2cb3a69939
diff --git a/server/src/routes/agents.ts b/server/src/routes/agents.ts
index 6bacb46ef2..5621d25936 100644
--- a/server/src/routes/agents.ts
+++ b/server/src/routes/agents.ts
@@ -43,7 +43,7 @@ import {
workspaceOperationService,
} from "../services/index.js";
import { conflict, forbidden, notFound, unprocessable } from "../errors.js";
-import { assertBoard, assertCompanyAccess, getActorInfo } from "./authz.js";
+import { assertBoard, assertCompanyAccess, assertInstanceAdmin, getActorInfo } from "./authz.js";
import { findServerAdapter, listAdapterModels } from "../adapters/index.js";
import { redactEventPayload } from "../redaction.js";
import { redactCurrentUserValue } from "../log-redaction.js";
@@ -855,17 +855,7 @@ export function agentRoutes(db: Db) {
});
router.get("/instance/scheduler-heartbeats", async (req, res) => {
- assertBoard(req);
-
- const accessConditions = [];
- if (req.actor.source !== "local_implicit" && !req.actor.isInstanceAdmin) {
- const allowedCompanyIds = req.actor.companyIds ?? [];
- if (allowedCompanyIds.length === 0) {
- res.json([]);
- return;
- }
- accessConditions.push(inArray(agentsTable.companyId, allowedCompanyIds));
- }
+ assertInstanceAdmin(req);
const rows = await db
.select({
@@ -883,7 +873,6 @@ export function agentRoutes(db: Db) {
})
.from(agentsTable)
.innerJoin(companies, eq(agentsTable.companyId, companies.id))
- .where(accessConditions.length > 0 ? and(...accessConditions) : undefined)
.orderBy(companies.name, agentsTable.name);
const items: InstanceSchedulerHeartbeatAgent[] = rows
diff --git a/server/src/routes/authz.ts b/server/src/routes/authz.ts
index 4782489b4d..a881d4ff05 100644
--- a/server/src/routes/authz.ts
+++ b/server/src/routes/authz.ts
@@ -7,6 +7,14 @@ export function assertBoard(req: Request) {
}
}
+export function assertInstanceAdmin(req: Request) {
+ assertBoard(req);
+ if (req.actor.source === "local_implicit" || req.actor.isInstanceAdmin) {
+ return;
+ }
+ throw forbidden("Instance admin access required");
+}
+
export function assertCompanyAccess(req: Request, companyId: string) {
if (req.actor.type === "none") {
throw unauthorized();