🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance funnel and goal deletion logic with site ID validation
Bill Yang672a65c5fe50
diff --git a/server/src/api/analytics/funnels/deleteFunnel.ts b/server/src/api/analytics/funnels/deleteFunnel.tsindex 0f1467d4f..a3902bb28 100644--- a/server/src/api/analytics/funnels/deleteFunnel.ts+++ b/server/src/api/analytics/funnels/deleteFunnel.ts@@ -7,17 +7,28 @@ import { getUserHasAccessToSite } from "../../../lib/auth-utils.js";export async function deleteFunnel(request: FastifyRequest<{Params: {+ siteId: string;funnelId: string;};}>,reply: FastifyReply) {- const { funnelId } = request.params;+ const { siteId, funnelId } = request.params;+ const parsedSiteId = parseInt(siteId, 10);+ const parsedFunnelId = parseInt(funnelId, 10);++ if (isNaN(parsedSiteId) || parsedSiteId <= 0) {+ return reply.status(400).send({ error: "Invalid site ID" });+ }++ if (isNaN(parsedFunnelId) || parsedFunnelId <= 0) {+ return reply.status(400).send({ error: "Invalid funnel ID" });+ }try {// First get the funnel to check ownershipconst funnel = await db.query.funnels.findFirst({- where: eq(funnelsTable.reportId, parseInt(funnelId)),+ where: eq(funnelsTable.reportId, parsedFunnelId),});if (!funnel) {@@ -28,14 +39,18 @@ export async function deleteFunnel(return reply.status(400).send({ error: "Invalid funnel: missing site ID" });}+ if (funnel.siteId !== parsedSiteId) {+ return reply.status(403).send({ error: "Funnel does not belong to the specified site" });+ }+// Check user access to site- const userHasAccessToSite = await getUserHasAccessToSite(request, funnel.siteId.toString());+ const userHasAccessToSite = await getUserHasAccessToSite(request, parsedSiteId.toString());if (!userHasAccessToSite) {return reply.status(403).send({ error: "Forbidden" });}// Delete the funnel- await db.delete(funnelsTable).where(eq(funnelsTable.reportId, parseInt(funnelId)));+ await db.delete(funnelsTable).where(eq(funnelsTable.reportId, parsedFunnelId));return reply.status(200).send({ success: true });} catch (error) {diff --git a/server/src/api/analytics/goals/deleteGoal.ts b/server/src/api/analytics/goals/deleteGoal.tsindex 961932c9f..6776a847b 100644--- a/server/src/api/analytics/goals/deleteGoal.ts+++ b/server/src/api/analytics/goals/deleteGoal.ts@@ -7,35 +7,47 @@ import { eq } from "drizzle-orm";export async function deleteGoal(request: FastifyRequest<{Params: {+ siteId: string;goalId: string;};}>,reply: FastifyReply) {- const { goalId } = request.params;+ const { siteId, goalId } = request.params;+ const parsedSiteId = parseInt(siteId, 10);+ const parsedGoalId = parseInt(goalId, 10);++ if (isNaN(parsedSiteId) || parsedSiteId <= 0) {+ return reply.status(400).send({ error: "Invalid site ID" });+ }++ if (isNaN(parsedGoalId) || parsedGoalId <= 0) {+ return reply.status(400).send({ error: "Invalid goal ID" });+ }try {// Get the goal to check the site IDconst goalToDelete = await db.query.goals.findFirst({- where: eq(goals.goalId, parseInt(goalId, 10)),+ where: eq(goals.goalId, parsedGoalId),});if (!goalToDelete) {return reply.status(404).send({ error: "Goal not found" });}+ if (goalToDelete.siteId !== parsedSiteId) {+ return reply.status(403).send({ error: "Goal does not belong to the specified site" });+ }+// Check user access to the site- const userHasAccessToSite = await getUserHasAccessToSite(request, goalToDelete.siteId.toString());+ const userHasAccessToSite = await getUserHasAccessToSite(request, parsedSiteId.toString());if (!userHasAccessToSite) {return reply.status(403).send({ error: "Forbidden" });}// Delete the goal- const result = await db- .delete(goals)- .where(eq(goals.goalId, parseInt(goalId, 10)))- .returning({ deleted: goals.goalId });+ const result = await db.delete(goals).where(eq(goals.goalId, parsedGoalId)).returning({ deleted: goals.goalId });if (!result || result.length === 0) {return reply.status(500).send({ error: "Failed to delete goal" });diff --git a/server/src/api/analytics/goals/updateGoal.ts b/server/src/api/analytics/goals/updateGoal.tsindex b18829262..ad0bb84ce 100644--- a/server/src/api/analytics/goals/updateGoal.ts+++ b/server/src/api/analytics/goals/updateGoal.ts@@ -31,11 +31,9 @@ const eventConfigSchema = z});-// Define validation schema for the goal request+// Define validation schema for the goal request bodyconst updateGoalSchema = z.object({- goalId: z.number().int().positive("Goal ID must be a positive integer"),- siteId: z.number().int().positive("Site ID must be a positive integer"),name: z.string().optional(),goalType: z.enum(["path", "event"]),config: z.object({@@ -43,10 +41,14 @@ const updateGoalSchema = zeventName: z.string().optional(),eventPropertyKey: z.string().optional(),eventPropertyValue: z.union([z.string(), z.number(), z.boolean()]).optional(),- propertyFilters: z.array(z.object({- key: z.string(),- value: z.union([z.string(), z.number(), z.boolean()]),- })).optional(),+ propertyFilters: z+ .array(+ z.object({+ key: z.string(),+ value: z.union([z.string(), z.number(), z.boolean()]),+ })+ )+ .optional(),}),}).refine(@@ -68,14 +70,26 @@ type UpdateGoalRequest = z.infer<typeof updateGoalSchema>;export async function updateGoal(request: FastifyRequest<{+ Params: { siteId: string; goalId: string };Body: UpdateGoalRequest;}>,reply: FastifyReply) {try {+ const siteId = parseInt(request.params.siteId, 10);+ const goalId = parseInt(request.params.goalId, 10);++ if (isNaN(siteId) || siteId <= 0) {+ return reply.status(400).send({ error: "Invalid site ID" });+ }++ if (isNaN(goalId) || goalId <= 0) {+ return reply.status(400).send({ error: "Invalid goal ID" });+ }+// Validate the request bodyconst validatedData = updateGoalSchema.parse(request.body);- const { goalId, siteId, name, goalType, config } = validatedData;+ const { name, goalType, config } = validatedData;// Check if the goal existsconst existingGoal = await db.query.goals.findFirst({diff --git a/server/src/lib/auth-middleware.ts b/server/src/lib/auth-middleware.tsindex 52a4faaef..dcfd0582e 100644--- a/server/src/lib/auth-middleware.ts+++ b/server/src/lib/auth-middleware.ts@@ -12,10 +12,22 @@ import { resolveNumericSiteId } from "../utils.js";import { db } from "../db/postgres/postgres.js";type AuthMiddleware = (request: FastifyRequest, reply: FastifyReply) => Promise<void>;+type ApiKeyResult = Awaited<ReturnType<typeof checkApiKey>>;const getSiteIdFromParams = (request: FastifyRequest): string | undefined => {- const params = request.params as Record<string, string>;- return params.siteId;+ const params = request.params as Record<string, string> | undefined;+ return params?.siteId;+};++const getOrganizationIdFromParams = (request: FastifyRequest): string | undefined => {+ const params = request.params as Record<string, string> | undefined;+ return params?.organizationId;+};++const attachApiKeyUser = (request: FastifyRequest, apiKeyResult: ApiKeyResult) => {+ if (apiKeyResult.userId) {+ request.user = { id: apiKeyResult.userId };+ }};/**@@ -36,7 +48,7 @@ export const resolveSiteId: AuthMiddleware = async (request, reply) => {};/**- * Requires valid session or API key. Attaches user to request if session available.+ * Requires valid session or scoped API key. Attaches the authenticated user id to the request.*/export const requireAuth: AuthMiddleware = async (request, reply) => {const session = await getSessionFromReq(request);@@ -45,9 +57,12 @@ export const requireAuth: AuthMiddleware = async (request, reply) => {return;}- // API key provides access but doesn't populate request.user- const apiKeyResult = await checkApiKey(request, {});+ // API keys are validated in the relevant site/org scope when one is present.+ const organizationId = getOrganizationIdFromParams(request);+ const siteId = getSiteIdFromParams(request);+ const apiKeyResult = await checkApiKey(request, { organizationId, siteId });if (apiKeyResult.valid) {+ attachApiKeyUser(request, apiKeyResult);return;}@@ -79,9 +94,10 @@ export const requireSiteAccess: AuthMiddleware = async (request, reply) => {return reply.status(400).send({ error: "Site ID required" });}- // Check API key first (doesn't populate request.user)+ // Check API key first.const apiKeyResult = await checkApiKey(request, { siteId });if (apiKeyResult.valid) {+ attachApiKeyUser(request, apiKeyResult);return;}@@ -109,9 +125,10 @@ export const requireSiteAdminAccess: AuthMiddleware = async (request, reply) =>return reply.status(400).send({ error: "Site ID required" });}- // Check API key with admin/owner role first (doesn't populate request.user)+ // Check API key with admin/owner role first.const apiKeyResult = await checkApiKey(request, { siteId });if (apiKeyResult.valid && (apiKeyResult.role === "admin" || apiKeyResult.role === "owner")) {+ attachApiKeyUser(request, apiKeyResult);return;}@@ -141,6 +158,7 @@ export const allowPublicSiteAccess: AuthMiddleware = async (request, reply) => {const apiKeyResult = await checkApiKey(request, { siteId });if (apiKeyResult.valid) {+ attachApiKeyUser(request, apiKeyResult);return;}@@ -171,6 +189,7 @@ export const requireOrgMember: AuthMiddleware = async (request, reply) => {const apiKeyResult = await checkApiKey(request, { organizationId });if (apiKeyResult.valid) {+ attachApiKeyUser(request, apiKeyResult);return;}@@ -204,6 +223,7 @@ export const requireOrgAdminFromParams: AuthMiddleware = async (request, reply)// Check API key first - must have admin/owner roleconst apiKeyResult = await checkApiKey(request, { organizationId });if (apiKeyResult.valid && (apiKeyResult.role === "admin" || apiKeyResult.role === "owner")) {+ attachApiKeyUser(request, apiKeyResult);return;}diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.tsindex a54b5b67a..823d5dabc 100644--- a/server/src/lib/auth-utils.ts+++ b/server/src/lib/auth-utils.ts@@ -43,9 +43,8 @@ const sitesAccessCache = new NodeCache({});export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = false) {- const session = await getSessionFromReq(req);-- const userId = session?.user.id;+ const session = req.user?.id ? null : await getSessionFromReq(req);+ const userId = req.user?.id ?? session?.user.id;if (!userId) {return [];@@ -121,14 +120,14 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = f// Get specific sites for restricted membersrestrictedMemberIds.length > 0? (async () => {- const siteAccess = await db- .select({ siteId: memberSiteAccess.siteId })- .from(memberSiteAccess)- .where(inArray(memberSiteAccess.memberId, restrictedMemberIds));- const siteIds = siteAccess.map(s => s.siteId);- if (siteIds.length === 0) return [];- return db.select().from(sites).where(inArray(sites.siteId, siteIds));- })()+ const siteAccess = await db+ .select({ siteId: memberSiteAccess.siteId })+ .from(memberSiteAccess)+ .where(inArray(memberSiteAccess.memberId, restrictedMemberIds));+ const siteIds = siteAccess.map(s => s.siteId);+ if (siteIds.length === 0) return [];+ return db.select().from(sites).where(inArray(sites.siteId, siteIds));+ })(): Promise.resolve([]),]);@@ -145,9 +144,7 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = f// Apply team-based filtering for non-admin/owner members// Members who have full org access (not restricted) still need team filtering- const memberOrgIds = memberRecords- .filter(r => r.role === "member")- .map(r => r.organizationId);+ const memberOrgIds = memberRecords.filter(r => r.role === "member").map(r => r.organizationId);if (memberOrgIds.length > 0) {// Find all team-gated sites in the member's orgs@@ -171,7 +168,12 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = fconst userTeamSites = await db.select({ siteId: teamSiteAccess.siteId }).from(teamSiteAccess)- .where(inArray(teamSiteAccess.teamId, userTeams.map(t => t.teamId)));+ .where(+ inArray(+ teamSiteAccess.teamId,+ userTeams.map(t => t.teamId)+ )+ );for (const s of userTeamSites) {userTeamSiteIds.add(s.siteId);}@@ -195,11 +197,7 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = f// Remove team-gated sites the user can't access (only for member-role orgs)for (const [siteId] of siteMap) {- if (- teamGatedSiteIds.has(siteId) &&- !userTeamSiteIds.has(siteId) &&- !adminOrgSiteIds.has(siteId)- ) {+ if (teamGatedSiteIds.has(siteId) && !userTeamSiteIds.has(siteId) && !adminOrgSiteIds.has(siteId)) {siteMap.delete(siteId);}}@@ -234,7 +232,7 @@ export function invalidateSitesAccessCache(userId: string) {export async function checkApiKey(req: FastifyRequest,options: { organizationId?: string; siteId?: string | number }-): Promise<{ valid: boolean; role: string | null; rateLimited?: boolean }> {+): Promise<{ valid: boolean; role: string | null; userId?: string; rateLimited?: boolean }> {// Check if a valid API key was provided// Priority: 1. Authorization: Bearer header (recommended), 2. Query parameter (testing only)const authHeader = req.headers["authorization"];@@ -282,7 +280,7 @@ export async function checkApiKey(.limit(1);if (userMembership.length > 0) {- return { valid: true, role: userMembership[0].role };+ return { valid: true, role: userMembership[0].role, userId: apiKeyUserId };}}return { valid: false, role: null };@@ -301,6 +299,10 @@ export async function checkApiKey(}export async function getUserIdFromRequest(req: FastifyRequest): Promise<string | null> {+ if (req.user?.id) {+ return req.user.id;+ }+// First, check for session-based authconst session = await getSessionFromReq(req);if (session?.user?.id) {