feat: implement environment access control and service filtering based on user permissions, enhancing security and usability in environment management

apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx

@@ -208,66 +208,81 @@ export const AdvancedEnvironmentSelector = ({
 					<DropdownMenuLabel>Environments</DropdownMenuLabel>
 					<DropdownMenuSeparator />
 
-					{environments?.map((environment) => (
-						<div key={environment.environmentId} className="flex items-center">
-							<DropdownMenuItem
-								className="flex-1 cursor-pointer"
-								onClick={() => {
-									router.push(
-										`/dashboard/project/${projectId}/environment/${environment.environmentId}`,
-									);
-								}}
+					{environments?.map((environment) => {
+						const servicesCount =
+							environment.mariadb.length +
+							environment.mongo.length +
+							environment.mysql.length +
+							environment.postgres.length +
+							environment.redis.length +
+							environment.applications.length +
+							environment.compose.length;
+						return (
+							<div
+								key={environment.environmentId}
+								className="flex items-center"
 							>
-								<div className="flex items-center justify-between w-full">
-									<span>{environment.name}</span>
-									{environment.environmentId === currentEnvironmentId && (
-										<div className="w-2 h-2 bg-blue-500 rounded-full" />
-									)}
-								</div>
-							</DropdownMenuItem>
-
-							{/* Action buttons for non-production environments */}
-							<EnvironmentVariables environmentId={environment.environmentId}>
-								<Button
-									variant="ghost"
-									size="sm"
-									className="h-6 w-6 p-0"
-									onClick={(e) => {
-										e.stopPropagation();
+								<DropdownMenuItem
+									className="flex-1 cursor-pointer"
+									onClick={() => {
+										router.push(
+											`/dashboard/project/${projectId}/environment/${environment.environmentId}`,
+										);
 									}}
 								>
-									<Terminal className="h-3 w-3" />
-								</Button>
-							</EnvironmentVariables>
-							{environment.name !== "production" && (
-								<div className="flex items-center gap-1 px-2">
+									<div className="flex items-center justify-between w-full">
+										<span>
+											{environment.name} ({servicesCount})
+										</span>
+										{environment.environmentId === currentEnvironmentId && (
+											<div className="w-2 h-2 bg-blue-500 rounded-full" />
+										)}
+									</div>
+								</DropdownMenuItem>
+
+								{/* Action buttons for non-production environments */}
+								<EnvironmentVariables environmentId={environment.environmentId}>
 									<Button
 										variant="ghost"
 										size="sm"
 										className="h-6 w-6 p-0"
 										onClick={(e) => {
 											e.stopPropagation();
-											openEditDialog(environment);
 										}}
 									>
-										<PencilIcon className="h-3 w-3" />
+										<Terminal className="h-3 w-3" />
 									</Button>
+								</EnvironmentVariables>
+								{environment.name !== "production" && (
+									<div className="flex items-center gap-1 px-2">
+										<Button
+											variant="ghost"
+											size="sm"
+											className="h-6 w-6 p-0"
+											onClick={(e) => {
+												e.stopPropagation();
+												openEditDialog(environment);
+											}}
+										>
+											<PencilIcon className="h-3 w-3" />
+										</Button>
 
-									<Button
-										variant="ghost"
-										size="sm"
-										className="h-6 w-6 p-0 text-red-600 hover:text-red-700"
-										onClick={(e) => {
-											e.stopPropagation();
-											openDeleteDialog(environment);
-										}}
-									>
-										<TrashIcon className="h-3 w-3" />
-									</Button>
-								</div>
-							)}
-						</div>
-					))}
+										<Button
+											variant="ghost"
+											size="sm"
+											className="h-6 w-6 p-0 text-red-600 hover:text-red-700"
+											onClick={(e) => {
+												e.stopPropagation();
+												openDeleteDialog(environment);
+											}}
+										>
+											<TrashIcon className="h-3 w-3" />
+										</Button>
+									</div>
+								)}
+							</div>
+						);
+					})}
 
 					<DropdownMenuSeparator />
 					<DropdownMenuItem

apps/dokploy/server/api/routers/environment.ts

@@ -1,4 +1,6 @@
 import {
+	addNewEnvironment,
+	checkEnvironmentAccess,
 	createEnvironment,
 	deleteEnvironment,
 	duplicateEnvironment,
@@ -18,16 +20,53 @@ import {
 	apiUpdateEnvironment,
 } from "@/server/db/schema";
 
+// Helper function to filter services within an environment based on user permissions
+const filterEnvironmentServices = (
+	environment: any,
+	accessedServices: string[],
+) => ({
+	...environment,
+	applications: environment.applications.filter((app: any) =>
+		accessedServices.includes(app.applicationId),
+	),
+	mariadb: environment.mariadb.filter((db: any) =>
+		accessedServices.includes(db.mariadbId),
+	),
+	mongo: environment.mongo.filter((db: any) =>
+		accessedServices.includes(db.mongoId),
+	),
+	mysql: environment.mysql.filter((db: any) =>
+		accessedServices.includes(db.mysqlId),
+	),
+	postgres: environment.postgres.filter((db: any) =>
+		accessedServices.includes(db.postgresId),
+	),
+	redis: environment.redis.filter((db: any) =>
+		accessedServices.includes(db.redisId),
+	),
+	compose: environment.compose.filter((comp: any) =>
+		accessedServices.includes(comp.composeId),
+	),
+});
+
 export const environmentRouter = createTRPCRouter({
 	create: protectedProcedure
 		.input(apiCreateEnvironment)
-		.mutation(async ({ input }) => {
+		.mutation(async ({ input, ctx }) => {
 			try {
 				// Check if user has access to the project
 				// This would typically involve checking project ownership/membership
 				// For now, we'll use a basic organization check
 
 				const environment = await createEnvironment(input);
+
+				if (ctx.user.role === "member") {
+					await addNewEnvironment(
+						ctx.user.id,
+						environment.environmentId,
+						ctx.session.activeOrganizationId,
+					);
+				}
 				return environment;
 			} catch (error) {
 				throw new TRPCError({
@@ -42,6 +81,14 @@ export const environmentRouter = createTRPCRouter({
 		.input(apiFindOneEnvironment)
 		.query(async ({ input, ctx }) => {
 			try {
+				if (ctx.user.role === "member") {
+					await checkEnvironmentAccess(
+						ctx.user.id,
+						input.environmentId,
+						ctx.session.activeOrganizationId,
+						"access",
+					);
+				}
 				const environment = await findEnvironmentById(input.environmentId);
 				if (
 					environment.project.organizationId !==
@@ -66,30 +113,10 @@ export const environmentRouter = createTRPCRouter({
 					}
 
 					// Filter services based on member permissions
-					const filteredEnvironment = {
-						...environment,
-						applications: environment.applications.filter((app) =>
-							accessedServices.includes(app.applicationId),
-						),
-						mariadb: environment.mariadb.filter((db) =>
-							accessedServices.includes(db.mariadbId),
-						),
-						mongo: environment.mongo.filter((db) =>
-							accessedServices.includes(db.mongoId),
-						),
-						mysql: environment.mysql.filter((db) =>
-							accessedServices.includes(db.mysqlId),
-						),
-						postgres: environment.postgres.filter((db) =>
-							accessedServices.includes(db.postgresId),
-						),
-						redis: environment.redis.filter((db) =>
-							accessedServices.includes(db.redisId),
-						),
-						compose: environment.compose.filter((comp) =>
-							accessedServices.includes(comp.composeId),
-						),
-					};
+					const filteredEnvironment = filterEnvironmentServices(
+						environment,
+						accessedServices,
+					);
 
 					return filteredEnvironment;
 				}
@@ -125,15 +152,17 @@ export const environmentRouter = createTRPCRouter({
 
 				// Filter environments for members based on their permissions
 				if (ctx.user.role === "member") {
-					const { accessedEnvironments } = await findMemberById(
-						ctx.user.id,
-						ctx.session.activeOrganizationId,
-					);
+					const { accessedEnvironments, accessedServices } =
+						await findMemberById(ctx.user.id, ctx.session.activeOrganizationId);
 
 					// Filter environments to only show those the member has access to
-					const filteredEnvironments = environments.filter((environment) =>
-						accessedEnvironments.includes(environment.environmentId),
-					);
+					const filteredEnvironments = environments
+						.filter((environment) =>
+							accessedEnvironments.includes(environment.environmentId),
+						)
+						.map((environment) =>
+							filterEnvironmentServices(environment, accessedServices),
+						);
 
 					return filteredEnvironments;
 				}
@@ -151,6 +180,14 @@ export const environmentRouter = createTRPCRouter({
 		.input(apiRemoveEnvironment)
 		.mutation(async ({ input, ctx }) => {
 			try {
+				if (ctx.user.role === "member") {
+					await checkEnvironmentAccess(
+						ctx.user.id,
+						input.environmentId,
+						ctx.session.activeOrganizationId,
+						"access",
+					);
+				}
 				const environment = await findEnvironmentById(input.environmentId);
 				if (
 					environment.project.organizationId !==
@@ -192,6 +229,14 @@ export const environmentRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				const { environmentId, ...updateData } = input;
+				if (ctx.user.role === "member") {
+					await checkEnvironmentAccess(
+						ctx.user.id,
+						environmentId,
+						ctx.session.activeOrganizationId,
+						"access",
+					);
+				}
 				const currentEnvironment = await findEnvironmentById(environmentId);
 				if (
 					currentEnvironment.project.organizationId !==
@@ -237,6 +282,14 @@ export const environmentRouter = createTRPCRouter({
 		.input(apiDuplicateEnvironment)
 		.mutation(async ({ input, ctx }) => {
 			try {
+				if (ctx.user.role === "member") {
+					await checkEnvironmentAccess(
+						ctx.user.id,
+						input.environmentId,
+						ctx.session.activeOrganizationId,
+						"access",
+					);
+				}
 				const environment = await findEnvironmentById(input.environmentId);
 				if (
 					environment.project.organizationId !==

packages/server/src/services/user.ts

@@ -23,6 +23,23 @@ export const addNewProject = async (
 		);
 };
 
+export const addNewEnvironment = async (
+	userId: string,
+	environmentId: string,
+	organizationId: string,
+) => {
+	const userR = await findMemberById(userId, organizationId);
+
+	await db
+		.update(member)
+		.set({
+			accessedEnvironments: [...userR.accessedEnvironments, environmentId],
+		})
+		.where(
+			and(eq(member.id, userR.id), eq(member.organizationId, organizationId)),
+		);
+};
+
 export const addNewService = async (
 	userId: string,
 	serviceId: string,
@@ -131,6 +148,21 @@ export const canPerformAccessProject = async (
 	return false;
 };
 
+export const canPerformAccessEnvironment = async (
+	userId: string,
+	environmentId: string,
+	organizationId: string,
+) => {
+	const { accessedEnvironments } = await findMemberById(userId, organizationId);
+	const haveAccessToEnvironment = accessedEnvironments.includes(environmentId);
+
+	if (haveAccessToEnvironment) {
+		return true;
+	}
+
+	return false;
+};
+
 export const canAccessToTraefikFiles = async (
 	userId: string,
 	organizationId: string,
@@ -182,6 +214,32 @@ export const checkServiceAccess = async (
 	}
 };
 
+export const checkEnvironmentAccess = async (
+	userId: string,
+	environmentId: string,
+	organizationId: string,
+	action = "access" as const,
+) => {
+	let hasPermission = false;
+	switch (action) {
+		case "access":
+			hasPermission = await canPerformAccessEnvironment(
+				userId,
+				environmentId,
+				organizationId,
+			);
+			break;
+		default:
+			hasPermission = false;
+	}
+	if (!hasPermission) {
+		throw new TRPCError({
+			code: "UNAUTHORIZED",
+			message: "Permission denied",
+		});
+	}
+};
+
 export const checkProjectAccess = async (
 	authId: string,
 	action: "create" | "delete" | "access",