Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Add admin check. (#1716)
Brian Cao561cde6e7e5e
diff --git a/lib/auth.ts b/lib/auth.tsindex 7ba778c74..1113ebf5d 100644--- a/lib/auth.ts+++ b/lib/auth.ts@@ -1,9 +1,10 @@-import { parseSecureToken, parseToken, ensureArray } from 'next-basics';import debug from 'debug';import cache from 'lib/cache';-import { SHARE_TOKEN_HEADER, PERMISSIONS, ROLE_PERMISSIONS } from 'lib/constants';+import { PERMISSIONS, ROLE_PERMISSIONS, SHARE_TOKEN_HEADER } from 'lib/constants';import { secret } from 'lib/crypto';+import { ensureArray, parseSecureToken, parseToken } from 'next-basics';import { getTeamUser } from 'queries';+import { Auth } from './types';const log = debug('umami:auth');@@ -48,29 +49,51 @@ export function isValidToken(token, validation) {return false;}-export async function canViewWebsite(userId: string, websiteId: string) {+export async function canViewWebsite({ user }: Auth, websiteId: string) {+ if (user.isAdmin) {+ return true;+ }+const website = await cache.fetchWebsite(websiteId);if (website.userId) {- return userId === website.userId;+ return user.id === website.userId;}if (website.teamId) {- return getTeamUser(website.teamId, userId);+ return getTeamUser(website.teamId, user.id);}return false;}-export async function canUpdateWebsite(userId: string, websiteId: string) {+export async function canCreateWebsite({ user }: Auth, teamId?: string) {+ if (user.isAdmin) {+ return true;+ }++ if (teamId) {+ const teamUser = await getTeamUser(teamId, user.id);++ return hasPermission(teamUser.role, PERMISSIONS.websiteCreate);+ }++ return hasPermission(user.role, PERMISSIONS.websiteCreate);+}++export async function canUpdateWebsite({ user }: Auth, websiteId: string) {+ if (user.isAdmin) {+ return true;+ }+const website = await cache.fetchWebsite(websiteId);if (website.userId) {- return userId === website.userId;+ return user.id === website.userId;}if (website.teamId) {- const teamUser = await getTeamUser(website.teamId, userId);+ const teamUser = await getTeamUser(website.teamId, user.id);return hasPermission(teamUser.role, PERMISSIONS.websiteUpdate);}@@ -78,15 +101,19 @@ export async function canUpdateWebsite(userId: string, websiteId: string) {return false;}-export async function canDeleteWebsite(userId: string, websiteId: string) {+export async function canDeleteWebsite({ user }: Auth, websiteId: string) {+ if (user.isAdmin) {+ return true;+ }+const website = await cache.fetchWebsite(websiteId);if (website.userId) {- return userId === website.userId;+ return user.id === website.userId;}if (website.teamId) {- const teamUser = await getTeamUser(website.teamId, userId);+ const teamUser = await getTeamUser(website.teamId, user.id);return hasPermission(teamUser.role, PERMISSIONS.websiteDelete);}@@ -95,33 +122,69 @@ export async function canDeleteWebsite(userId: string, websiteId: string) {}// To-do: Implement when payments are setup.-export async function canCreateTeam(userId: string) {- return !!userId;+export async function canCreateTeam({ user }: Auth) {+ if (user.isAdmin) {+ return true;+ }++ return !!user;}// To-do: Implement when payments are setup.-export async function canViewTeam(userId: string, teamId) {- return getTeamUser(teamId, userId);+export async function canViewTeam({ user }: Auth, teamId: string) {+ if (user.isAdmin) {+ return true;+ }++ return getTeamUser(teamId, user.id);}-export async function canUpdateTeam(userId: string, teamId: string) {- const teamUser = await getTeamUser(teamId, userId);+export async function canUpdateTeam({ user }: Auth, teamId: string) {+ if (user.isAdmin) {+ return true;+ }++ const teamUser = await getTeamUser(teamId, user.id);return hasPermission(teamUser.role, PERMISSIONS.teamUpdate);}-export async function canDeleteTeam(userId: string, teamId: string) {- const teamUser = await getTeamUser(teamId, userId);+export async function canDeleteTeam({ user }: Auth, teamId: string) {+ if (user.isAdmin) {+ return true;+ }++ const teamUser = await getTeamUser(teamId, user.id);return hasPermission(teamUser.role, PERMISSIONS.teamDelete);}-export async function canViewUser(userId: string, viewedUserId: string) {- return userId === viewedUserId;+export async function canCreateUser({ user }: Auth) {+ return user.isAdmin;+}++export async function canViewUser({ user }: Auth, viewedUserId: string) {+ if (user.isAdmin) {+ return true;+ }++ return user.id === viewedUserId;+}++export async function canViewUsers({ user }: Auth) {+ return user.isAdmin;+}++export async function canUpdateUser({ user }: Auth, viewedUserId: string) {+ if (user.isAdmin) {+ return true;+ }++ return user.id === viewedUserId;}-export async function canUpdateUser(userId: string, viewedUserId: string) {- return userId === viewedUserId;+export async function canDeleteUser({ user }: Auth) {+ return user.isAdmin;}export async function hasPermission(role: string, permission: string | string[]) {diff --git a/lib/constants.ts b/lib/constants.tsindex 5407131cb..c2be8f516 100644--- a/lib/constants.ts+++ b/lib/constants.ts@@ -25,7 +25,7 @@ export const REALTIME_INTERVAL = 3000;export const EVENT_TYPE = {pageView: 1,customEvent: 2,-};+} as const;export const ROLES = {admin: 'admin',@@ -43,7 +43,7 @@ export const PERMISSIONS = {teamCreate: 'team:create',teamUpdate: 'team:update',teamDelete: 'team:delete',-};+} as const;export const ROLE_PERMISSIONS = {[ROLES.admin]: [PERMISSIONS.all],@@ -66,7 +66,7 @@ export const ROLE_PERMISSIONS = {PERMISSIONS.websiteDelete,],[ROLES.teamGuest]: [],-};+} as const;export const THEME_COLORS = {light: {diff --git a/pages/api/teams/[id]/index.ts b/pages/api/teams/[id]/index.tsindex a3ccd0b6d..4612f4ed1 100644--- a/pages/api/teams/[id]/index.ts+++ b/pages/api/teams/[id]/index.ts@@ -20,13 +20,10 @@ export default async () => {await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: teamId } = req.query;if (req.method === 'GET') {- if (!(await canViewTeam(userId, teamId))) {+ if (!(await canViewTeam(req.auth, teamId))) {return unauthorized(res);}@@ -38,7 +35,7 @@ export default async (if (req.method === 'POST') {const { name } = req.body;- if (!(await canUpdateTeam(userId, teamId))) {+ if (!(await canUpdateTeam(req.auth, teamId))) {return unauthorized(res, 'You must be the owner of this team.');}@@ -48,7 +45,7 @@ export default async (}if (req.method === 'DELETE') {- if (!(await canDeleteTeam(userId, teamId))) {+ if (!(await canDeleteTeam(req.auth, teamId))) {return unauthorized(res, 'You must be the owner of this team.');}diff --git a/pages/api/teams/[id]/users.ts b/pages/api/teams/[id]/users.tsindex e90dc6484..a5da215a6 100644--- a/pages/api/teams/[id]/users.ts+++ b/pages/api/teams/[id]/users.ts@@ -21,13 +21,10 @@ export default async () => {await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: teamId } = req.query;if (req.method === 'GET') {- if (!(await canViewTeam(userId, teamId))) {+ if (!(await canViewTeam(req.auth, teamId))) {return unauthorized(res);}@@ -37,7 +34,7 @@ export default async (}if (req.method === 'POST') {- if (!(await canUpdateTeam(userId, teamId))) {+ if (!(await canUpdateTeam(req.auth, teamId))) {return unauthorized(res, 'You must be the owner of this team.');}@@ -56,7 +53,7 @@ export default async (}if (req.method === 'DELETE') {- if (await canUpdateTeam(userId, teamId)) {+ if (await canUpdateTeam(req.auth, teamId)) {return unauthorized(res, 'You must be the owner of this team.');}const { teamUserId } = req.body;diff --git a/pages/api/teams/[id]/websites.ts b/pages/api/teams/[id]/websites.tsindex d1f22da8a..0e610649d 100644--- a/pages/api/teams/[id]/websites.ts+++ b/pages/api/teams/[id]/websites.ts@@ -20,13 +20,10 @@ export default async () => {await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: teamId } = req.query;if (req.method === 'GET') {- if (await canViewTeam(userId, teamId)) {+ if (await canViewTeam(req.auth, teamId)) {return unauthorized(res);}diff --git a/pages/api/teams/index.ts b/pages/api/teams/index.tsindex 46cf65a90..145278986 100644--- a/pages/api/teams/index.ts+++ b/pages/api/teams/index.ts@@ -28,7 +28,7 @@ export default async (}if (req.method === 'POST') {- if (!(await canCreateTeam(userId))) {+ if (!(await canCreateTeam(req.auth))) {return unauthorized(res);}diff --git a/pages/api/users/[id]/index.ts b/pages/api/users/[id]/index.tsindex d31039f1e..25fa337b4 100644--- a/pages/api/users/[id]/index.ts+++ b/pages/api/users/[id]/index.ts@@ -1,5 +1,5 @@import { NextApiRequestQueryBody } from 'lib/types';-import { canUpdateUser, canViewUser } from 'lib/auth';+import { canDeleteUser, canUpdateUser, canViewUser } from 'lib/auth';import { useAuth } from 'lib/middleware';import { NextApiResponse } from 'next';import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';@@ -26,7 +26,7 @@ export default async (const { id } = req.query;if (req.method === 'GET') {- if (!isAdmin && !(await canViewUser(userId, id))) {+ if (!(await canViewUser(req.auth, id))) {return unauthorized(res);}@@ -36,7 +36,7 @@ export default async (}if (req.method === 'POST') {- if (!isAdmin && !(await canUpdateUser(userId, id))) {+ if (!(await canUpdateUser(req.auth, id))) {return unauthorized(res);}@@ -71,7 +71,7 @@ export default async (}if (req.method === 'DELETE') {- if (!isAdmin) {+ if (!(await canDeleteUser(req.auth))) {return unauthorized(res);}diff --git a/pages/api/users/[id]/password.ts b/pages/api/users/[id]/password.tsindex 8fabb3559..862609e10 100644--- a/pages/api/users/[id]/password.ts+++ b/pages/api/users/[id]/password.ts@@ -29,12 +29,9 @@ export default async (const { currentPassword, newPassword } = req.body;const { id } = req.query;- const {- user: { id: userId, isAdmin },- } = req.auth;if (req.method === 'POST') {- if (!isAdmin && !(await canUpdateUser(userId, id))) {+ if (!(await canUpdateUser(req.auth, id))) {return unauthorized(res);}diff --git a/pages/api/users/[id]/websites.ts b/pages/api/users/[id]/websites.tsindex bc79f91a4..ec151c954 100644--- a/pages/api/users/[id]/websites.ts+++ b/pages/api/users/[id]/websites.ts@@ -1,9 +1,10 @@import { Prisma } from '@prisma/client';-import { NextApiRequestQueryBody } from 'lib/types';+import { canCreateWebsite } from 'lib/auth';import { uuid } from 'lib/crypto';import { useAuth, useCors } from 'lib/middleware';+import { NextApiRequestQueryBody } from 'lib/types';import { NextApiResponse } from 'next';-import { methodNotAllowed, ok } from 'next-basics';+import { methodNotAllowed, ok, unauthorized } from 'next-basics';import { createWebsite, getUserWebsites } from 'queries';export interface WebsitesRequestQuery {}@@ -35,6 +36,10 @@ export default async (if (req.method === 'POST') {const { name, domain, shareId, teamId } = req.body;+ if (!(await canCreateWebsite(req.auth, teamId))) {+ return unauthorized(res);+ }+const data: Prisma.WebsiteUncheckedCreateInput = {id: uuid(),name,diff --git a/pages/api/users/index.ts b/pages/api/users/index.tsindex 4abe4353d..89d4d5643 100644--- a/pages/api/users/index.ts+++ b/pages/api/users/index.ts@@ -1,7 +1,8 @@-import { NextApiRequestQueryBody } from 'lib/types';+import { canCreateUser, canViewUsers } from 'lib/auth';+import { ROLES } from 'lib/constants';import { uuid } from 'lib/crypto';import { useAuth } from 'lib/middleware';-import { ROLES } from 'lib/constants';+import { NextApiRequestQueryBody } from 'lib/types';import { NextApiResponse } from 'next';import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';import { createUser, getUser, getUsers, User } from 'queries';@@ -18,12 +19,8 @@ export default async () => {await useAuth(req, res);- const {- user: { isAdmin },- } = req.auth;-if (req.method === 'GET') {- if (!isAdmin) {+ if (!(await canViewUsers(req.auth))) {return unauthorized(res);}@@ -33,7 +30,7 @@ export default async (}if (req.method === 'POST') {- if (!isAdmin) {+ if (!(await canCreateUser(req.auth))) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/active.ts b/pages/api/websites/[id]/active.tsindex 1d007f7f7..1cfcd54ce 100644--- a/pages/api/websites/[id]/active.ts+++ b/pages/api/websites/[id]/active.ts@@ -17,13 +17,10 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: websiteId } = req.query;if (req.method === 'GET') {- if (await canViewWebsite(userId, websiteId)) {+ if (await canViewWebsite(req.auth, websiteId)) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/eventdata.ts b/pages/api/websites/[id]/eventdata.tsindex 9e21eb132..023a68781 100644--- a/pages/api/websites/[id]/eventdata.ts+++ b/pages/api/websites/[id]/eventdata.ts@@ -24,13 +24,10 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: websiteId } = req.query;if (req.method === 'POST') {- if (canViewWebsite(userId, websiteId)) {+ if (!(await canViewWebsite(req.auth, websiteId))) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/events.ts b/pages/api/websites/[id]/events.tsindex 088f2ff49..918a95421 100644--- a/pages/api/websites/[id]/events.ts+++ b/pages/api/websites/[id]/events.ts@@ -25,13 +25,10 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: websiteId, startAt, endAt, unit, tz, url, eventName } = req.query;if (req.method === 'GET') {- if (canViewWebsite(userId, websiteId)) {+ if (!(await canViewWebsite(req.auth, websiteId))) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/index.ts b/pages/api/websites/[id]/index.tsindex 2f11ec701..671f62748 100644--- a/pages/api/websites/[id]/index.ts+++ b/pages/api/websites/[id]/index.ts@@ -22,13 +22,10 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: websiteId } = req.query;if (req.method === 'GET') {- if (!(await canViewWebsite(userId, websiteId))) {+ if (!(await canViewWebsite(req.auth, websiteId))) {return unauthorized(res);}@@ -38,7 +35,7 @@ export default async (}if (req.method === 'POST') {- if (!(await canUpdateWebsite(userId, websiteId))) {+ if (!(await canUpdateWebsite(req.auth, websiteId))) {return unauthorized(res);}@@ -56,7 +53,7 @@ export default async (}if (req.method === 'DELETE') {- if (!(await canDeleteWebsite(userId, websiteId))) {+ if (!(await canDeleteWebsite(req.auth, websiteId))) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/metrics.ts b/pages/api/websites/[id]/metrics.tsindex 62497dbd5..25759531f 100644--- a/pages/api/websites/[id]/metrics.ts+++ b/pages/api/websites/[id]/metrics.ts@@ -55,9 +55,6 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const {id: websiteId,type,@@ -72,7 +69,7 @@ export default async (} = req.query;if (req.method === 'GET') {- if (!(await canViewWebsite(userId, websiteId))) {+ if (!(await canViewWebsite(req.auth, websiteId))) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/pageviews.ts b/pages/api/websites/[id]/pageviews.tsindex 098a31929..19303aa32 100644--- a/pages/api/websites/[id]/pageviews.ts+++ b/pages/api/websites/[id]/pageviews.ts@@ -30,9 +30,6 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const {id: websiteId,startAt,@@ -48,7 +45,7 @@ export default async (} = req.query;if (req.method === 'GET') {- if (!(await canViewWebsite(userId, websiteId))) {+ if (!(await canViewWebsite(req.auth, websiteId))) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/reset.ts b/pages/api/websites/[id]/reset.tsindex 292672aee..dc98c5913 100644--- a/pages/api/websites/[id]/reset.ts+++ b/pages/api/websites/[id]/reset.ts@@ -16,13 +16,10 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: websiteId } = req.query;if (req.method === 'POST') {- if (!(await canViewWebsite(userId, websiteId))) {+ if (!(await canViewWebsite(req.auth, websiteId))) {return unauthorized(res);}diff --git a/pages/api/websites/[id]/stats.ts b/pages/api/websites/[id]/stats.tsindex f0ce4b6b4..272626151 100644--- a/pages/api/websites/[id]/stats.ts+++ b/pages/api/websites/[id]/stats.ts@@ -26,13 +26,10 @@ export default async (await useCors(req, res);await useAuth(req, res);- const {- user: { id: userId },- } = req.auth;const { id: websiteId, startAt, endAt, url, referrer, os, browser, device, country } = req.query;if (req.method === 'GET') {- if (!(await canViewWebsite(userId, websiteId))) {+ if (!(await canViewWebsite(req.auth, websiteId))) {return unauthorized(res);}diff --git a/pages/api/websites/index.ts b/pages/api/websites/index.tsindex bc79f91a4..ec151c954 100644--- a/pages/api/websites/index.ts+++ b/pages/api/websites/index.ts@@ -1,9 +1,10 @@import { Prisma } from '@prisma/client';-import { NextApiRequestQueryBody } from 'lib/types';+import { canCreateWebsite } from 'lib/auth';import { uuid } from 'lib/crypto';import { useAuth, useCors } from 'lib/middleware';+import { NextApiRequestQueryBody } from 'lib/types';import { NextApiResponse } from 'next';-import { methodNotAllowed, ok } from 'next-basics';+import { methodNotAllowed, ok, unauthorized } from 'next-basics';import { createWebsite, getUserWebsites } from 'queries';export interface WebsitesRequestQuery {}@@ -35,6 +36,10 @@ export default async (if (req.method === 'POST') {const { name, domain, shareId, teamId } = req.body;+ if (!(await canCreateWebsite(req.auth, teamId))) {+ return unauthorized(res);+ }+const data: Prisma.WebsiteUncheckedCreateInput = {id: uuid(),name,diff --git a/pages/console/[[...id]].js b/pages/console/[[...id]].jsindex 270a81df2..fa73c3a9e 100644--- a/pages/console/[[...id]].js+++ b/pages/console/[[...id]].js@@ -3,12 +3,13 @@ import Layout from 'components/layout/Layout';import TestConsole from 'components/pages/TestConsole';import useRequireLogin from 'hooks/useRequireLogin';import useUser from 'hooks/useUser';+import { ROLES } from 'lib/constants';export default function ConsolePage({ pageDisabled }) {const { loading } = useRequireLogin();const { user } = useUser();- if (pageDisabled || loading || !user?.isAdmin) {+ if (pageDisabled || loading || user?.role !== ROLES.admin) {return null;}