Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
misc: addressed feedback
Sheen Capadnganac878fdaa626
diff --git a/backend/src/ee/routes/v1/pam-routers/pam-folder-router.ts b/backend/src/ee/routes/v1/pam-routers/pam-folder-router.tsindex 4e95c9a136..a10a26238b 100644--- a/backend/src/ee/routes/v1/pam-routers/pam-folder-router.ts+++ b/backend/src/ee/routes/v1/pam-routers/pam-folder-router.ts@@ -44,7 +44,7 @@ export const registerPamFolderRouter = async (server: FastifyZodProvider) => {.optional().transform((v) => v === "true").describe(- "For product admins, also return the folders they hold no membership on, so they can join one as admin. Ignored for everyone else and when filterByAction is set."+ "For users holding the organization Admin role, also return the folders they hold no membership on, so they can join one as admin. Ignored for everyone else and when filterByAction is set.")}),response: {@@ -56,7 +56,7 @@ export const registerPamFolderRouter = async (server: FastifyZodProvider) => {.nativeEnum(PamFolderCallerAccess).optional().describe(- "The caller's own access to the folder. Returned only when a product admin sets includeNonMemberFolders."+ "The caller's own access to the folder. Returned only when an organization admin sets includeNonMemberFolders.")}))@@ -81,14 +81,15 @@ export const registerPamFolderRouter = async (server: FastifyZodProvider) => {}});- // RPC-shaped on purpose, to match the org admin's POST /organization-admin/projects/:projectId/grant-admin-access.+ // RPC-shaped on purpose: an explicit action, not a membership resource, matching the org admin's+ // grant-admin-access endpoint elsewhere in the product.server.route({method: "POST",url: "/:folderId/grant-admin-access",schema: {operationId: "grantPamFolderAdminAccess",description:- "Make the calling product admin an admin of a PAM folder, replacing any role they already hold on it. Only product admins can call this, and every call is recorded in the audit log.",+ "Make the calling organization admin an admin of a PAM folder, replacing any role they already hold on it. Only users holding the organization Admin role can call this, and every call is recorded in the audit log.",tags: [ApiDocsTags.PamFolders],params: z.object({folderId: z.string().uuid().describe("The ID of the folder")@@ -98,7 +99,7 @@ export const registerPamFolderRouter = async (server: FastifyZodProvider) => {}},config: { rateLimit: writeLimit },- onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),+ onRequest: verifyAuth([AuthMode.JWT]),handler: async (req) => {const { folder, previousRole } = await server.services.pamFolder.grantAdminAccess({folderId: req.params.folderId,@@ -114,7 +115,7 @@ export const registerPamFolderRouter = async (server: FastifyZodProvider) => {orgId: req.permission.orgId,projectId: req.internalPamProjectId,event: {- type: EventType.PAM_PRODUCT_ADMIN_ACCESS_FOLDER,+ type: EventType.ORG_ADMIN_ACCESS_PAM_FOLDER,metadata: {folderId: folder.id,folderName: folder.name,diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.tsindex 47b2636231..f492247cd0 100644--- a/backend/src/ee/services/audit-log/audit-log-types.ts+++ b/backend/src/ee/services/audit-log/audit-log-types.ts@@ -777,7 +777,7 @@ export enum EventType {PAM_FOLDER_CREATE = "pam-folder-create",PAM_FOLDER_UPDATE = "pam-folder-update",PAM_FOLDER_DELETE = "pam-folder-delete",- PAM_PRODUCT_ADMIN_ACCESS_FOLDER = "pam-product-admin-accessed-folder",+ ORG_ADMIN_ACCESS_PAM_FOLDER = "org-admin-accessed-pam-folder",PAM_PRODUCT_MEMBER_ADD = "pam-product-member-add",PAM_PRODUCT_MEMBER_UPDATE = "pam-product-member-update",PAM_PRODUCT_MEMBER_REMOVE = "pam-product-member-remove",@@ -6229,8 +6229,8 @@ interface PamFolderDeleteEvent {};}-interface PamProductAdminAccessFolderEvent {- type: EventType.PAM_PRODUCT_ADMIN_ACCESS_FOLDER;+interface OrgAdminAccessPamFolderEvent {+ type: EventType.ORG_ADMIN_ACCESS_PAM_FOLDER;metadata: {folderId: string;folderName: string;@@ -8497,7 +8497,7 @@ export type Event =| PamFolderCreateEvent| PamFolderUpdateEvent| PamFolderDeleteEvent- | PamProductAdminAccessFolderEvent+ | OrgAdminAccessPamFolderEvent| PamProductMemberAddEvent| PamProductMemberUpdateEvent| PamProductMemberRemoveEventdiff --git a/backend/src/ee/services/pam-folder/pam-folder-service.ts b/backend/src/ee/services/pam-folder/pam-folder-service.tsindex 9c87431742..60e8d594e4 100644--- a/backend/src/ee/services/pam-folder/pam-folder-service.ts+++ b/backend/src/ee/services/pam-folder/pam-folder-service.ts@@ -2,7 +2,8 @@ import { ForbiddenError } from "@casl/ability";import { packRules } from "@casl/ability/extra";import { Knex } from "knex";-import { RESOURCE_SCOPE, ResourceType, TPamFolders } from "@app/db/schemas";+import { OrganizationActionScope, OrgMembershipRole, RESOURCE_SCOPE, ResourceType, TPamFolders } from "@app/db/schemas";+import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";import { isActiveRole } from "@app/ee/services/permission/permission-fns";import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";import {@@ -13,7 +14,6 @@ import { DatabaseErrorCode } from "@app/lib/error-codes";import { BadRequestError, ConflictError, DatabaseError, ForbiddenRequestError, NotFoundError } from "@app/lib/errors";import { logger } from "@app/lib/logger";import { ActorType } from "@app/services/auth/auth-type";-import { TIdentityDALFactory } from "@app/services/identity/identity-dal";import { TMembershipDALFactory } from "@app/services/membership/membership-dal";import { TMembershipRoleDALFactory } from "@app/services/membership/membership-role-dal";import { TNotificationServiceFactory } from "@app/services/notification/notification-service";@@ -47,10 +47,13 @@ type TPamFolderServiceFactoryDep = {| "transaction">;membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "delete" | "find">;- permissionService: Pick<TPermissionServiceFactory, "getProjectPermission" | "getResourcePermission">;+ permissionService: Pick<+ TPermissionServiceFactory,+ "getOrgPermission" | "getProjectPermission" | "getResourcePermission"+ >;pamAccessRequestService: Pick<TPamAccessRequestServiceFactory, "cleanupFolderResources">;userDAL: Pick<TUserDALFactory, "find" | "findById">;- identityDAL: Pick<TIdentityDALFactory, "findById">;+ userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find">;notificationService: Pick<TNotificationServiceFactory, "createUserNotifications">;smtpService: Pick<TSmtpService, "sendMail">;};@@ -64,13 +67,28 @@ export const pamFolderServiceFactory = ({permissionService,pamAccessRequestService,userDAL,- identityDAL,+ userGroupMembershipDAL,notificationService,smtpService}: TPamFolderServiceFactoryDep) => {const verifyMembership = (projectId: string, ctx: TActorContext) =>verifyProductMembership(permissionService, projectId, ctx);+ // Joining a folder is for a person holding the org Admin role itself, the highest privilege there is, so it is+ // no escalation. Machine identities are excluded so the decision to enter a folder is always a human one.+ const canJoinFolders = async (ctx: TActorContext) => {+ if (ctx.actor !== ActorType.USER) return false;+ const { hasRole } = await permissionService.getOrgPermission({+ actor: ctx.actor,+ actorId: ctx.actorId,+ orgId: ctx.actorOrgId,+ actorAuthMethod: ctx.actorAuthMethod,+ actorOrgId: ctx.actorOrgId,+ scope: OrganizationActionScope.Any+ });+ return hasRole(OrgMembershipRole.Admin);+ };+const verifyProductAdmin = async (projectId: string, ctx: TActorContext) => {const { hasRole } = await verifyMembership(projectId, ctx);if (!hasRole(PamProductRole.Admin)) {@@ -104,7 +122,7 @@ export const pamFolderServiceFactory = ({includeNonMemberFolders,...ctx}: TListPamFoldersDTO & TActorContext) => {- const { hasRole } = await verifyMembership(projectId, ctx);+ await verifyMembership(projectId, ctx);const actionsToCheck = filterByAction? { anyOf: [filterByAction] }@@ -131,9 +149,10 @@ export const pamFolderServiceFactory = ({});};- // Product admins can ask for every folder so they can explicitly join one as admin (grantAdminAccess).+ // Org admins can ask for every folder so they can explicitly join one as admin (grantAdminAccess).// The folders they hold no membership on stay closed to them until they do.- if (!includeNonMemberFolders || filterByAction || !hasRole(PamProductRole.Admin)) return listVisible();+ if (!includeNonMemberFolders || filterByAction) return listVisible();+ if (!(await canJoinFolders(ctx))) return listVisible();const [visibleFolders, allFolders, adminFolders] = await Promise.all([listVisible(),@@ -303,8 +322,8 @@ export const pamFolderServiceFactory = ({};};- // Mirrors the org admin's project access, which notifies that project's admins. Runs after commit without- // being awaited and never throws: the access is already granted and audited by then.+ // Tells the folder's admins that an org admin let themselves in. Runs after commit without being awaited and+ // never throws: the access is already granted and audited by then.const notifyFolderAdminsOfAdminAccess = async (folder: TPamFolders, ctx: TActorContext) => {try {const memberships = await membershipDAL.find({@@ -312,8 +331,7 @@ export const pamFolderServiceFactory = ({scopeProjectId: folder.projectId,scopeResourceType: ResourceType.PamFolder,scopeResourceId: folder.id,- isActive: true,- $notNull: ["actorUserId"]+ isActive: true});const roles = memberships.length? await membershipRoleDAL.find({ $in: { membershipId: memberships.map((m) => m.id) } })@@ -321,18 +339,25 @@ export const pamFolderServiceFactory = ({const adminMembershipIds = new Set(roles.filter((r) => r.role === PamResourceRole.Admin && isActiveRole(r)).map((r) => r.membershipId));- const adminUserIds = memberships- .filter((m) => adminMembershipIds.has(m.id) && m.actorUserId !== ctx.actorId)- .map((m) => m.actorUserId as string);+ const adminMemberships = memberships.filter((m) => adminMembershipIds.has(m.id));+ const adminGroupIds = adminMemberships.map((m) => m.actorGroupId).filter((id): id is string => Boolean(id));+ const groupMembers = adminGroupIds.length+ ? await userGroupMembershipDAL.find({ $in: { groupId: adminGroupIds }, isPending: false })+ : [];++ const adminUserIds = [+ ...new Set([+ ...adminMemberships.map((m) => m.actorUserId).filter((id): id is string => Boolean(id)),+ ...groupMembers.map((m) => m.userId)+ ])+ ].filter((id) => id !== ctx.actorId);if (adminUserIds.length === 0) return;- const [admins, actorName] = await Promise.all([+ const [admins, actor] = await Promise.all([userDAL.find({ $in: { id: adminUserIds } }),- ctx.actor === ActorType.USER- ? userDAL.findById(ctx.actorId).then((user) => user?.email || user?.username)- : identityDAL.findById(ctx.actorId).then((identity) => identity?.name)+ userDAL.findById(ctx.actorId)]);- const name = actorName || "A PAM admin";+ const name = actor?.email || actor?.username || "An organization admin";await notificationService.createUserNotifications(admins.map((admin) => ({@@ -340,7 +365,7 @@ export const pamFolderServiceFactory = ({orgId: ctx.actorOrgId,type: NotificationType.PAM_FOLDER_ADMIN_ACCESS_ISSUED,title: "Direct Folder Access Issued",- body: `The PAM admin **${name}** has self-issued admin access to the folder **${folder.name}**.`,+ body: `The organization admin **${name}** has self-issued admin access to the folder **${folder.name}**.`,link: `/organizations/${ctx.actorOrgId}/pam/accounts`})));@@ -350,19 +375,22 @@ export const pamFolderServiceFactory = ({await smtpService.sendMail({template: SmtpTemplates.PamFolderAdminAccess,recipients,- subjectLine: "PAM Folder Direct Access Issued",+ subjectLine: "Organization Admin PAM Folder Direct Access Issued",substitutions: { actorName: name, folderName: folder.name }});}} catch (err) {- logger.error(err, `Failed to notify folder admins of a product admin joining [folderId=${folder.id}]`);+ logger.error(err, `Failed to notify folder admins of an org admin joining [folderId=${folder.id}]`);}};- // The product-admin counterpart of the org admin's "access project" flow: folder access never falls back to- // the product admin, so entering a folder is an explicit, audited membership write.+ // Folder access never falls back to anyone, so an org admin entering a folder is an explicit, audited+ // membership write.const grantAdminAccess = async ({ folderId, projectId, ...ctx }: TGrantPamFolderAdminAccessDTO & TActorContext) => {- await verifyProductAdmin(projectId, ctx);+ await verifyMembership(projectId, ctx);+ if (!(await canJoinFolders(ctx))) {+ throw new ForbiddenRequestError({ message: "Only organization admins can join a PAM folder as admin" });+ }const folder = await pamFolderDAL.findById(folderId);if (!folder || folder.projectId !== projectId) {diff --git a/backend/src/ee/services/pam-membership/pam-membership-service.ts b/backend/src/ee/services/pam-membership/pam-membership-service.tsindex c6af0af130..63d4798076 100644--- a/backend/src/ee/services/pam-membership/pam-membership-service.ts+++ b/backend/src/ee/services/pam-membership/pam-membership-service.ts@@ -59,6 +59,7 @@ type TPamMembershipServiceFactoryDep = {| "deleteById"| "findResourceMembershipsForActor"| "findResourceMembershipsForActors"+ | "lockById"| "transaction">;membershipRoleDAL: Pick<TMembershipRoleDALFactory, "create" | "find" | "delete" | "update">;@@ -905,6 +906,7 @@ export const pamMembershipServiceFactory = ({let sendSessionCancellations: () => void = () => {};await membershipDAL.transaction(async (tx) => {+ await membershipDAL.lockById(membership.id, tx);await membershipRoleDAL.delete({ membershipId: membership.id }, tx);await membershipDAL.deleteById(membership.id, tx);@@ -988,6 +990,7 @@ export const pamMembershipServiceFactory = ({let sendSessionCancellations: () => void = () => {};await membershipDAL.transaction(async (tx) => {+ await membershipDAL.lockById(membership.id, tx);await membershipRoleDAL.delete({ membershipId: membership.id }, tx);await membershipDAL.deleteById(membership.id, tx);diff --git a/backend/src/ee/services/pam/CLAUDE.md b/backend/src/ee/services/pam/CLAUDE.mdindex 7d194022f7..4f5a28ac89 100644--- a/backend/src/ee/services/pam/CLAUDE.md+++ b/backend/src/ee/services/pam/CLAUDE.md@@ -36,11 +36,13 @@ folder or account (`PamResourceRole`: Admin/Operator/Connector/Auditor; Operator`ViewCredentials`, with no approval rights so credential approval can't be self-served). Shared helpers live in`pam/pam-permission.ts` (`verifyProductMembership`, `checkAccountAccess`, `getResourceIdsWithActions`, …) —use them instead of re-implementing. Every list/mutation endpoint checks an **action**, not just-membership. There is **no org-admin fallback**: permission needs project-scoped membership. A product-admin is not implicitly a folder member either; they can list every folder (`includeNonMemberFolders`, which-only the Accounts page sends, adds `callerAccess`) and enter one explicitly through `POST /pam/folders/:folderId/grant-admin-access`, the PAM counterpart-of the org admin's project access. It writes a real Admin membership and its own audit event-(`pam-product-admin-accessed-folder`, with the role it replaced), so never add an implicit fallback instead.+membership. There is **no org-admin fallback**: permission needs project-scoped membership. Instead, a user+(never a machine identity) holding the org Admin role (the role itself, checked with `hasRole`, not a+permission) can list every folder+(`includeNonMemberFolders`, which only the Accounts page sends, adds `callerAccess`) and join one explicitly+through `POST /pam/folders/:folderId/grant-admin-access`. That writes a real Admin membership, its own audit+event (`org-admin-accessed-pam-folder`, with the role it replaced) and notifies the folder's admins, so never+add an implicit fallback instead. A PAM product admin alone cannot join folders.Gotchas:diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.tsindex 27eddbe6d0..0a4dbc5c23 100644--- a/backend/src/server/routes/index.ts+++ b/backend/src/server/routes/index.ts@@ -3888,7 +3888,7 @@ export const registerRoutes = async (permissionService,pamAccessRequestService,userDAL,- identityDAL,+ userGroupMembershipDAL,notificationService,smtpService});diff --git a/backend/src/services/membership/membership-dal.ts b/backend/src/services/membership/membership-dal.tsindex 1dc5fcefb1..d561e1ac2e 100644--- a/backend/src/services/membership/membership-dal.ts+++ b/backend/src/services/membership/membership-dal.ts@@ -211,8 +211,23 @@ export const membershipDALFactory = (db: TDbClient) => {}};+ // For deletes that must take the membership row lock before touching its roles, the same order+ // lockResourceMembershipForActor callers use, so the two can't deadlock.+ const lockById = async (id: string, tx: Knex): Promise<TMemberships | undefined> => {+ try {+ return await tx(TableName.Membership)+ .where({ id })+ .select(selectAllTableCols(TableName.Membership))+ .forUpdate()+ .first();+ } catch (error) {+ throw new DatabaseError({ error, name: "LockMembershipById" });+ }+ };+return {...orm,+ lockById,findResourceMembershipsForActor,findResourceMembershipsForActors,findResourceMembershipsForGroup,diff --git a/backend/src/services/smtp/emails/PamFolderAdminAccessTemplate.tsx b/backend/src/services/smtp/emails/PamFolderAdminAccessTemplate.tsxindex 8353d6dbf2..59409b3380 100644--- a/backend/src/services/smtp/emails/PamFolderAdminAccessTemplate.tsx+++ b/backend/src/services/smtp/emails/PamFolderAdminAccessTemplate.tsx@@ -11,16 +11,16 @@ interface PamFolderAdminAccessTemplateProps extends Omit<BaseEmailWrapperProps,export const PamFolderAdminAccessTemplate = ({ actorName, folderName, siteUrl }: PamFolderAdminAccessTemplateProps) => {return (<BaseEmailWrapper- title="Folder Access Granted to PAM Admin"- preview="A PAM admin has self-issued admin access to a folder in Infisical."+ title="PAM Folder Access Granted to Organization Admin"+ preview="An organization admin has self-issued admin access to a PAM folder in Infisical."siteUrl={siteUrl}><Heading className="text-black text-[18px] leading-[28px] text-center font-normal p-0 mx-0">- A PAM admin has joined the folder <strong>{folderName}</strong>+ An organization admin has joined the PAM folder <strong>{folderName}</strong></Heading><Section className="px-[24px] mt-[36px] pt-[24px] pb-[8px] border border-solid border-gray-200 rounded-md bg-gray-50"><Text className="text-[14px] mt-[4px]">- The PAM admin <strong>{actorName}</strong> has self-issued admin access to the folder{" "}+ The organization admin <strong>{actorName}</strong> has self-issued admin access to the PAM folder{" "}<strong>{folderName}</strong>.</Text></Section>diff --git a/frontend/src/hooks/api/auditLogs/constants.tsx b/frontend/src/hooks/api/auditLogs/constants.tsxindex 842db51466..ca8880713e 100644--- a/frontend/src/hooks/api/auditLogs/constants.tsx+++ b/frontend/src/hooks/api/auditLogs/constants.tsx@@ -352,7 +352,7 @@ export const eventToNameMap: { [K in EventType]: string } = {[EventType.PAM_FOLDER_CREATE]: "Create PAM Folder",[EventType.PAM_FOLDER_UPDATE]: "Update PAM Folder",[EventType.PAM_FOLDER_DELETE]: "Delete PAM Folder",- [EventType.PAM_PRODUCT_ADMIN_ACCESS_FOLDER]: "Product admin accessed PAM folder",+ [EventType.ORG_ADMIN_ACCESS_PAM_FOLDER]: "Org admin accessed PAM folder",[EventType.PAM_PRODUCT_MEMBER_ADD]: "Add PAM Product Member",[EventType.PAM_PRODUCT_MEMBER_UPDATE]: "Update PAM Product Member",[EventType.PAM_PRODUCT_MEMBER_REMOVE]: "Remove PAM Product Member",@@ -520,7 +520,7 @@ export const projectToEventsMap: Partial<Record<ProjectType, EventType[]>> = {EventType.PAM_FOLDER_CREATE,EventType.PAM_FOLDER_UPDATE,EventType.PAM_FOLDER_DELETE,- EventType.PAM_PRODUCT_ADMIN_ACCESS_FOLDER,+ EventType.ORG_ADMIN_ACCESS_PAM_FOLDER,EventType.PAM_PRODUCT_MEMBER_ADD,EventType.PAM_PRODUCT_MEMBER_UPDATE,EventType.PAM_PRODUCT_MEMBER_REMOVE,diff --git a/frontend/src/hooks/api/auditLogs/enums.tsx b/frontend/src/hooks/api/auditLogs/enums.tsxindex ed893848e4..afa7836018 100644--- a/frontend/src/hooks/api/auditLogs/enums.tsx+++ b/frontend/src/hooks/api/auditLogs/enums.tsx@@ -341,7 +341,7 @@ export enum EventType {PAM_FOLDER_CREATE = "pam-folder-create",PAM_FOLDER_UPDATE = "pam-folder-update",PAM_FOLDER_DELETE = "pam-folder-delete",- PAM_PRODUCT_ADMIN_ACCESS_FOLDER = "pam-product-admin-accessed-folder",+ ORG_ADMIN_ACCESS_PAM_FOLDER = "org-admin-accessed-pam-folder",PAM_PRODUCT_MEMBER_ADD = "pam-product-member-add",PAM_PRODUCT_MEMBER_UPDATE = "pam-product-member-update",PAM_PRODUCT_MEMBER_REMOVE = "pam-product-member-remove",diff --git a/frontend/src/hooks/api/pam/queries.tsx b/frontend/src/hooks/api/pam/queries.tsxindex 47186108ea..999b02cba0 100644--- a/frontend/src/hooks/api/pam/queries.tsx+++ b/frontend/src/hooks/api/pam/queries.tsx@@ -263,7 +263,7 @@ export const useListPamAccounts = (type TListPamFoldersParams = {search?: string;filterByAction?: string;- // Product admins only: also return folders they hold no membership on, so they can join one as admin.+ // Org admins only: also return folders they hold no membership on, so they can join one as admin.includeNonMemberFolders?: boolean;};diff --git a/frontend/src/hooks/api/pam/types/index.ts b/frontend/src/hooks/api/pam/types/index.tsindex 7968b4137f..1f9c455382 100644--- a/frontend/src/hooks/api/pam/types/index.ts+++ b/frontend/src/hooks/api/pam/types/index.ts@@ -402,7 +402,7 @@ export type TDeletePamFolderDTO = {export type TPamFolderWithCount = TPamFolder & {accountCount: number;- // Only returned to product admins, who see every folder and can join one as admin.+ // Only returned to org admins, who see every folder and can join one as admin.callerAccess?: PamFolderCallerAccess;};diff --git a/frontend/src/pages/pam/PamAccountsPage/PamAccountsPage.tsx b/frontend/src/pages/pam/PamAccountsPage/PamAccountsPage.tsxindex 0b59932a67..6619efe4fb 100644--- a/frontend/src/pages/pam/PamAccountsPage/PamAccountsPage.tsx+++ b/frontend/src/pages/pam/PamAccountsPage/PamAccountsPage.tsx@@ -87,7 +87,7 @@ export const PamAccountsPage = () => {// never hide it. Capabilities just drive the create affordances and the empty-state copy.const { data: capabilities } = useGetPamAccessCapabilities();- // Backed by ReadAccounts/ReadFolder, so every role gets its visible subset (not a 403). Product admins+ // Backed by ReadAccounts/ReadFolder, so every role gets its visible subset (not a 403). Org admins// also get the folders they aren't a member of, marked so they can join one as admin.const { data: folders = [], isLoading: isLoadingFolders } = useListPamFolders({includeNonMemberFolders: truediff --git a/frontend/src/pages/pam/PamAccountsPage/components/FolderAccountRows.tsx b/frontend/src/pages/pam/PamAccountsPage/components/FolderAccountRows.tsxindex 045f135c87..ade02c8b86 100644--- a/frontend/src/pages/pam/PamAccountsPage/components/FolderAccountRows.tsx+++ b/frontend/src/pages/pam/PamAccountsPage/components/FolderAccountRows.tsx@@ -48,7 +48,7 @@ export const FolderAccountRows = ({onFolderJoinAsAdmin}: Props) => {const count = accounts ? accounts.length : folder.accountCount;- // Only product admins are sent folders they hold no membership on; opening one means joining it.+ // Only org admins are sent folders they hold no membership on; opening one means joining it.const isNotMember = folder.callerAccess === PamFolderCallerAccess.None;return (diff --git a/frontend/src/pages/pam/PamAccountsPage/components/FolderActionsMenu.tsx b/frontend/src/pages/pam/PamAccountsPage/components/FolderActionsMenu.tsxindex b383957ff3..e8f5b2c84c 100644--- a/frontend/src/pages/pam/PamAccountsPage/components/FolderActionsMenu.tsx+++ b/frontend/src/pages/pam/PamAccountsPage/components/FolderActionsMenu.tsx@@ -16,7 +16,6 @@ import {PamFolderCallerAccess,PamResourcePermissionActions,TPamFolderWithCount,- useGetPamAccessCapabilities,usePamFolderActions} from "@app/hooks/api/pam";import { PamSheetTab } from "@app/hooks/usePamSheetState";@@ -39,17 +38,17 @@ export const FolderActionsMenu = ({onJoinAsAdmin}: Props) => {const [isOpen, setIsOpen] = useState(false);- const { data: capabilities } = useGetPamAccessCapabilities();// Every role sees the same menu with the same items, so permissions only decide what's disabled —- // fetch them when the menu opens rather than once per visible folder on page load. A product admin+ // fetch them when the menu opens rather than once per visible folder on page load. An org admin// with no membership on the folder has none to fetch.const { can, isLoading } = usePamFolderActions(folder.id,isOpen && folder.callerAccess !== PamFolderCallerAccess.None);- const canJoinAsAdmin =- Boolean(capabilities?.isProductAdmin) && folder.callerAccess !== PamFolderCallerAccess.Admin;+ // callerAccess is only returned to org admins, the only role that can join a folder as admin.+ const isOrgAdmin = folder.callerAccess !== undefined;+ const canJoinAsAdmin = isOrgAdmin && folder.callerAccess !== PamFolderCallerAccess.Admin;// Treat an unresolved permission set as "not allowed" so nothing is actionable until it loads.const allowed = (action: PamResourcePermissionActions) => !isLoading && can(action);@@ -121,9 +120,9 @@ export const FolderActionsMenu = ({</TooltipTrigger>{!canJoinAsAdmin && (<TooltipContent side="left">- {capabilities?.isProductAdmin+ {isOrgAdmin? "You're already an admin of this folder"- : "Only product admins can join a folder as admin"}+ : "Only organization admins can join a folder as admin"}</TooltipContent>)}</Tooltip>