Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ProjectAccess): correct access check #3139

Merged
merged 1 commit into from
Jan 15, 2025
Merged

fix(ProjectAccess): correct access check #3139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 14 additions & 0 deletions src/utils/anyEntityCheck.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export const oneOf =
<T>(...funcs: Array<(arg: T) => boolean>) =>
(arg: T) =>
funcs.some((f) => f(arg));

export const and =
<T>(...funcs: Array<(arg: T) => boolean>) =>
(arg: T) =>
funcs.every((f) => f(arg));

export const inverse =
<T>(func: (arg: T) => boolean) =>
(arg: T) =>
!func(arg);
73 changes: 43 additions & 30 deletions trpc/queries/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Role } from '@prisma/client';

import { QueryWithFilters } from '../../src/schema/common';
import { oneOf, and, inverse } from '../../src/utils/anyEntityCheck';

import { goalsFilter } from './goals';
import { getProjectAccessFilter } from './access';
Expand Down Expand Up @@ -41,45 +42,57 @@ export const addCalculatedProjectFields = <
};
};

export const checkProjectAccess = <
T extends {
accessUsers: WithId[];
activityId: string;
archived?: boolean | null;
personal: boolean | null;
goalAccessIds?: string[];
},
>(
project: T,
activityId: string,
role: Role,
) => {
if (role === 'ADMIN') {
return !project.archived;
}

if (project.archived) {
return false;
}
interface ProjectAccessEntity {
accessUsers: WithId[];
activityId: string;
archived?: boolean | null;
personal: boolean | null;
goalAccessIds?: string[];
}

if (project.personal) {
if (project.goalAccessIds?.length) {
return project.goalAccessIds.includes(activityId);
}
interface ProjectEntity {
project: ProjectAccessEntity;
}

if (project.accessUsers.length) {
return project.accessUsers.some(({ id }) => id === activityId);
}
interface UserEntity {
activityId: string;
role: Role;
}

return project.activityId === activityId;
}
const notArchivedProject = ({ project }: ProjectEntity & UserEntity) => project.archived !== true;
const projectIsPersonal = ({ project }: ProjectEntity & UserEntity) => project.personal === true;
const userIsProjectOwner = ({ project, activityId }: ProjectEntity & UserEntity) => project.activityId === activityId;

const publicProject = and<ProjectEntity & UserEntity>(
inverse(projectIsPersonal),
({ project }) => project.accessUsers.length === 0 || project.accessUsers == null,
);
const userHadAccess = ({ project, activityId }: ProjectEntity & UserEntity) => {
if (project.accessUsers.length) {
return project.accessUsers.some(({ id }) => id === activityId);
}

return true;
return false;
};
const userHadGoalsInProject = ({ project, activityId }: ProjectEntity & UserEntity) => {
if (project.goalAccessIds?.length) {
return project.goalAccessIds.some((id) => id === activityId);
}

return false;
};

const checkProjectEntity = and<ProjectEntity & UserEntity>(
notArchivedProject,
oneOf(
and(projectIsPersonal, oneOf(userIsProjectOwner, userHadGoalsInProject)),
and(inverse(projectIsPersonal), oneOf(userIsProjectOwner, userHadAccess, userHadGoalsInProject)),
and(inverse(projectIsPersonal), publicProject),
),
);

export const checkProjectAccess = <T extends ProjectAccessEntity>(project: T, activityId: string, role: Role) =>
checkProjectEntity({ project, activityId, role });

export const getProjectSchema = ({
role,
Expand Down
Loading