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

🗃️ refactor: File Access via Agent; Deny Deletion if not Editor, Allow Viewer (#9357)

Danny Avila8772b04d1d50
diff --git a/api/models/File.spec.js b/api/models/File.spec.js
index dd0981d1fe..c92224ea3e 100644
--- a/api/models/File.spec.js
+++ b/api/models/File.spec.js
@@ -211,7 +211,7 @@ describe('File Access Control', () => {
expect(accessMap.get(fileIds[1])).toBe(false);
});
- it('should deny access when user only has VIEW permission', async () => {
+ it('should deny access when user only has VIEW permission and needs access for deletion', async () => {
const userId = new mongoose.Types.ObjectId();
const authorId = new mongoose.Types.ObjectId();
const agentId = uuidv4();
@@ -263,12 +263,71 @@ describe('File Access Control', () => {
role: SystemRoles.USER,
fileIds,
agentId,
+ isDelete: true,
});
// Should have no access to any files when only VIEW permission
expect(accessMap.get(fileIds[0])).toBe(false);
expect(accessMap.get(fileIds[1])).toBe(false);
});
+
+ it('should grant access when user has VIEW permission', async () => {
+ const userId = new mongoose.Types.ObjectId();
+ const authorId = new mongoose.Types.ObjectId();
+ const agentId = uuidv4();
+ const fileIds = [uuidv4(), uuidv4()];
+
+ // Create users
+ await User.create({
+ _id: userId,
+ email: '[email protected]',
+ emailVerified: true,
+ provider: 'local',
+ });
+
+ await User.create({
+ _id: authorId,
+ email: '[email protected]',
+ emailVerified: true,
+ provider: 'local',
+ });
+
+ // Create agent with files
+ const agent = await createAgent({
+ id: agentId,
+ name: 'View-Only Agent',
+ author: authorId,
+ model: 'gpt-4',
+ provider: 'openai',
+ tool_resources: {
+ file_search: {
+ file_ids: fileIds,
+ },
+ },
+ });
+
+ // Grant only VIEW permission to user on the agent
+ await grantPermission({
+ principalType: PrincipalType.USER,
+ principalId: userId,
+ resourceType: ResourceType.AGENT,
+ resourceId: agent._id,
+ accessRoleId: AccessRoleIds.AGENT_VIEWER,
+ grantedBy: authorId,
+ });
+
+ // Check access for files
+ const { hasAccessToFilesViaAgent } = require('~/server/services/Files/permissions');
+ const accessMap = await hasAccessToFilesViaAgent({
+ userId: userId,
+ role: SystemRoles.USER,
+ fileIds,
+ agentId,
+ });
+
+ expect(accessMap.get(fileIds[0])).toBe(true);
+ expect(accessMap.get(fileIds[1])).toBe(true);
+ });
});
describe('getFiles with agent access control', () => {
diff --git a/api/server/routes/files/files.js b/api/server/routes/files/files.js
index 09e229c96f..5d6e72ff2d 100644
--- a/api/server/routes/files/files.js
+++ b/api/server/routes/files/files.js
@@ -185,6 +185,7 @@ router.delete('/', async (req, res) => {
role: req.user.role,
fileIds: nonOwnedFileIds,
agentId: req.body.agent_id,
+ isDelete: true,
});
for (const file of nonOwnedFiles) {
diff --git a/api/server/services/Files/permissions.js b/api/server/services/Files/permissions.js
index 6a7296bbde..d909afe25a 100644
--- a/api/server/services/Files/permissions.js
+++ b/api/server/services/Files/permissions.js
@@ -10,9 +10,10 @@ const { getAgent } = require('~/models/Agent');
* @param {string} [params.role] - Optional user role to avoid DB query
* @param {string[]} params.fileIds - Array of file IDs to check
* @param {string} params.agentId - The agent ID that might grant access
+ * @param {boolean} [params.isDelete] - Whether the operation is a delete operation
* @returns {Promise<Map<string, boolean>>} Map of fileId to access status
*/
-const hasAccessToFilesViaAgent = async ({ userId, role, fileIds, agentId }) => {
+const hasAccessToFilesViaAgent = async ({ userId, role, fileIds, agentId, isDelete }) => {
const accessMap = new Map();
// Initialize all files as no access
@@ -44,22 +45,23 @@ const hasAccessToFilesViaAgent = async ({ userId, role, fileIds, agentId }) => {
return accessMap;
}
- // Check if user has EDIT permission (which would indicate collaborative access)
- const hasEditPermission = await checkPermission({
- userId,
- role,
- resourceType: ResourceType.AGENT,
- resourceId: agent._id,
- requiredPermission: PermissionBits.EDIT,
- });
-
- // If user only has VIEW permission, they can't access files
- // Only users with EDIT permission or higher can access agent files
- if (!hasEditPermission) {
- return accessMap;
+ if (isDelete) {
+ // Check if user has EDIT permission (which would indicate collaborative access)
+ const hasEditPermission = await checkPermission({
+ userId,
+ role,
+ resourceType: ResourceType.AGENT,
+ resourceId: agent._id,
+ requiredPermission: PermissionBits.EDIT,
+ });
+
+ // If user only has VIEW permission, they can't access files
+ // Only users with EDIT permission or higher can access agent files
+ if (!hasEditPermission) {
+ return accessMap;
+ }
}
- // User has edit permissions - check which files are actually attached
const attachedFileIds = new Set();
if (agent.tool_resources) {
for (const [_resourceType, resource] of Object.entries(agent.tool_resources)) {