Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🏰 fix: Enforce Platform Grants for Code Workers (#15700)

Danny Aviladd5829ed773d
diff --git a/api/server/routes/admin/code.js b/api/server/routes/admin/code.js
index 455a388a03..4888a9a451 100644
--- a/api/server/routes/admin/code.js
+++ b/api/server/routes/admin/code.js
@@ -7,7 +7,10 @@ const { requireJwtAuth } = require('~/server/middleware');
const router = express.Router();
const requireAdminAccess = requireCapability(SystemCapabilities.ACCESS_ADMIN);
-const requireCodeEnvironmentManage = requireCapability(SystemCapabilities.MANAGE_CODE_ENVIRONMENTS);
+const requireCodeEnvironmentManage = requireCapability(
+ SystemCapabilities.MANAGE_CODE_ENVIRONMENTS,
+ { platformOnly: true },
+);
const handlers = createAdminCodeEnvironmentHandlers({ getAppConfig });
router.use(requireJwtAuth, requireAdminAccess, requireCodeEnvironmentManage);
diff --git a/api/server/routes/admin/code.test.js b/api/server/routes/admin/code.test.js
index 3105fdc8d3..f293ed2883 100644
--- a/api/server/routes/admin/code.test.js
+++ b/api/server/routes/admin/code.test.js
@@ -70,5 +70,10 @@ describe('admin code environment routes', () => {
expect(response.body).toEqual({ operation, environmentId: 'attached-vm' });
expect(middlewareCalls).toEqual(['jwt', 'access:admin', 'manage:code_environments']);
expect(mockHandlers[handlerName]).toHaveBeenCalledTimes(1);
+ if (path === 'pairings') {
+ expect(mockRequireCapability).toHaveBeenCalledWith('manage:code_environments', {
+ platformOnly: true,
+ });
+ }
});
});
diff --git a/packages/api/src/middleware/capabilities.spec.ts b/packages/api/src/middleware/capabilities.spec.ts
index f2229bb35a..3800189d8f 100644
--- a/packages/api/src/middleware/capabilities.spec.ts
+++ b/packages/api/src/middleware/capabilities.spec.ts
@@ -5,8 +5,9 @@ import {
readConfigCapability,
} from '@librechat/data-schemas';
import type { Response } from 'express';
+import type { CapabilityUser } from './capabilities';
import type { ServerRequest } from '~/types/http';
-import { generateCapabilityCheck } from './capabilities';
+import { capabilityContextMiddleware, generateCapabilityCheck } from './capabilities';
jest.mock('@librechat/data-schemas', () => ({
...jest.requireActual('@librechat/data-schemas'),
@@ -149,6 +150,77 @@ describe('generateCapabilityCheck', () => {
expect(statusMock).not.toHaveBeenCalled();
});
+ it('omits tenant scope for platform-only capability checks', async () => {
+ mockReq.user = {
+ id: 'user-123',
+ role: 'ADMIN',
+ tenantId: 'tenant-1',
+ } as ServerRequest['user'];
+ mockGetUserPrincipals.mockResolvedValue(adminPrincipals);
+ mockHasCapabilityForPrincipals.mockResolvedValue(true);
+
+ const middleware = requireCapability(SystemCapabilities.MANAGE_CODE_ENVIRONMENTS, {
+ platformOnly: true,
+ });
+ await middleware(mockReq as ServerRequest, mockRes as Response, mockNext);
+
+ expect(mockNext).toHaveBeenCalled();
+ expect(mockHasCapabilityForPrincipals).toHaveBeenCalledWith({
+ capability: SystemCapabilities.MANAGE_CODE_ENVIRONMENTS,
+ principals: [adminPrincipals[0]],
+ tenantId: undefined,
+ });
+ });
+
+ it('rejects a tenant-only grant for a platform-only capability check', async () => {
+ mockReq.user = {
+ id: 'user-123',
+ role: 'ADMIN',
+ tenantId: 'tenant-1',
+ } as ServerRequest['user'];
+ mockGetUserPrincipals.mockResolvedValue(adminPrincipals);
+ mockHasCapabilityForPrincipals.mockImplementation(({ tenantId }) =>
+ Promise.resolve(tenantId === 'tenant-1'),
+ );
+
+ const middleware = requireCapability(SystemCapabilities.MANAGE_CODE_ENVIRONMENTS, {
+ platformOnly: true,
+ });
+ await middleware(mockReq as ServerRequest, mockRes as Response, mockNext);
+
+ expect(mockNext).not.toHaveBeenCalled();
+ expect(statusMock).toHaveBeenCalledWith(403);
+ });
+
+ it('reuses tenant principal resolution across tenant and platform checks', async () => {
+ mockReq.user = {
+ id: 'user-123',
+ role: 'ADMIN',
+ tenantId: 'tenant-1',
+ } as ServerRequest['user'];
+ mockGetUserPrincipals.mockResolvedValue(adminPrincipals);
+ mockHasCapabilityForPrincipals.mockResolvedValue(true);
+
+ await new Promise<void>((resolve, reject) => {
+ capabilityContextMiddleware(mockReq as ServerRequest, mockRes as Response, () => {
+ void (async () => {
+ try {
+ await hasCapability(mockReq.user as CapabilityUser, SystemCapabilities.ACCESS_ADMIN);
+ const middleware = requireCapability(SystemCapabilities.MANAGE_CODE_ENVIRONMENTS, {
+ platformOnly: true,
+ });
+ await middleware(mockReq as ServerRequest, mockRes as Response, mockNext);
+ resolve();
+ } catch (error) {
+ reject(error);
+ }
+ })();
+ });
+ });
+
+ expect(mockGetUserPrincipals).toHaveBeenCalledTimes(1);
+ });
+
it('returns 403 when user lacks the capability', async () => {
mockReq.user = { id: 'user-456', role: 'USER' } as ServerRequest['user'];
mockGetUserPrincipals.mockResolvedValue(userPrincipals);
diff --git a/packages/api/src/middleware/capabilities.ts b/packages/api/src/middleware/capabilities.ts
index 1c75ba88f6..97a45f1aee 100644
--- a/packages/api/src/middleware/capabilities.ts
+++ b/packages/api/src/middleware/capabilities.ts
@@ -1,5 +1,6 @@
import { isMainThread } from 'node:worker_threads';
import { AsyncLocalStorage } from 'node:async_hooks';
+import { PrincipalType } from 'librechat-data-provider';
import {
logger,
configCapability,
@@ -61,6 +62,7 @@ export type HasCapabilityFn = (
export type RequireCapabilityFn = (
capability: SystemCapability,
+ options?: { platformOnly?: boolean },
) => (req: ServerRequest, res: Response, next: NextFunction) => Promise<void>;
export type HasConfigCapabilityFn = (
@@ -214,6 +216,7 @@ export function generateCapabilityCheck(deps: CapabilityDeps): {
async function hasCapability(
user: CapabilityUser,
capability: SystemCapability,
+ { platformOnly = false }: { platformOnly?: boolean } = {},
): Promise<boolean> {
if (!isMainThread && !workerWarned) {
workerWarned = true;
@@ -226,17 +229,21 @@ export function generateCapabilityCheck(deps: CapabilityDeps): {
const store = capabilityStore.getStore();
- const resultKey = `${user.id}:${user.tenantId ?? ''}:${capability}`;
+ const resultKey = `${user.id}:${user.tenantId ?? ''}:${capability}:${platformOnly ? 'platform' : 'tenant'}`;
const cached = store?.results.get(resultKey);
if (cached !== undefined) {
return cached;
}
- const principals = await resolvePrincipals(user);
+ const resolvedPrincipals = await resolvePrincipals(user);
+ const principals =
+ platformOnly && user.tenantId
+ ? resolvedPrincipals.filter(({ principalType }) => principalType === PrincipalType.USER)
+ : resolvedPrincipals;
const result = await hasCapabilityForPrincipals({
principals,
capability,
- tenantId: user.tenantId,
+ tenantId: platformOnly ? undefined : user.tenantId,
});
store?.results.set(resultKey, result);
return result;
@@ -265,7 +272,10 @@ export function generateCapabilityCheck(deps: CapabilityDeps): {
return hasCapability(user, sectionCap);
}
- function requireCapability(capability: SystemCapability) {
+ function requireCapability(
+ capability: SystemCapability,
+ { platformOnly = false }: { platformOnly?: boolean } = {},
+ ) {
return async (req: ServerRequest, res: Response, next: NextFunction) => {
try {
if (!req.user) {
@@ -286,7 +296,7 @@ export function generateCapabilityCheck(deps: CapabilityDeps): {
idOnTheSource: req.user.idOnTheSource ?? null,
};
- if (await hasCapability(user, capability)) {
+ if (await hasCapability(user, capability, { platformOnly })) {
next();
return;
}