Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Enhance getSitesFromOrg and getSubscription functions to improve user access verification by incorporating session user ID and member role checks, ensuring proper authorization for organization access.

Bill Yangc18a66bccd9c
diff --git a/server/src/api/sites/getSitesFromOrg.ts b/server/src/api/sites/getSitesFromOrg.ts
index bff34f3c1..71e03367b 100644
--- a/server/src/api/sites/getSitesFromOrg.ts
+++ b/server/src/api/sites/getSitesFromOrg.ts
@@ -4,6 +4,7 @@ import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { db } from "../../db/postgres/postgres.js";
import { sites, member, organization, memberSiteAccess } from "../../db/postgres/schema.js";
import { IS_CLOUD, DEFAULT_EVENT_LIMIT } from "../../lib/const.js";
+import { getUserIdFromRequest } from "../../lib/auth-utils.js";
import { processResults } from "../analytics/utils/utils.js";
import { getSubscriptionInner } from "../stripe/getSubscription.js";
@@ -18,7 +19,8 @@ export async function getSitesFromOrg(
try {
const { organizationId } = req.params;
- const userId = req.user?.id;
+ // Use session user ID, falling back to API key user ID
+ const userId = req.user?.id ?? (await getUserIdFromRequest(req));
// Run all database queries concurrently
const [memberCheck, allSitesData, orgInfo] = await Promise.all([
diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.ts
index 085119803..ed3e6bbb4 100644
--- a/server/src/api/stripe/getSubscription.ts
+++ b/server/src/api/stripe/getSubscription.ts
@@ -1,9 +1,9 @@
-import { eq } from "drizzle-orm";
+import { eq, and } from "drizzle-orm";
import { FastifyReply, FastifyRequest } from "fastify";
import { DateTime } from "luxon";
import Stripe from "stripe";
import { db } from "../../db/postgres/postgres.js";
-import { organization } from "../../db/postgres/schema.js";
+import { organization, member } from "../../db/postgres/schema.js";
import { getBestSubscription } from "../../lib/subscriptionUtils.js";
function getStartOfMonth() {
@@ -113,6 +113,17 @@ export async function getSubscription(
return reply.status(400).send({ error: "Organization ID is required" });
}
+ // Verify user is a member of this organization
+ const memberResult = await db
+ .select({ role: member.role })
+ .from(member)
+ .where(and(eq(member.userId, userId), eq(member.organizationId, organizationId)))
+ .limit(1);
+
+ if (!memberResult.length) {
+ return reply.status(403).send({ error: "You do not have access to this organization" });
+ }
+
try {
const responseData = await getSubscriptionInner(organizationId);
return reply.send(responseData);