2025-07-25 16:50:18 +02:00
|
|
|
const { logger } = require('@librechat/data-schemas');
|
🔧 refactor: Organize Sharing/Agent Components and Improve Type Safety
refactor: organize Sharing/Agent components, improve type safety for resource types and access role ids, rename enums to PascalCase
refactor: organize Sharing/Agent components, improve type safety for resource types and access role ids
chore: move sharing related components to dedicated "Sharing" directory
chore: remove PublicSharingToggle component and update index exports
chore: move non-sidepanel agent components to `~/components/Agents`
chore: move AgentCategoryDisplay component with tests
chore: remove commented out code
refactor: change PERMISSION_BITS from const to enum for better type safety
refactor: reorganize imports in GenericGrantAccessDialog and update index exports for hooks
refactor: update type definitions to use ACCESS_ROLE_IDS for improved type safety
refactor: remove unused canAccessPromptResource middleware and related code
refactor: remove unused prompt access roles from createAccessRoleMethods
refactor: update resourceType in AclEntry type definition to remove unused 'prompt' value
refactor: introduce ResourceType enum and update resourceType usage across data provider files for improved type safety
refactor: update resourceType usage to ResourceType enum across sharing and permissions components for improved type safety
refactor: standardize resourceType usage to ResourceType enum across agent and prompt models, permissions controller, and middleware for enhanced type safety
refactor: update resourceType references from PROMPT_GROUP to PROMPTGROUP for consistency across models, middleware, and components
refactor: standardize access role IDs and resource type usage across agent, file, and prompt models for improved type safety and consistency
chore: add typedefs for TUpdateResourcePermissionsRequest and TUpdateResourcePermissionsResponse to enhance type definitions
chore: move SearchPicker to PeoplePicker dir
refactor: implement debouncing for query changes in SearchPicker for improved performance
chore: fix typing, import order for agent admin settings
fix: agent admin settings, prevent agent form submission
refactor: rename `ACCESS_ROLE_IDS` to `AccessRoleIds`
refactor: replace PermissionBits with PERMISSION_BITS
refactor: replace PERMISSION_BITS with PermissionBits
2025-07-28 17:52:36 -04:00
|
|
|
const { PermissionBits, hasPermissions, ResourceType } = require('librechat-data-provider');
|
2025-07-25 16:50:18 +02:00
|
|
|
const { getEffectivePermissions } = require('~/server/services/PermissionService');
|
2025-09-18 15:42:05 -04:00
|
|
|
const { getAgents } = require('~/models/Agent');
|
🧵 refactor: Migrate Endpoint Initialization to TypeScript (#10794)
* refactor: move endpoint initialization methods to typescript
* refactor: move agent init to packages/api
- Introduced `initialize.ts` for agent initialization, including file processing and tool loading.
- Updated `resources.ts` to allow optional appConfig parameter.
- Enhanced endpoint configuration handling in various initialization files to support model parameters.
- Added new artifacts and prompts for React component generation.
- Refactored existing code to improve type safety and maintainability.
* refactor: streamline endpoint initialization and enhance type safety
- Updated initialization functions across various endpoints to use a consistent request structure, replacing `unknown` types with `ServerResponse`.
- Simplified request handling by directly extracting keys from the request body.
- Improved type safety by ensuring user IDs are safely accessed with optional chaining.
- Removed unnecessary parameters and streamlined model options handling for better clarity and maintainability.
* refactor: moved ModelService and extractBaseURL to packages/api
- Added comprehensive tests for the models fetching functionality, covering scenarios for OpenAI, Anthropic, Google, and Ollama models.
- Updated existing endpoint index to include the new models module.
- Enhanced utility functions for URL extraction and model data processing.
- Improved type safety and error handling across the models fetching logic.
* refactor: consolidate utility functions and remove unused files
- Merged `deriveBaseURL` and `extractBaseURL` into the `@librechat/api` module for better organization.
- Removed redundant utility files and their associated tests to streamline the codebase.
- Updated imports across various client files to utilize the new consolidated functions.
- Enhanced overall maintainability by reducing the number of utility modules.
* refactor: replace ModelService references with direct imports from @librechat/api and remove ModelService file
* refactor: move encrypt/decrypt methods and key db methods to data-schemas, use `getProviderConfig` from `@librechat/api`
* chore: remove unused 'res' from options in AgentClient
* refactor: file model imports and methods
- Updated imports in various controllers and services to use the unified file model from '~/models' instead of '~/models/File'.
- Consolidated file-related methods into a new file methods module in the data-schemas package.
- Added comprehensive tests for file methods including creation, retrieval, updating, and deletion.
- Enhanced the initializeAgent function to accept dependency injection for file-related methods.
- Improved error handling and logging in file methods.
* refactor: streamline database method references in agent initialization
* refactor: enhance file method tests and update type references to IMongoFile
* refactor: consolidate database method imports in agent client and initialization
* chore: remove redundant import of initializeAgent from @librechat/api
* refactor: move checkUserKeyExpiry utility to @librechat/api and update references across endpoints
* refactor: move updateUserPlugins logic to user.ts and simplify UserController
* refactor: update imports for user key management and remove UserService
* refactor: remove unused Anthropics and Bedrock endpoint files and clean up imports
* refactor: consolidate and update encryption imports across various files to use @librechat/data-schemas
* chore: update file model mock to use unified import from '~/models'
* chore: import order
* refactor: remove migrated to TS agent.js file and its associated logic from the endpoints
* chore: add reusable function to extract imports from source code in unused-packages workflow
* chore: enhance unused-packages workflow to include @librechat/api dependencies and improve dependency extraction
* chore: improve dependency extraction in unused-packages workflow with enhanced error handling and debugging output
* chore: add detailed debugging output to unused-packages workflow for better visibility into unused dependencies and exclusion lists
* chore: refine subpath handling in unused-packages workflow to correctly process scoped and non-scoped package imports
* chore: clean up unused debug output in unused-packages workflow and reorganize type imports in initialize.ts
2025-12-03 17:21:41 -05:00
|
|
|
const { getFiles } = require('~/models');
|
2025-07-25 16:50:18 +02:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Checks if user has access to a file through agent permissions
|
|
|
|
|
* Files inherit permissions from agents - if you can view the agent, you can access its files
|
|
|
|
|
*/
|
2025-08-03 19:24:40 -04:00
|
|
|
const checkAgentBasedFileAccess = async ({ userId, role, fileId }) => {
|
2025-07-25 16:50:18 +02:00
|
|
|
try {
|
2025-09-18 20:06:59 -04:00
|
|
|
/** Agents that have this file in their tool_resources */
|
2025-09-18 15:42:05 -04:00
|
|
|
const agentsWithFile = await getAgents({
|
2025-07-25 16:50:18 +02:00
|
|
|
$or: [
|
|
|
|
|
{ 'tool_resources.execute_code.file_ids': fileId },
|
2025-09-18 20:06:59 -04:00
|
|
|
{ 'tool_resources.file_search.file_ids': fileId },
|
|
|
|
|
{ 'tool_resources.context.file_ids': fileId },
|
2025-07-25 16:50:18 +02:00
|
|
|
{ 'tool_resources.ocr.file_ids': fileId },
|
|
|
|
|
],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
if (!agentsWithFile || agentsWithFile.length === 0) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check if user has access to any of these agents
|
2025-09-18 15:42:05 -04:00
|
|
|
for (const agent of agentsWithFile) {
|
2025-07-25 16:50:18 +02:00
|
|
|
// Check if user is the agent author
|
|
|
|
|
if (agent.author && agent.author.toString() === userId) {
|
|
|
|
|
logger.debug(`[fileAccess] User is author of agent ${agent.id}`);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check ACL permissions for VIEW access on the agent
|
|
|
|
|
try {
|
|
|
|
|
const permissions = await getEffectivePermissions({
|
|
|
|
|
userId,
|
2025-08-03 19:24:40 -04:00
|
|
|
role,
|
🔧 refactor: Organize Sharing/Agent Components and Improve Type Safety
refactor: organize Sharing/Agent components, improve type safety for resource types and access role ids, rename enums to PascalCase
refactor: organize Sharing/Agent components, improve type safety for resource types and access role ids
chore: move sharing related components to dedicated "Sharing" directory
chore: remove PublicSharingToggle component and update index exports
chore: move non-sidepanel agent components to `~/components/Agents`
chore: move AgentCategoryDisplay component with tests
chore: remove commented out code
refactor: change PERMISSION_BITS from const to enum for better type safety
refactor: reorganize imports in GenericGrantAccessDialog and update index exports for hooks
refactor: update type definitions to use ACCESS_ROLE_IDS for improved type safety
refactor: remove unused canAccessPromptResource middleware and related code
refactor: remove unused prompt access roles from createAccessRoleMethods
refactor: update resourceType in AclEntry type definition to remove unused 'prompt' value
refactor: introduce ResourceType enum and update resourceType usage across data provider files for improved type safety
refactor: update resourceType usage to ResourceType enum across sharing and permissions components for improved type safety
refactor: standardize resourceType usage to ResourceType enum across agent and prompt models, permissions controller, and middleware for enhanced type safety
refactor: update resourceType references from PROMPT_GROUP to PROMPTGROUP for consistency across models, middleware, and components
refactor: standardize access role IDs and resource type usage across agent, file, and prompt models for improved type safety and consistency
chore: add typedefs for TUpdateResourcePermissionsRequest and TUpdateResourcePermissionsResponse to enhance type definitions
chore: move SearchPicker to PeoplePicker dir
refactor: implement debouncing for query changes in SearchPicker for improved performance
chore: fix typing, import order for agent admin settings
fix: agent admin settings, prevent agent form submission
refactor: rename `ACCESS_ROLE_IDS` to `AccessRoleIds`
refactor: replace PermissionBits with PERMISSION_BITS
refactor: replace PERMISSION_BITS with PermissionBits
2025-07-28 17:52:36 -04:00
|
|
|
resourceType: ResourceType.AGENT,
|
2025-07-25 16:50:18 +02:00
|
|
|
resourceId: agent._id || agent.id,
|
|
|
|
|
});
|
|
|
|
|
|
🔧 refactor: Organize Sharing/Agent Components and Improve Type Safety
refactor: organize Sharing/Agent components, improve type safety for resource types and access role ids, rename enums to PascalCase
refactor: organize Sharing/Agent components, improve type safety for resource types and access role ids
chore: move sharing related components to dedicated "Sharing" directory
chore: remove PublicSharingToggle component and update index exports
chore: move non-sidepanel agent components to `~/components/Agents`
chore: move AgentCategoryDisplay component with tests
chore: remove commented out code
refactor: change PERMISSION_BITS from const to enum for better type safety
refactor: reorganize imports in GenericGrantAccessDialog and update index exports for hooks
refactor: update type definitions to use ACCESS_ROLE_IDS for improved type safety
refactor: remove unused canAccessPromptResource middleware and related code
refactor: remove unused prompt access roles from createAccessRoleMethods
refactor: update resourceType in AclEntry type definition to remove unused 'prompt' value
refactor: introduce ResourceType enum and update resourceType usage across data provider files for improved type safety
refactor: update resourceType usage to ResourceType enum across sharing and permissions components for improved type safety
refactor: standardize resourceType usage to ResourceType enum across agent and prompt models, permissions controller, and middleware for enhanced type safety
refactor: update resourceType references from PROMPT_GROUP to PROMPTGROUP for consistency across models, middleware, and components
refactor: standardize access role IDs and resource type usage across agent, file, and prompt models for improved type safety and consistency
chore: add typedefs for TUpdateResourcePermissionsRequest and TUpdateResourcePermissionsResponse to enhance type definitions
chore: move SearchPicker to PeoplePicker dir
refactor: implement debouncing for query changes in SearchPicker for improved performance
chore: fix typing, import order for agent admin settings
fix: agent admin settings, prevent agent form submission
refactor: rename `ACCESS_ROLE_IDS` to `AccessRoleIds`
refactor: replace PermissionBits with PERMISSION_BITS
refactor: replace PERMISSION_BITS with PermissionBits
2025-07-28 17:52:36 -04:00
|
|
|
if (hasPermissions(permissions, PermissionBits.VIEW)) {
|
2025-07-25 16:50:18 +02:00
|
|
|
logger.debug(`[fileAccess] User ${userId} has VIEW permissions on agent ${agent.id}`);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
} catch (permissionError) {
|
|
|
|
|
logger.warn(
|
|
|
|
|
`[fileAccess] Permission check failed for agent ${agent.id}:`,
|
|
|
|
|
permissionError.message,
|
|
|
|
|
);
|
|
|
|
|
// Continue checking other agents
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
} catch (error) {
|
|
|
|
|
logger.error('[fileAccess] Error checking agent-based access:', error);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Middleware to check if user can access a file
|
|
|
|
|
* Checks: 1) File ownership, 2) Agent-based access (file inherits agent permissions)
|
|
|
|
|
*/
|
|
|
|
|
const fileAccess = async (req, res, next) => {
|
|
|
|
|
try {
|
|
|
|
|
const fileId = req.params.file_id;
|
|
|
|
|
const userId = req.user?.id;
|
2025-08-03 19:24:40 -04:00
|
|
|
const userRole = req.user?.role;
|
2025-07-25 16:50:18 +02:00
|
|
|
if (!fileId) {
|
|
|
|
|
return res.status(400).json({
|
|
|
|
|
error: 'Bad Request',
|
|
|
|
|
message: 'file_id is required',
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!userId) {
|
|
|
|
|
return res.status(401).json({
|
|
|
|
|
error: 'Unauthorized',
|
|
|
|
|
message: 'Authentication required',
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const [file] = await getFiles({ file_id: fileId });
|
|
|
|
|
if (!file) {
|
|
|
|
|
return res.status(404).json({
|
|
|
|
|
error: 'Not Found',
|
|
|
|
|
message: 'File not found',
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (file.user && file.user.toString() === userId) {
|
|
|
|
|
req.fileAccess = { file };
|
|
|
|
|
return next();
|
|
|
|
|
}
|
|
|
|
|
|
2025-09-18 20:06:59 -04:00
|
|
|
/** Agent-based access (file inherits agent permissions) */
|
2025-08-03 19:24:40 -04:00
|
|
|
const hasAgentAccess = await checkAgentBasedFileAccess({ userId, role: userRole, fileId });
|
2025-07-25 16:50:18 +02:00
|
|
|
if (hasAgentAccess) {
|
|
|
|
|
req.fileAccess = { file };
|
|
|
|
|
return next();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
logger.warn(`[fileAccess] User ${userId} denied access to file ${fileId}`);
|
|
|
|
|
return res.status(403).json({
|
|
|
|
|
error: 'Forbidden',
|
|
|
|
|
message: 'Insufficient permissions to access this file',
|
|
|
|
|
});
|
|
|
|
|
} catch (error) {
|
|
|
|
|
logger.error('[fileAccess] Error checking file access:', error);
|
|
|
|
|
return res.status(500).json({
|
|
|
|
|
error: 'Internal Server Error',
|
|
|
|
|
message: 'Failed to check file access permissions',
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
module.exports = {
|
|
|
|
|
fileAccess,
|
|
|
|
|
};
|