Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions server/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { createAgentRoutes } from "./agents/routes";
import {
type AuditReader,
type AuditStore,
AuditQueryError,
auditQueryFromUrl,
recordAuditEvent,
} from "./audit";
Expand Down Expand Up @@ -456,9 +457,16 @@ export function createApp(
return context.json({ error: "Audit logging is not configured." }, 503);
}

return context.json(
await auditReader.list(auditQueryFromUrl(new URL(context.req.url))),
);
try {
return context.json(
await auditReader.list(auditQueryFromUrl(new URL(context.req.url))),
);
} catch (error) {
if (error instanceof AuditQueryError) {
return context.json({ error: error.message }, 400);
}
throw error;
}
});
/*
* Who is here, and what they may do.
Expand Down
29 changes: 23 additions & 6 deletions server/src/audit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -579,24 +579,41 @@ export function createAuditReader(database: Database): AuditReader {
};
}

export class AuditQueryError extends Error {
constructor(message: string) {
super(message);
this.name = "AuditQueryError";
}
}

export function auditQueryFromUrl(url: URL): AuditEventQuery {
const requestedLimit = Number.parseInt(
url.searchParams.get("limit") ?? "50",
10,
);
const rawLimit = url.searchParams.get("limit") ?? "50";
const trimmedLimit = rawLimit.trim();
const requestedLimit = /^\d+$/.test(trimmedLimit)
? Number.parseInt(trimmedLimit, 10)
: Number.NaN;
const limit = Number.isFinite(requestedLimit)
? Math.min(Math.max(requestedLimit, 1), 100)
: 50;
const optional = (name: string) => url.searchParams.get(name) ?? undefined;

const from = optional("from");
if (from !== undefined && Number.isNaN(Date.parse(from))) {
throw new AuditQueryError('Query parameter "from" must be a valid date.');
}
const to = optional("to");
if (to !== undefined && Number.isNaN(Date.parse(to))) {
throw new AuditQueryError('Query parameter "to" must be a valid date.');
}

return {
cursor: optional("cursor"),
limit,
eventType: optional("eventType"),
actorUserId: optional("actorUserId"),
targetType: optional("targetType"),
targetId: optional("targetId"),
from: optional("from"),
to: optional("to"),
from,
to,
};
}