mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
137 lines
4.8 KiB
JavaScript
137 lines
4.8 KiB
JavaScript
const jwt = require('jsonwebtoken');
|
|
const validateImageRequest = require('~/server/middleware/validateImageRequest');
|
|
|
|
jest.mock('~/server/services/Config/app', () => ({
|
|
getAppConfig: jest.fn(),
|
|
}));
|
|
|
|
describe('validateImageRequest middleware', () => {
|
|
let req, res, next;
|
|
const validObjectId = '65cfb246f7ecadb8b1e8036b';
|
|
const { getAppConfig } = require('~/server/services/Config/app');
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
req = {
|
|
headers: {},
|
|
originalUrl: '',
|
|
};
|
|
res = {
|
|
status: jest.fn().mockReturnThis(),
|
|
send: jest.fn(),
|
|
};
|
|
next = jest.fn();
|
|
process.env.JWT_REFRESH_SECRET = 'test-secret';
|
|
|
|
// Mock getAppConfig to return secureImageLinks: true by default
|
|
getAppConfig.mockResolvedValue({
|
|
secureImageLinks: true,
|
|
});
|
|
});
|
|
|
|
afterEach(() => {
|
|
jest.clearAllMocks();
|
|
});
|
|
|
|
test('should call next() if secureImageLinks is false', async () => {
|
|
getAppConfig.mockResolvedValue({
|
|
secureImageLinks: false,
|
|
});
|
|
await validateImageRequest(req, res, next);
|
|
expect(next).toHaveBeenCalled();
|
|
});
|
|
|
|
test('should return 401 if refresh token is not provided', async () => {
|
|
await validateImageRequest(req, res, next);
|
|
expect(res.status).toHaveBeenCalledWith(401);
|
|
expect(res.send).toHaveBeenCalledWith('Unauthorized');
|
|
});
|
|
|
|
test('should return 403 if refresh token is invalid', async () => {
|
|
req.headers.cookie = 'refreshToken=invalid-token';
|
|
await validateImageRequest(req, res, next);
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
expect(res.send).toHaveBeenCalledWith('Access Denied');
|
|
});
|
|
|
|
test('should return 403 if refresh token is expired', async () => {
|
|
const expiredToken = jwt.sign(
|
|
{ id: validObjectId, exp: Math.floor(Date.now() / 1000) - 3600 },
|
|
process.env.JWT_REFRESH_SECRET,
|
|
);
|
|
req.headers.cookie = `refreshToken=${expiredToken}`;
|
|
await validateImageRequest(req, res, next);
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
expect(res.send).toHaveBeenCalledWith('Access Denied');
|
|
});
|
|
|
|
test('should call next() for valid image path', async () => {
|
|
const validToken = jwt.sign(
|
|
{ id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
|
|
process.env.JWT_REFRESH_SECRET,
|
|
);
|
|
req.headers.cookie = `refreshToken=${validToken}`;
|
|
req.originalUrl = `/images/${validObjectId}/example.jpg`;
|
|
await validateImageRequest(req, res, next);
|
|
expect(next).toHaveBeenCalled();
|
|
});
|
|
|
|
test('should return 403 for invalid image path', async () => {
|
|
const validToken = jwt.sign(
|
|
{ id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
|
|
process.env.JWT_REFRESH_SECRET,
|
|
);
|
|
req.headers.cookie = `refreshToken=${validToken}`;
|
|
req.originalUrl = '/images/65cfb246f7ecadb8b1e8036c/example.jpg'; // Different ObjectId
|
|
await validateImageRequest(req, res, next);
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
expect(res.send).toHaveBeenCalledWith('Access Denied');
|
|
});
|
|
|
|
test('should return 403 for invalid ObjectId format', async () => {
|
|
const validToken = jwt.sign(
|
|
{ id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
|
|
process.env.JWT_REFRESH_SECRET,
|
|
);
|
|
req.headers.cookie = `refreshToken=${validToken}`;
|
|
req.originalUrl = '/images/123/example.jpg'; // Invalid ObjectId
|
|
await validateImageRequest(req, res, next);
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
expect(res.send).toHaveBeenCalledWith('Access Denied');
|
|
});
|
|
|
|
// File traversal tests
|
|
test('should prevent file traversal attempts', async () => {
|
|
const validToken = jwt.sign(
|
|
{ id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
|
|
process.env.JWT_REFRESH_SECRET,
|
|
);
|
|
req.headers.cookie = `refreshToken=${validToken}`;
|
|
|
|
const traversalAttempts = [
|
|
`/images/${validObjectId}/../../../etc/passwd`,
|
|
`/images/${validObjectId}/..%2F..%2F..%2Fetc%2Fpasswd`,
|
|
`/images/${validObjectId}/image.jpg/../../../etc/passwd`,
|
|
`/images/${validObjectId}/%2e%2e%2f%2e%2e%2f%2e%2e%2fetc%2fpasswd`,
|
|
];
|
|
|
|
for (const attempt of traversalAttempts) {
|
|
req.originalUrl = attempt;
|
|
await validateImageRequest(req, res, next);
|
|
expect(res.status).toHaveBeenCalledWith(403);
|
|
expect(res.send).toHaveBeenCalledWith('Access Denied');
|
|
jest.clearAllMocks();
|
|
}
|
|
});
|
|
|
|
test('should handle URL encoded characters in valid paths', async () => {
|
|
const validToken = jwt.sign(
|
|
{ id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
|
|
process.env.JWT_REFRESH_SECRET,
|
|
);
|
|
req.headers.cookie = `refreshToken=${validToken}`;
|
|
req.originalUrl = `/images/${validObjectId}/image%20with%20spaces.jpg`;
|
|
await validateImageRequest(req, res, next);
|
|
expect(next).toHaveBeenCalled();
|
|
});
|
|
});
|