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: Inspect Stored File Locators Per Message (#15841)

Danny Avila8f13845da5ea
diff --git a/api/app/clients/BaseClient.js b/api/app/clients/BaseClient.js
index 05d1b7e714..950efff002 100644
--- a/api/app/clients/BaseClient.js
+++ b/api/app/clients/BaseClient.js
@@ -16,6 +16,7 @@ const {
getLangfuseTraceMessageFields,
isContentFilterError,
assertModelBoundProviderContent,
+ reportLocatorTraversalFailure,
collectModelBoundHistoricalFileIdState,
projectModelBoundSourceFiles,
isModelBoundAttachmentFile,
@@ -302,6 +303,7 @@ class BaseClient {
: [{ role: 'user', content: payload, isCreatedByUser: true, isUserSubmitted: true }];
const fileProjection = this.getModelBoundFileProjection();
assertModelBoundProviderContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req?.config?.filters,
legacyPii: this.options.req?.config?.messageFilter?.pii,
providerMessages: messages,
diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 10f30569d1..58fc1824d7 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -145,6 +145,7 @@ const {
decrementPendingRequest,
maybePrewarmCodeSandbox,
assertModelBoundContent,
+ reportLocatorTraversalFailure,
filterFilesByEndpointRuntimeConfig,
createModelBoundChatModelCallback: createModelBoundContentCallback,
createInitialModelBoundAdmissionCallback,
@@ -516,6 +517,7 @@ class AgentClient extends BaseClient {
admitSteerAttachments(files, steerId) {
const modelBoundFiles = files.filter(isModelBoundAttachmentFile);
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req?.config?.filters,
files: modelBoundFiles,
});
@@ -2047,6 +2049,7 @@ class AgentClient extends BaseClient {
return;
}
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
legacyPii,
storedMessages: this.modelBoundStoredMessages,
});
@@ -2063,6 +2066,7 @@ class AgentClient extends BaseClient {
const persistence = BaseClient.prototype.getModelBoundUserMessagePersistence.call(this);
return createModelBoundContentCallback(
{
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req?.config?.filters,
legacyPii: this.options.req?.config?.messageFilter?.pii,
storedMessages: this.modelBoundStoredMessages,
@@ -2393,6 +2397,7 @@ class AgentClient extends BaseClient {
]);
void earlySharedContextPromise.catch(() => {});
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req.config?.filters,
legacyPii: this.options.req.config?.messageFilter?.pii,
agents: allAgents.map(({ agent }) => agent),
@@ -2473,6 +2478,7 @@ class AgentClient extends BaseClient {
this.modelBoundCurrentFiles = [...modelBoundRequestAttachments];
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req.config?.filters,
files: modelBoundRequestAttachments,
});
@@ -2720,6 +2726,7 @@ class AgentClient extends BaseClient {
* user payload so strict file policy cannot be skipped by a late media
* adapter. */
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req.config?.filters,
legacyPii: this.options.req.config?.messageFilter?.pii,
submittedMessages: [{ role: 'user', content: latestFormatted.content }],
@@ -3013,6 +3020,7 @@ class AgentClient extends BaseClient {
});
if (assertLateBoundContent) {
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req.config?.filters,
legacyPii: this.options.req.config?.messageFilter?.pii,
agents: [agent],
@@ -3041,6 +3049,7 @@ class AgentClient extends BaseClient {
this.modelBoundMemoryContexts = [...modelBoundMemoryContexts];
this.modelBoundFileContexts = [...modelBoundFileContexts];
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req.config?.filters,
legacyPii: this.options.req.config?.messageFilter?.pii,
agents: allAgents.map(({ agent }) => agent),
@@ -4676,6 +4685,7 @@ class AgentClient extends BaseClient {
}
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: appConfig?.filters,
legacyPii: appConfig?.messageFilter?.pii,
agents: reachableAgents,
@@ -5346,6 +5356,7 @@ class AgentClient extends BaseClient {
},
{
getAgentCheckpointer,
+ onTraversalFailure: reportLocatorTraversalFailure,
getMessages: db.getMessages,
getFiles: db.getFiles,
},
@@ -5433,6 +5444,7 @@ class AgentClient extends BaseClient {
agent === this.options.agent ? this.options.req.body.ephemeralAgent : undefined,
});
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req.config?.filters,
legacyPii: this.options.req.config?.messageFilter?.pii,
agents: [agent],
@@ -5531,6 +5543,7 @@ class AgentClient extends BaseClient {
sharedRunContext: scopedContext ?? '',
});
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: this.options.req.config?.filters,
legacyPii: this.options.req.config?.messageFilter?.pii,
agents: [agent],
diff --git a/api/server/controllers/agents/openai.js b/api/server/controllers/agents/openai.js
index 78f930753f..1ff29ca874 100644
--- a/api/server/controllers/agents/openai.js
+++ b/api/server/controllers/agents/openai.js
@@ -50,6 +50,7 @@ const {
isContentTraversalProtected,
isContentTraversalLimitError,
assertModelBoundContent,
+ reportLocatorTraversalFailure,
hasModelBoundContentProtection,
isContentFilterError,
getSafeErrorMetadata,
@@ -750,6 +751,7 @@ const executeOpenAIChatCompletion = async (envelope, { req, res }) => {
const manualSkillPrimes = primaryConfig.manualSkillPrimes;
const alwaysApplySkillPrimes = primaryConfig.alwaysApplySkillPrimes;
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: appConfig?.filters,
legacyPii: appConfig?.messageFilter?.pii,
submittedMessages: request.messages,
diff --git a/api/server/controllers/agents/responses.js b/api/server/controllers/agents/responses.js
index aa851fbb51..bccf4d3dde 100644
--- a/api/server/controllers/agents/responses.js
+++ b/api/server/controllers/agents/responses.js
@@ -50,6 +50,7 @@ const {
isContentTraversalLimitError,
prependContentTraversalFragments,
assertModelBoundContent,
+ reportLocatorTraversalFailure,
hasModelBoundContentProtection,
isContentFilterError,
getSafeErrorMetadata,
@@ -710,6 +711,7 @@ const executeResponse = async (envelope, { req, res }) => {
: [];
if (request.previous_response_id) {
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: appConfig?.filters,
legacyPii: appConfig?.messageFilter?.pii,
storedMessages: previousMessages,
@@ -1000,6 +1002,7 @@ const executeResponse = async (envelope, { req, res }) => {
const modelBoundAgents = [...modelBoundAgentsById.values()];
const mergedMCPAuthMap = discoveredMCPAuthMap ?? primaryConfig.userMCPAuthMap;
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: appConfig?.filters,
legacyPii: appConfig?.messageFilter?.pii,
agents: modelBoundAgents,
@@ -1094,6 +1097,7 @@ const executeResponse = async (envelope, { req, res }) => {
}
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: appConfig?.filters,
legacyPii: appConfig?.messageFilter?.pii,
submittedMessages: inputMessages,
diff --git a/api/server/controllers/agents/resume.js b/api/server/controllers/agents/resume.js
index 3b55b714ab..793e89568b 100644
--- a/api/server/controllers/agents/resume.js
+++ b/api/server/controllers/agents/resume.js
@@ -31,6 +31,7 @@ const {
getAgentCheckpointer,
isContentFilterError,
preflightResumeContent,
+ reportLocatorTraversalFailure,
getResumeProvenance,
getUserFacingResumeError,
decrementPendingRequest,
@@ -197,6 +198,7 @@ async function deleteFailedResumeCheckpoint(args, context) {
const GENERIC_RESUME_ERROR = 'Resume failed';
const resumeContentProtectionDependencies = {
+ onTraversalFailure: reportLocatorTraversalFailure,
getAgentCheckpointer,
checkAccess,
getMessages,
diff --git a/api/server/controllers/agents/v1.js b/api/server/controllers/agents/v1.js
index 2d55ff44cd..f728a5bd4d 100644
--- a/api/server/controllers/agents/v1.js
+++ b/api/server/controllers/agents/v1.js
@@ -37,6 +37,7 @@ const {
isContentTraversalProtected,
isContentTraversalLimitError,
resolveCanonicalFileReferences,
+ reportLocatorTraversalFailure,
} = require('@librechat/api');
const {
Time,
@@ -176,6 +177,7 @@ const blockFilteredAgentContent = async (req, res, agentData) => {
if (filePolicyActive) {
try {
const fileInspection = await resolveCanonicalFileReferences({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters,
input: agentData,
user: req.user,
diff --git a/api/server/controllers/assistants/chatV1.js b/api/server/controllers/assistants/chatV1.js
index cac475dee6..5b33daa795 100644
--- a/api/server/controllers/assistants/chatV1.js
+++ b/api/server/controllers/assistants/chatV1.js
@@ -12,6 +12,7 @@ const {
isContentFilterError,
hasActiveFilePolicy,
preflightAssistantRunContent,
+ reportLocatorTraversalFailure,
preflightAssistantUserMessageContent,
} = require('@librechat/api');
const {
@@ -335,6 +336,7 @@ const chatV1 = async (req, res) => {
let persistedAssistant;
try {
persistedAssistant = await preflightAssistantRunContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
config: req.config,
openai,
user: req.user,
@@ -546,6 +548,7 @@ const chatV1 = async (req, res) => {
await getRequestFileIds();
try {
await preflightAssistantUserMessageContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
config: req.config,
user: req.user,
message: userMessage,
@@ -651,6 +654,7 @@ const chatV1 = async (req, res) => {
try {
await preflightAssistantRunContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
config: req.config,
openai,
user: req.user,
diff --git a/api/server/controllers/assistants/chatV2.js b/api/server/controllers/assistants/chatV2.js
index ac451fa173..b79053ba2a 100644
--- a/api/server/controllers/assistants/chatV2.js
+++ b/api/server/controllers/assistants/chatV2.js
@@ -12,6 +12,7 @@ const {
isContentFilterError,
hasActiveFilePolicy,
preflightAssistantRunContent,
+ reportLocatorTraversalFailure,
preflightAssistantUserMessageContent,
} = require('@librechat/api');
const {
@@ -206,6 +207,7 @@ const chatV2 = async (req, res) => {
await validateAuthor({ req, openai });
try {
await preflightAssistantRunContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
config: req.config,
openai,
user: req.user,
@@ -377,6 +379,7 @@ const chatV2 = async (req, res) => {
await getRequestFileIds();
try {
await preflightAssistantUserMessageContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
config: req.config,
user: req.user,
message: userMessage,
@@ -489,6 +492,7 @@ const chatV2 = async (req, res) => {
try {
await preflightAssistantRunContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
config: req.config,
openai,
user: req.user,
diff --git a/api/server/routes/agents/chat.js b/api/server/routes/agents/chat.js
index b9a16e560d..16ecf54fd0 100644
--- a/api/server/routes/agents/chat.js
+++ b/api/server/routes/agents/chat.js
@@ -2,6 +2,7 @@ const express = require('express');
const { logger } = require('@librechat/data-schemas');
const {
createMessageFilterPii,
+ reportLocatorTraversalFailure,
generateCheckAccess,
skipAgentCheck,
applyResumeContext,
@@ -72,6 +73,7 @@ const restoreResumeContext = async (req, res, next) => {
router.use(restoreResumeContext);
router.use(
createMessageFilterPii({
+ onTraversalFailure: reportLocatorTraversalFailure,
getConfig: (req) => req.config?.messageFilter?.pii,
getFilters: (req) => req.config?.filters,
getFiles,
diff --git a/api/server/routes/agents/index.js b/api/server/routes/agents/index.js
index 5440541473..afb425e7d8 100644
--- a/api/server/routes/agents/index.js
+++ b/api/server/routes/agents/index.js
@@ -1,5 +1,6 @@
const express = require('express');
const {
+ reportLocatorTraversalFailure,
isEnabled,
GenerationJobManager,
TERMINAL_PUBLICATION_RECONNECT_ERROR,
@@ -1054,6 +1055,7 @@ router.post(
configMiddleware,
...steerLimiters,
createMessageFilterPii({
+ onTraversalFailure: reportLocatorTraversalFailure,
getConfig: (req) => req.config?.messageFilter?.pii,
getFilters: (req) => req.config?.filters,
getFiles,
@@ -1074,6 +1076,7 @@ router.post(
configMiddleware,
...steerLimiters,
createMessageFilterPii({
+ onTraversalFailure: reportLocatorTraversalFailure,
getConfig: (req) => req.config?.messageFilter?.pii,
getFilters: (req) => req.config?.filters,
getFiles,
@@ -1113,6 +1116,7 @@ router.post(
configMiddleware,
...steerLimiters,
createMessageFilterPii({
+ onTraversalFailure: reportLocatorTraversalFailure,
getConfig: (req) => req.config?.messageFilter?.pii,
getFilters: (req) => req.config?.filters,
getFiles,
diff --git a/api/server/routes/agents/openai.js b/api/server/routes/agents/openai.js
index cf2cbb6e9a..bb5bb83478 100644
--- a/api/server/routes/agents/openai.js
+++ b/api/server/routes/agents/openai.js
@@ -20,6 +20,7 @@
*/
const express = require('express');
const {
+ reportLocatorTraversalFailure,
createAgentEventBindingHandlers,
createAgentTriggerIngressHandlers,
createMessageFilterPii,
@@ -82,7 +83,10 @@ router.post(
router.post(
'/events',
agentEventUserLimiter,
- createMessageFilterPii({ getConfig: (req) => req.config?.messageFilter?.pii }),
+ createMessageFilterPii({
+ onTraversalFailure: reportLocatorTraversalFailure,
+ getConfig: (req) => req.config?.messageFilter?.pii,
+ }),
eventBindingHandlers.resolve,
checkAgentTriggerPermission,
eventHandlers.enqueueEvent,
diff --git a/api/server/routes/agents/tools.js b/api/server/routes/agents/tools.js
index f1d2c7c270..843e3a56f2 100644
--- a/api/server/routes/agents/tools.js
+++ b/api/server/routes/agents/tools.js
@@ -1,11 +1,16 @@
const express = require('express');
-const { createContentFilter, extractToolArgumentContent } = require('@librechat/api');
+const {
+ reportLocatorTraversalFailure,
+ createContentFilter,
+ extractToolArgumentContent,
+} = require('@librechat/api');
const { callTool, verifyToolAuth, getToolCalls } = require('~/server/controllers/tools');
const { getAvailableTools } = require('~/server/controllers/PluginController');
const { toolCallLimiter } = require('~/server/middleware');
const router = express.Router();
const filterToolArguments = createContentFilter({
+ onTraversalFailure: reportLocatorTraversalFailure,
getFilters: (req) => req.config?.filters,
extract: (req) => {
const {
diff --git a/api/server/routes/assistants/chatV1.js b/api/server/routes/assistants/chatV1.js
index 245b61aee8..46820cde56 100644
--- a/api/server/routes/assistants/chatV1.js
+++ b/api/server/routes/assistants/chatV1.js
@@ -1,5 +1,5 @@
const express = require('express');
-const { createMessageFilterPii } = require('@librechat/api');
+const { createMessageFilterPii, reportLocatorTraversalFailure } = require('@librechat/api');
const router = express.Router();
const { handleAbort, validateModel, buildEndpointOption } = require('~/server/middleware');
@@ -12,6 +12,7 @@ const { getFiles } = require('~/models');
router.post('/abort', handleAbort());
const filterMessageContent = createMessageFilterPii({
+ onTraversalFailure: reportLocatorTraversalFailure,
getConfig: (req) => req.config?.messageFilter?.pii,
getFilters: (req) => req.config?.filters,
getFiles,
diff --git a/api/server/routes/assistants/chatV2.js b/api/server/routes/assistants/chatV2.js
index 2f28dac0c8..6e105539a9 100644
--- a/api/server/routes/assistants/chatV2.js
+++ b/api/server/routes/assistants/chatV2.js
@@ -1,5 +1,5 @@
const express = require('express');
-const { createMessageFilterPii } = require('@librechat/api');
+const { createMessageFilterPii, reportLocatorTraversalFailure } = require('@librechat/api');
const router = express.Router();
const { handleAbort, validateModel, buildEndpointOption } = require('~/server/middleware');
@@ -12,6 +12,7 @@ const { getFiles } = require('~/models');
router.post('/abort', handleAbort());
const filterMessageContent = createMessageFilterPii({
+ onTraversalFailure: reportLocatorTraversalFailure,
getConfig: (req) => req.config?.messageFilter?.pii,
getFilters: (req) => req.config?.filters,
getFiles,
diff --git a/api/server/routes/assistants/v1.js b/api/server/routes/assistants/v1.js
index 63d79a44f2..d82a2f2431 100644
--- a/api/server/routes/assistants/v1.js
+++ b/api/server/routes/assistants/v1.js
@@ -1,5 +1,9 @@
const express = require('express');
-const { createContentFilter, extractAssistantContent } = require('@librechat/api');
+const {
+ reportLocatorTraversalFailure,
+ createContentFilter,
+ extractAssistantContent,
+} = require('@librechat/api');
const controllers = require('~/server/controllers/assistants/v1');
const { getFiles } = require('~/models');
const documents = require('./documents');
@@ -9,6 +13,7 @@ const tools = require('./tools');
const router = express.Router();
const avatar = express.Router();
const filterAssistantContent = createContentFilter({
+ onTraversalFailure: reportLocatorTraversalFailure,
getFilters: (req) => req.config?.filters,
extract: (req) => extractAssistantContent(req.body),
getOpaqueFileInput: (req) => req.body,
diff --git a/api/server/routes/assistants/v2.js b/api/server/routes/assistants/v2.js
index 748b123e0a..4af1dea42a 100644
--- a/api/server/routes/assistants/v2.js
+++ b/api/server/routes/assistants/v2.js
@@ -1,5 +1,9 @@
const express = require('express');
-const { createContentFilter, extractAssistantContent } = require('@librechat/api');
+const {
+ reportLocatorTraversalFailure,
+ createContentFilter,
+ extractAssistantContent,
+} = require('@librechat/api');
const { configMiddleware } = require('~/server/middleware');
const v1 = require('~/server/controllers/assistants/v1');
const v2 = require('~/server/controllers/assistants/v2');
@@ -11,6 +15,7 @@ const tools = require('./tools');
const router = express.Router();
router.use(configMiddleware);
const filterAssistantContent = createContentFilter({
+ onTraversalFailure: reportLocatorTraversalFailure,
getFilters: (req) => req.config?.filters,
extract: (req) => extractAssistantContent(req.body),
getOpaqueFileInput: (req) => req.body,
diff --git a/api/server/routes/convos.js b/api/server/routes/convos.js
index bdc00fb5f8..04c9ec5d99 100644
--- a/api/server/routes/convos.js
+++ b/api/server/routes/convos.js
@@ -2,6 +2,7 @@ const multer = require('multer');
const express = require('express');
const { sleep } = require('@librechat/agents');
const {
+ reportLocatorTraversalFailure,
isEnabled,
normalizeLimit,
openCheckpointDeletion,
@@ -64,10 +65,12 @@ const parentSubagentIndexHandler = createParentSubagentIndexHandler({
listSubagentTasksForThreads: db.listSubagentTasksForThreads,
});
const filterConversationTitle = createContentFilter({
+ onTraversalFailure: reportLocatorTraversalFailure,
getFilters: (req) => req.config?.filters,
extract: (req) => extractConversationTitleContent(req.body),
});
const filterSubagentControlMessage = createContentFilter({
+ onTraversalFailure: reportLocatorTraversalFailure,
getFilters: (req) => req.config?.filters,
getLegacyPii: (req) => req.config?.messageFilter?.pii,
extract: (req) =>
diff --git a/api/server/routes/messages.js b/api/server/routes/messages.js
index 24704ba769..756f8ff8cb 100644
--- a/api/server/routes/messages.js
+++ b/api/server/routes/messages.js
@@ -22,6 +22,7 @@ const {
assertStoredMessageMutationAllowed,
assertChatMutationAllowed,
assertStoredMessageBranchAllowed,
+ reportLocatorTraversalFailure,
mergeUserSubmittedPaths,
mergeUserSubmittedMessageFieldPaths,
isContentFilterError,
@@ -40,6 +41,8 @@ const db = require('~/models');
const router = express.Router();
const filterStoredMessageContent = createContentFilter({
+ messageCount: 1,
+ onTraversalFailure: reportLocatorTraversalFailure,
getFilters: (req) => req.config?.filters,
getMessageRoles: (req) => [req.body?.role],
getOpaqueFileInput: (req) => req.body,
@@ -47,6 +50,7 @@ const filterStoredMessageContent = createContentFilter({
extract: (req) => extractStoredMessageContent(req.body),
});
const filterFeedbackContent = createContentFilter({
+ onTraversalFailure: reportLocatorTraversalFailure,
getFilters: (req) => req.config?.filters,
extract: (req) => extractFeedbackContent(req.body),
});
@@ -351,7 +355,7 @@ router.post('/branch', configMiddleware, async (req, res) => {
message: newMessage,
user: req.user,
},
- { getFiles: db.getFiles },
+ { getFiles: db.getFiles, onTraversalFailure: reportLocatorTraversalFailure },
);
const savedMessage = await db.saveMessage(
diff --git a/api/server/routes/presets.js b/api/server/routes/presets.js
index 7e3ee1b92e..35b5e697ab 100644
--- a/api/server/routes/presets.js
+++ b/api/server/routes/presets.js
@@ -2,6 +2,7 @@ const crypto = require('crypto');
const express = require('express');
const { logger } = require('@librechat/data-schemas');
const {
+ reportLocatorTraversalFailure,
createContentFilter,
extractPresetContent,
projectStoredPresets,
@@ -11,6 +12,7 @@ const { requireJwtAuth, configMiddleware } = require('~/server/middleware');
const router = express.Router();
const filterPresetContent = createContentFilter({
+ onTraversalFailure: reportLocatorTraversalFailure,
getFilters: (req) => req.config?.filters,
extract: (req) => extractPresetContent(req.body),
});
diff --git a/api/server/routes/share.js b/api/server/routes/share.js
index 2aad568c24..3cd5761cb1 100644
--- a/api/server/routes/share.js
+++ b/api/server/routes/share.js
@@ -3,6 +3,7 @@ const express = require('express');
const {
assertModelBoundContent,
createShareContentPreflight,
+ reportLocatorTraversalFailure,
isEnabled,
isContentFilterError,
isConversationImportError,
@@ -140,6 +141,7 @@ const PREVIEW_LAZY_SWEEP_CUTOFF_MS = 2 * 60 * 1000;
const enforceSharedFileContentPolicy = (req, res, next) => {
try {
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters: req.config?.filters,
files: [req.liveFile],
});
@@ -367,6 +369,7 @@ if (allowSharedLinks) {
async (req, res) => {
try {
const contentPreflight = createShareContentPreflight(req.config?.filters, {
+ onTraversalFailure: reportLocatorTraversalFailure,
sharedFileMetadata: true,
legacyPii: req.config?.messageFilter?.pii,
});
@@ -429,6 +432,7 @@ if (allowSharedLinks) {
// the GET share route so disabled file snapshots aren't copied into forks.
snapshotFiles: !isFileSnapshotKillSwitchActive(),
sharedContentPreflight: createShareContentPreflight(req.config?.filters, {
+ onTraversalFailure: reportLocatorTraversalFailure,
sharedFileMetadata: true,
legacyPii: req.config?.messageFilter?.pii,
}),
@@ -653,6 +657,7 @@ router.post(
// did not uncheck "share files" (body flag absent defaults to enabled).
const snapshotFiles = isFileSnapshotEnabled(req.config) && requestedSnapshotFiles !== false;
const contentPreflight = createShareContentPreflight(req.config?.filters, {
+ onTraversalFailure: reportLocatorTraversalFailure,
snapshotFiles,
user: req.user,
getFiles,
@@ -723,6 +728,7 @@ router.patch(
const snapshotFiles = isFileSnapshotEnabled(req.config) && requestedSnapshotFiles !== false;
const contentPreflight = createShareContentPreflight(req.config?.filters, {
+ onTraversalFailure: reportLocatorTraversalFailure,
snapshotFiles,
user: req.user,
getFiles,
diff --git a/api/server/services/ToolService.js b/api/server/services/ToolService.js
index 88dae404c5..bc7693cf34 100644
--- a/api/server/services/ToolService.js
+++ b/api/server/services/ToolService.js
@@ -32,6 +32,7 @@ const {
inspectContentWithTraversal,
ContentFilterError,
assertModelBoundContent,
+ reportLocatorTraversalFailure,
extractToolArgumentContent,
contentFilterModelBoundBlockResponse,
getSafeErrorMetadata,
@@ -183,6 +184,7 @@ const assertToolResourcesAllowed = ({ req, toolResources, tools }) => {
Array.isArray(resource?.files) ? resource.files : [],
);
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters,
agents: [{ tool_resources: activeResources }],
files,
@@ -200,6 +202,7 @@ const withoutEncryptedActionSecrets = (action) => {
const prepareStoredActionsForUse = async ({ actions, filters, decrypt }) => {
if (filters != null) {
assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
filters,
actions: actions.map(withoutEncryptedActionSecrets),
});
@@ -220,7 +223,11 @@ const prepareStoredActionsForUse = async ({ actions, filters, decrypt }) => {
})),
);
if (filters != null) {
- assertModelBoundContent({ filters, actions: decryptedActions });
+ assertModelBoundContent({
+ onTraversalFailure: reportLocatorTraversalFailure,
+ filters,
+ actions: decryptedActions,
+ });
}
return decryptedActions;
};
diff --git a/api/server/utils/import/importBatchBuilder.js b/api/server/utils/import/importBatchBuilder.js
index ac8da31cfa..afbd5d3281 100644
--- a/api/server/utils/import/importBatchBuilder.js
+++ b/api/server/utils/import/importBatchBuilder.js
@@ -3,6 +3,7 @@ const {
assertConversationImportWriteSize,
assertModelBoundContent,
assertConversationImportContentAllowed,
+ reportLocatorTraversalFailure,
executeConversationImportWrites,
} = require('@librechat/api');
const {
@@ -56,6 +57,7 @@ function createImportBatchBuilder(requestUserId, interfaceConfig, filters, legac
async function assertConversationContentAllowed(filters, snapshot, resolutionContext = {}) {
return assertConversationImportContentAllowed(filters, snapshot, {
...resolutionContext,
+ onTraversalFailure: reportLocatorTraversalFailure,
assertModelBoundContent,
});
}
diff --git a/api/server/utils/import/importBatchBuilder.spec.js b/api/server/utils/import/importBatchBuilder.spec.js
index f14ad5fd49..f7a28f54d0 100644
--- a/api/server/utils/import/importBatchBuilder.spec.js
+++ b/api/server/utils/import/importBatchBuilder.spec.js
@@ -437,8 +437,21 @@ describe('ImportBatchBuilder content filtering', () => {
const messageCalls = mockAssertModelBoundContent.mock.calls.filter(
([input]) => input.storedMessages != null,
);
- expect(fileCalls).toEqual([[{ filters, resolvedFiles: [canonicalFile] }]]);
+ expect(fileCalls).toEqual([
+ [
+ {
+ filters,
+ resolvedFiles: [canonicalFile],
+ onTraversalFailure: actualApi.reportLocatorTraversalFailure,
+ },
+ ],
+ ]);
expect(messageCalls).toHaveLength(2);
+ expect(
+ messageCalls.every(
+ ([input]) => input.onTraversalFailure === actualApi.reportLocatorTraversalFailure,
+ ),
+ ).toBe(true);
expect(messageCalls.every(([input]) => input.storedMessages.length === 1)).toBe(true);
expect(messageCalls.every(([input]) => input.resolvedFiles == null)).toBe(true);
});
@@ -742,8 +755,21 @@ describe('ImportBatchBuilder content filtering', () => {
const messageCalls = mockAssertModelBoundContent.mock.calls.filter(
([input]) => input.storedMessages != null,
);
- expect(fileCalls).toEqual([[{ filters, resolvedFiles: [canonicalFile] }]]);
+ expect(fileCalls).toEqual([
+ [
+ {
+ filters,
+ resolvedFiles: [canonicalFile],
+ onTraversalFailure: actualApi.reportLocatorTraversalFailure,
+ },
+ ],
+ ]);
expect(messageCalls).toHaveLength(2);
+ expect(
+ messageCalls.every(
+ ([input]) => input.onTraversalFailure === actualApi.reportLocatorTraversalFailure,
+ ),
+ ).toBe(true);
expect(messageCalls.every(([input]) => input.storedMessages.length === 1)).toBe(true);
expect(messageCalls.every(([input]) => input.resolvedFiles == null)).toBe(true);
expect(bulkSaveMessages).not.toHaveBeenCalled();
diff --git a/packages/api/src/agents/hitl/inspection.ts b/packages/api/src/agents/hitl/inspection.ts
index 0b87e41c89..0a0cadaaa0 100644
--- a/packages/api/src/agents/hitl/inspection.ts
+++ b/packages/api/src/agents/hitl/inspection.ts
@@ -9,6 +9,7 @@ import {
import type { Agent, FiltersConfig, UserSubmittedMessageFieldPath } from 'librechat-data-provider';
import type { AppConfig, IUser } from '@librechat/data-schemas';
import type { StoredMessageContentInput } from '~/protection/adapters/submissions';
+import type { LocatorTraversalReporter } from '../../protection/diagnostics';
import type { ExternalChatMessage } from '~/protection/adapters/messages';
import {
hasActiveFilePolicy,
@@ -69,6 +70,7 @@ type GetResumeMessages = (filter: {
}) => Promise<ResumeMessage[] | null | undefined>;
export interface ResumeContentInspectionInput {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
appConfig?: AppConfig;
conversationId: string;
targetMessageId?: string | null;
@@ -374,6 +376,8 @@ async function getResumeFileInspection(
fileReferenceInputs: input.fileReferenceInputs ?? [],
};
const fileInspection = await resolveCanonicalFileReferences({
+ messageCount: storedMessages.length + input.submittedMessages.length,
+ onTraversalFailure: input.onTraversalFailure,
filters,
input: originalInput,
user: input.user,
diff --git a/packages/api/src/agents/hitl/protection.spec.ts b/packages/api/src/agents/hitl/protection.spec.ts
index 7b81490610..6c7c194915 100644
--- a/packages/api/src/agents/hitl/protection.spec.ts
+++ b/packages/api/src/agents/hitl/protection.spec.ts
@@ -41,6 +41,40 @@ function createInput(appConfig: unknown): AssertResumeRuntimeContentAllowedInput
}
describe('assertResumeRuntimeContentAllowed', () => {
+ it('reports locator failures from restored HITL content through its dependencies', async () => {
+ const onTraversalFailure = jest.fn();
+ const dependencies = { ...createDependencies(), onTraversalFailure };
+ dependencies.getFiles.mockResolvedValue([{ file_id: 'owned', filename: 'safe.txt' }]);
+ const input = createInput({
+ filters: { files: { pii: { fields: ['name'], starterPatterns: ['sk_prefix'] } } },
+ });
+ await expect(
+ assertResumeRuntimeContentAllowed(
+ {
+ ...input,
+ storedMessages: [
+ {
+ messageId: 'source-message',
+ isCreatedByUser: true,
+ role: 'user',
+ files: [{ file_id: 'owned' }],
+ content: Array.from({ length: 4200 }, () => ({ type: 'text', text: 'safe' })),
+ },
+ ],
+ },
+ dependencies,
+ ),
+ ).rejects.toMatchObject({ code: 'content_filter_uninspectable' });
+ expect(onTraversalFailure).toHaveBeenCalledWith(
+ expect.objectContaining({
+ operation: 'omit_resolved_file_locators',
+ reason: 'array_length',
+ messageCount: 1,
+ resolvedFileCount: 1,
+ }),
+ );
+ });
+
it.each([
{ filters: { prompts: { pii: {} } } },
{
diff --git a/packages/api/src/agents/hitl/protection.ts b/packages/api/src/agents/hitl/protection.ts
index 7008e67375..500e7b3126 100644
--- a/packages/api/src/agents/hitl/protection.ts
+++ b/packages/api/src/agents/hitl/protection.ts
@@ -37,6 +37,7 @@ import type {
ResumeContentInspectionInput,
ResumeSnapshotAgent,
} from './inspection';
+import type { LocatorTraversalReporter } from '../../protection/diagnostics';
import type { TextContentFragment } from '~/protection/types';
import type { CheckAccessParams } from '~/middleware/access';
import {
@@ -167,6 +168,7 @@ const ENCRYPTED_ACTION_METADATA_FIELDS = [
] as const;
export interface ResumeContentProtectionDependencies {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
getAgentCheckpointer: (
config: TCheckpointerConfig | undefined,
) => Promise<ResumeCheckpointer | undefined>;
@@ -219,7 +221,7 @@ export interface AssertResumeRuntimeContentAllowedInput
export type ResumeRuntimeContentProtectionDependencies = Pick<
ResumeContentProtectionDependencies,
- 'getAgentCheckpointer' | 'getMessages' | 'getFiles'
+ 'getAgentCheckpointer' | 'getMessages' | 'getFiles' | 'onTraversalFailure'
>;
export interface ResumeRuntimeContentProjection {
@@ -800,6 +802,7 @@ async function assertResumeAgentContentAllowed({
definitionAgents.push(memoryAgentDefinition.definition);
}
assertModelBoundContent({
+ onTraversalFailure: dependencies.onTraversalFailure,
filters: appConfig?.filters,
legacyPii: appConfig?.messageFilter?.pii,
agents: definitionAgents,
@@ -855,6 +858,7 @@ async function assertResumeModelBoundContentAllowed(
): Promise<ResumeModelBoundContentProjection> {
if (!hasResumeHistoryProtection(appConfig)) {
assertModelBoundContent({
+ onTraversalFailure: dependencies.onTraversalFailure,
filters: appConfig?.filters,
legacyPii: appConfig?.messageFilter?.pii,
agents,
@@ -883,6 +887,7 @@ async function assertResumeModelBoundContentAllowed(
}
const checkpointContent = getResumeCheckpointContent(checkpointMessages);
const contentInspection = await getResumeContentInspection({
+ onTraversalFailure: dependencies.onTraversalFailure,
appConfig,
conversationId,
targetMessageId,
@@ -897,6 +902,7 @@ async function assertResumeModelBoundContentAllowed(
getFiles: dependencies.getFiles,
});
assertModelBoundContent({
+ onTraversalFailure: dependencies.onTraversalFailure,
filters: appConfig?.filters,
legacyPii: appConfig?.messageFilter?.pii,
submittedMessages: contentInspection.submittedMessages,
diff --git a/packages/api/src/agents/openai/service.ts b/packages/api/src/agents/openai/service.ts
index 782494635c..2214390bfc 100644
--- a/packages/api/src/agents/openai/service.ts
+++ b/packages/api/src/agents/openai/service.ts
@@ -1,3 +1,4 @@
+import type { LocatorTraversalReporter } from '../../protection/diagnostics';
/**
* OpenAI-compatible chat completions service for agents.
*
@@ -85,6 +86,7 @@ import { createSafeUser } from '~/utils';
* Dependencies for the chat completion service
*/
export interface ChatCompletionDependencies {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
/** Get agent by ID */
getAgent: (params: { id: string }) => Promise<Agent | null>;
/** Initialize agent for use */
@@ -776,6 +778,7 @@ export async function createAgentChatCompletion(
);
}
assertModelBoundContent({
+ onTraversalFailure: deps.onTraversalFailure,
filters,
legacyPii,
submittedMessages,
diff --git a/packages/api/src/app/metrics.spec.ts b/packages/api/src/app/metrics.spec.ts
index 3b4ab585d5..25141f6c25 100644
--- a/packages/api/src/app/metrics.spec.ts
+++ b/packages/api/src/app/metrics.spec.ts
@@ -1,3 +1,4 @@
+import { omitResolvedCanonicalFileLocators } from '../protection/files';
/// <reference types="jest" />
import express from 'express';
import request from 'supertest';
@@ -6,6 +7,7 @@ import { recordAgentEventActorReceiptMetric } from '@librechat/data-schemas';
import type { Request, Response } from 'express';
import {
createMetrics,
+ reportLocatorTraversalFailure,
instrumentMongooseQueryMetrics,
normalizePath,
recordAgentStartupMilestone,
@@ -137,6 +139,36 @@ describe('createMetrics', () => {
);
});
+ it('records locator traversal reasons and count distributions without content labels', async () => {
+ process.env.METRICS_SECRET = 'test-secret';
+ createMetrics();
+ const app = express();
+ app.use('/metrics', createMetrics().metricsRouter);
+ expect(() =>
+ omitResolvedCanonicalFileLocators(
+ { file_id: 'PRIVATE-FILE', payload: new Array(4096) },
+ new Map([['PRIVATE-FILE', { file_id: 'PRIVATE-FILE' }]]),
+ { messageCount: 58, onTraversalFailure: reportLocatorTraversalFailure },
+ ),
+ ).toThrow();
+ const response = await request(app).get('/metrics').set('Authorization', 'Bearer test-secret');
+ expect(response.status).toBe(200);
+ expect(response.text).toContain(
+ 'content_filter_locator_traversal_failures_total{operation="omit_resolved_file_locators",reason="array_length"} 1',
+ );
+ for (const [dimension, count] of [
+ ['visitedNodes', 2],
+ ['depth', 1],
+ ['messageCount', 58],
+ ['resolvedFileCount', 1],
+ ]) {
+ expect(response.text).toContain(
+ `content_filter_locator_traversal_size_sum{operation="omit_resolved_file_locators",reason="array_length",dimension="${dimension}"} ${count}`,
+ );
+ }
+ expect(response.text).not.toContain('PRIVATE-FILE');
+ });
+
it('exposes bounded event actor receipt settlement, replay, conflict, and migration metrics', async () => {
const app = express();
process.env.METRICS_SECRET = 'test-secret';
diff --git a/packages/api/src/app/metrics.ts b/packages/api/src/app/metrics.ts
index f44ae1ff59..dc7bcc1da8 100644
--- a/packages/api/src/app/metrics.ts
+++ b/packages/api/src/app/metrics.ts
@@ -5,6 +5,7 @@ import { logger, setAgentEventActorReceiptMetricObserver } from '@librechat/data
import type { Request, Response, NextFunction, RequestHandler } from 'express';
import type { Mongoose } from 'mongoose';
import type { AgentStartupMilestone, AgentStartupResult } from '~/agents/phases';
+import type { LocatorTraversalFailure } from '../protection/diagnostics';
import { agentStartupMilestones, agentStartupResults } from '~/agents/phases';
const PATH_NORMALIZATIONS: [RegExp, string][] = [
@@ -281,7 +282,16 @@ let redisOperationMetrics: RedisOperationMetrics = {
recordOperation: () => undefined,
};
+let observeLocatorTraversal: (failure: LocatorTraversalFailure) => void = () => undefined;
+
+/** Application sink supplied explicitly to content inspection callers. */
+export function reportLocatorTraversalFailure(failure: LocatorTraversalFailure): void {
+ logger.warn(`[content-filter] Locator traversal incomplete ${JSON.stringify(failure)}`, failure);
+ observeLocatorTraversal(failure);
+}
+
const resetMetricRecorders = (): void => {
+ observeLocatorTraversal = () => undefined;
openIDUserLookupMetrics = {
recordLookup: () => undefined,
};
@@ -530,6 +540,33 @@ export function createMetrics(options: MetricsOptions = {}): PrometheusMetrics {
const registry = new Registry();
collectDefaultMetrics({ register: registry });
+ observeLocatorTraversal = () => undefined;
+ const locatorTraversalFailuresTotal = new Counter({
+ name: 'content_filter_locator_traversal_failures_total',
+ help: 'Incomplete resolved file locator traversals',
+ labelNames: ['operation', 'reason'] as const,
+ registers: [registry],
+ });
+ const locatorTraversalSize = new Histogram({
+ name: 'content_filter_locator_traversal_size',
+ help: 'Structural counts at an incomplete resolved file locator traversal',
+ labelNames: ['operation', 'reason', 'dimension'] as const,
+ buckets: [0, 1, 8, 24, 64, 256, 1024, 4096, 16384],
+ registers: [registry],
+ });
+ observeLocatorTraversal = (failure: LocatorTraversalFailure): void => {
+ const labels = { operation: failure.operation, reason: failure.reason };
+ locatorTraversalFailuresTotal.inc(labels);
+ for (const dimension of [
+ 'visitedNodes',
+ 'depth',
+ 'messageCount',
+ 'resolvedFileCount',
+ ] as const) {
+ locatorTraversalSize.observe({ ...labels, dimension }, failure[dimension]);
+ }
+ };
+
const httpRequests = new Counter({
name: 'http_requests_total',
help: 'Total HTTP requests',
diff --git a/packages/api/src/assistants/protection.spec.ts b/packages/api/src/assistants/protection.spec.ts
index a781231974..8de93d764a 100644
--- a/packages/api/src/assistants/protection.spec.ts
+++ b/packages/api/src/assistants/protection.spec.ts
@@ -48,6 +48,30 @@ function createOpenAI({
}
describe('Assistants model-bound content preflight', () => {
+ it('reports incomplete user-file hydration through the supplied reporter', async () => {
+ const onTraversalFailure = jest.fn();
+ await preflightAssistantUserMessageContent({
+ config: { filters: { files: { pii: { fields: ['name'], starterPatterns: ['sk_prefix'] } } } },
+ user: { id: 'user-1' },
+ message: {
+ file_ids: ['owned'],
+ metadata: {
+ trace: Array.from({ length: 4200 }, () => ({ text: 'safe' })),
+ },
+ },
+ getFiles: jest.fn().mockResolvedValue([{ file_id: 'owned', filename: 'safe.txt' }]),
+ onTraversalFailure,
+ });
+ expect(onTraversalFailure).toHaveBeenCalledWith(
+ expect.objectContaining({
+ operation: 'omit_resolved_file_locators',
+ reason: 'array_length',
+ messageCount: 1,
+ resolvedFileCount: 1,
+ }),
+ );
+ });
+
let getFiles: jest.Mock;
beforeEach(() => {
diff --git a/packages/api/src/assistants/protection.ts b/packages/api/src/assistants/protection.ts
index d2fc8697ac..ce997c4a27 100644
--- a/packages/api/src/assistants/protection.ts
+++ b/packages/api/src/assistants/protection.ts
@@ -10,6 +10,7 @@ import type {
StoredMessageContentInput,
} from '../protection/adapters/submissions';
import type { ExternalChatMessage } from '../protection/adapters/messages';
+import type { LocatorTraversalReporter } from '../protection/diagnostics';
import { hasActiveFilePolicy, resolveCanonicalFileReferences } from '../protection/files';
import { ContentTraversalLimitError } from '../protection/adapters/nested';
import { assertModelBoundContent } from '../middleware/modelBoundContent';
@@ -65,6 +66,7 @@ interface AssistantUserMessage extends ExternalChatMessage {
}
interface PreflightAssistantRunContentInput {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
readonly config?: AssistantProtectionConfig;
readonly openai: AssistantOpenAIClient;
readonly user?: CanonicalFileInspectionUser;
@@ -74,6 +76,7 @@ interface PreflightAssistantRunContentInput {
}
interface PreflightAssistantUserMessageContentInput {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
readonly config?: AssistantProtectionConfig;
readonly user?: CanonicalFileInspectionUser;
readonly message: AssistantUserMessage;
@@ -310,6 +313,7 @@ export async function preflightAssistantRunContent({
assistantId,
threadId,
getFiles,
+ onTraversalFailure,
}: PreflightAssistantRunContentInput): Promise<AssistantContentInput | undefined> {
const filters = config?.filters;
const legacyPii = config?.messageFilter?.pii;
@@ -339,6 +343,8 @@ export async function preflightAssistantRunContent({
let resolvedFiles: CanonicalFileInspectionFile[] = [];
if (hasActiveFilePolicy(filters)) {
const fileInspection = await resolveCanonicalFileReferences({
+ messageCount: storedMessages.length,
+ onTraversalFailure,
filters,
input: content,
user,
@@ -349,6 +355,7 @@ export async function preflightAssistantRunContent({
}
assertModelBoundContent({
+ onTraversalFailure,
filters,
legacyPii,
submittedMessages: hasActivePiiPatterns(legacyPii)
@@ -372,6 +379,7 @@ export async function preflightAssistantUserMessageContent({
message,
fileIds,
getFiles,
+ onTraversalFailure,
}: PreflightAssistantUserMessageContentInput): Promise<void> {
const filters = config?.filters;
if (!hasActiveFilePolicy(filters)) {
@@ -386,6 +394,8 @@ export async function preflightAssistantUserMessageContent({
file_ids: [...new Set([...(message.file_ids ?? []), ...fileIds])],
};
const fileInspection = await resolveCanonicalFileReferences({
+ messageCount: 1,
+ onTraversalFailure,
filters,
input: inspectionMessage,
user,
@@ -393,6 +403,7 @@ export async function preflightAssistantUserMessageContent({
});
assertModelBoundContent({
+ onTraversalFailure,
filters,
legacyPii: config?.messageFilter?.pii,
submittedMessages: [fileInspection.sanitizedInput],
diff --git a/packages/api/src/imports.spec.ts b/packages/api/src/imports.spec.ts
index c391282631..72c376f025 100644
--- a/packages/api/src/imports.spec.ts
+++ b/packages/api/src/imports.spec.ts
@@ -33,6 +33,35 @@ function deepValue(depth = 30): string | { nested: ReturnType<typeof deepValue>
}
describe('conversation import protection', () => {
+ it('reports incomplete locator hydration through the import context', async () => {
+ const onTraversalFailure = jest.fn();
+ await assertConversationImportContentAllowed(
+ { files: { pii: { fields: ['name'], starterPatterns: ['sk_prefix'] } } },
+ {
+ conversations: [],
+ messages: [
+ {
+ files: [{ file_id: 'owned' }],
+ content: Array.from({ length: 4200 }, () => ({ type: 'text', text: 'safe' })),
+ },
+ ],
+ },
+ {
+ user: { id: 'user-1' },
+ onTraversalFailure,
+ getFiles: jest.fn().mockResolvedValue([{ file_id: 'owned', filename: 'safe.txt' }]),
+ },
+ );
+ expect(onTraversalFailure).toHaveBeenCalledWith(
+ expect.objectContaining({
+ operation: 'omit_resolved_file_locators',
+ reason: 'array_length',
+ messageCount: 1,
+ resolvedFileCount: 1,
+ }),
+ );
+ });
+
it('returns without resolving or revalidating when protection is disabled', async () => {
const getFiles = jest.fn<
ReturnType<GetCanonicalFilesForInspection>,
diff --git a/packages/api/src/imports.ts b/packages/api/src/imports.ts
index 3547ff2abc..f8af5d082a 100644
--- a/packages/api/src/imports.ts
+++ b/packages/api/src/imports.ts
@@ -14,6 +14,7 @@ import type {
StoredMessageContentInput,
} from './protection/adapters/submissions';
import type { ModelBoundContentInput } from './middleware/modelBoundContent';
+import type { LocatorTraversalReporter } from './protection/diagnostics';
import {
getContentTraversalFragments,
getContentTraversalScopes,
@@ -50,6 +51,7 @@ export interface ConversationImportSnapshot {
}
export interface ConversationImportProtectionContext {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
readonly user?: CanonicalFileInspectionUser;
readonly getFiles?: GetCanonicalFilesForInspection;
readonly trustedLiveFiles?: readonly CanonicalFileInspectionFile[];
@@ -131,6 +133,8 @@ async function inspectConversationImportContent(
let resolvedFiles: CanonicalFileInspectionFile[] = [];
if (hasActiveFilePolicy(activeFilters)) {
const fileInspection = await resolveCanonicalFileReferences({
+ messageCount: snapshot.messages.length,
+ onTraversalFailure: context.onTraversalFailure,
filters: activeFilters,
input: snapshot.messages,
user: context.user,
@@ -145,6 +149,7 @@ async function inspectConversationImportContent(
context.assertModelBoundContent ?? assertModelBoundContentAtBoundary;
if (resolvedFiles.length > 0) {
assertModelBoundContent({
+ onTraversalFailure: context.onTraversalFailure,
filters: activeFilters,
resolvedFiles,
});
@@ -153,6 +158,7 @@ async function inspectConversationImportContent(
for (const message of storedMessages) {
try {
assertModelBoundContent({
+ onTraversalFailure: context.onTraversalFailure,
filters: activeFilters,
legacyPii,
storedMessages: [message],
diff --git a/packages/api/src/middleware/contentFilter.ts b/packages/api/src/middleware/contentFilter.ts
index 88a9ce81a1..8700e496d6 100644
--- a/packages/api/src/middleware/contentFilter.ts
+++ b/packages/api/src/middleware/contentFilter.ts
@@ -6,6 +6,7 @@ import type {
} from 'express';
import type { FiltersConfig, MessageFilterPiiConfig } from 'librechat-data-provider';
import type { ProtectionFinding, TextContentFragment } from '../protection/types';
+import type { LocatorTraversalReporter } from '../protection/diagnostics';
import {
contentFilterUninspectableResponse,
getBlockedOpaqueFileField,
@@ -98,6 +99,8 @@ export function isContentFilterError(
}
export interface CreateContentFilterOptions {
+ readonly messageCount?: number;
+ readonly onTraversalFailure?: LocatorTraversalReporter;
getFilters: (req: ServerRequest) => FiltersConfig | undefined;
getLegacyPii?: (req: ServerRequest) => MessageFilterPiiConfig | undefined;
getMessageRoles?: (req: ServerRequest) => readonly (string | undefined)[];
@@ -125,6 +128,8 @@ export function createContentFilter(options: CreateContentFilterOptions): Reques
if (opaqueFileInput != null && options.getFiles != null && hasActiveFilePolicy(filters)) {
try {
const fileInspection = await resolveCanonicalFileReferences({
+ messageCount: options.messageCount,
+ onTraversalFailure: options.onTraversalFailure,
filters,
input: opaqueFileInput,
user: (
diff --git a/packages/api/src/middleware/messageFilterPii.ts b/packages/api/src/middleware/messageFilterPii.ts
index 17893ad3d0..a9cd123c05 100644
--- a/packages/api/src/middleware/messageFilterPii.ts
+++ b/packages/api/src/middleware/messageFilterPii.ts
@@ -15,6 +15,7 @@ import type {
Response as ServerResponse,
} from 'express';
import type { FiltersConfig, MessageFilterPiiConfig } from 'librechat-data-provider';
+import type { LocatorTraversalReporter } from '../protection/diagnostics';
import type { TextContentFragment } from '../protection/types';
import {
contentFilterUninspectableResponse,
@@ -142,6 +143,7 @@ export function findPiiMatchInMessages(
}
export interface CreateMessageFilterPiiOptions {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
getConfig: (req: ServerRequest) => MessageFilterPiiConfig | undefined;
getFilters?: (req: ServerRequest) => FiltersConfig | undefined;
getFiles?: GetCanonicalFilesForInspection;
@@ -172,6 +174,8 @@ export function createMessageFilterPii(options: CreateMessageFilterPiiOptions):
if (options.getFiles != null && hasActiveFilePolicy(filters)) {
try {
const fileInspection = await resolveCanonicalFileReferences({
+ messageCount: 1,
+ onTraversalFailure: options.onTraversalFailure,
filters,
input: req.body,
user: (
diff --git a/packages/api/src/middleware/modelBoundContent.spec.ts b/packages/api/src/middleware/modelBoundContent.spec.ts
index aeb41fb9ce..884326e080 100644
--- a/packages/api/src/middleware/modelBoundContent.spec.ts
+++ b/packages/api/src/middleware/modelBoundContent.spec.ts
@@ -1133,6 +1133,57 @@ describe('assertModelBoundContent', () => {
).not.toThrow();
});
+ it('inspects long stored history per message and still filters hydrated file content', () => {
+ const onTraversalFailure = jest.fn();
+ const storedMessages = Array.from({ length: 58 }, (_, index) => ({
+ isCreatedByUser: true,
+ role: 'user',
+ text: `Historical step ${index}`,
+ files: index === 0 ? [{ file_id: 'file-owned' }] : [],
+ content: Array.from({ length: 80 }, () => ({ type: 'text', text: 'safe preview material' })),
+ }));
+ const input = {
+ filters: {
+ files: {
+ pii: {
+ fields: ['extracted_text'],
+ starterPatterns: [],
+ customPatterns: [{ id: 'private', label: 'private value', regex: 'PRIVATE-FILE' }],
+ uninspectable: 'block',
+ },
+ },
+ } as FiltersConfig,
+ storedMessages,
+ onTraversalFailure,
+ resolvedFiles: [{ file_id: 'file-owned', text: 'safe canonical content' }],
+ };
+
+ expect(() => assertModelBoundContent(input)).not.toThrow();
+ expect(() =>
+ assertModelBoundContent({
+ ...input,
+ resolvedFiles: [{ file_id: 'file-owned', text: 'PRIVATE-FILE' }],
+ }),
+ ).toThrow('Submitted content contains a private value');
+ expect(() =>
+ assertModelBoundContent({
+ ...input,
+ storedMessages: [
+ { ...storedMessages[0], content: storedMessages.flatMap((m) => m.content) },
+ ],
+ }),
+ ).toThrow('Submitted content could not be completely inspected before processing.');
+ expect(onTraversalFailure).toHaveBeenCalledTimes(1);
+ expect(onTraversalFailure).toHaveBeenCalledWith(
+ expect.objectContaining({
+ operation: 'omit_resolved_file_locators',
+ reason: 'array_length',
+ messageCount: 1,
+ resolvedFileCount: 1,
+ }),
+ );
+ });
+
it('inspects owner-resolved file content before authorizing its stored locator', () => {
expect(() =>
assertModelBoundContent({
diff --git a/packages/api/src/middleware/modelBoundContent.ts b/packages/api/src/middleware/modelBoundContent.ts
index f981d2cf1a..c17136d42b 100644
--- a/packages/api/src/middleware/modelBoundContent.ts
+++ b/packages/api/src/middleware/modelBoundContent.ts
@@ -26,6 +26,7 @@ import type {
} from '../protection/adapters/nested';
import type { JsonPointer, TextContentFragment } from '../protection/types';
import type { ExternalChatMessage } from '../protection/adapters/messages';
+import type { LocatorTraversalReporter } from '../protection/diagnostics';
import type { ConfiguredContentInspector } from '../protection/runtime';
import type { CanonicalFileInspectionFile } from '../protection/files';
import {
@@ -230,6 +231,7 @@ class FatalModelBoundPolicyError extends StreamLimitExceededError {
}
export interface ModelBoundProviderContentInput {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
readonly filters?: FiltersConfig;
readonly legacyPii?: MessageFilterPiiConfig;
readonly providerMessages: readonly ModelBoundProviderMessage[];
@@ -689,6 +691,7 @@ export interface InitialModelBoundAdmission {
}
export interface ModelBoundContentInput {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
readonly filters?: FiltersConfig;
readonly legacyPii?: MessageFilterPiiConfig;
/** Fresh API input: every role is caller-submitted. */
@@ -3067,6 +3070,7 @@ function assertIndexedModelBoundProviderContent(
const resolvedWorkBudgets = workBudgets ?? createProviderProjectionWorkBudgets(index);
const projection = projectModelBoundProviderContent(input, index, resolvedWorkBudgets);
assertModelBoundContent({
+ onTraversalFailure: input.onTraversalFailure,
filters: input.filters,
legacyPii: input.legacyPii,
storedMessages: projection.storedMessages,
@@ -3162,6 +3166,7 @@ export function createModelBoundChatModelCallback(
const resolvedFileSnapshot = snapshotBoundedProviderArray(input.resolvedFiles);
const sourceFileIdSnapshot = snapshotBoundedSourceFileIds(input.fileIdsBySourceMessageId);
const stableInput = {
+ onTraversalFailure: input.onTraversalFailure,
filters: input.filters,
legacyPii: input.legacyPii,
storedMessages: storedMessageSnapshot.values,
@@ -3530,7 +3535,6 @@ function inspectModelBoundContent(
appendSubmittedTraversalError(error);
}
}
- const storedUserMessages: StoredModelBoundMessage[] = [];
let aggregateStoredTraversalErrorAdded = false;
const appendStoredTraversalError = (error: ContentTraversalLimitError): void => {
if (
@@ -3624,7 +3628,10 @@ function inspectModelBoundContent(
if (projectedMessage != null) {
assertInspectableFileInput(
input.filters,
- omitResolvedCanonicalFileLocators(projectedMessage, resolvedFilesById),
+ omitResolvedCanonicalFileLocators(projectedMessage, resolvedFilesById, {
+ messageCount: input.storedMessages?.length ?? 0,
+ onTraversalFailure: input.onTraversalFailure,
+ }),
);
}
/** Legacy unmarked assistant rows are treated as model-generated by
@@ -3719,7 +3726,13 @@ function inspectModelBoundContent(
}
continue;
}
- storedUserMessages.push(message);
+ assertInspectableFileInput(
+ input.filters,
+ omitResolvedCanonicalFileLocators(message, resolvedFilesById, {
+ messageCount: input.storedMessages?.length ?? 0,
+ onTraversalFailure: input.onTraversalFailure,
+ }),
+ );
inspectFragments(messageFragments);
inspectFragments(exactMessageFragments);
if (
@@ -3734,10 +3747,6 @@ function inspectModelBoundContent(
appendStoredTraversalError(traversalError);
}
}
- assertInspectableFileInput(
- input.filters,
- omitResolvedCanonicalFileLocators(storedUserMessages, resolvedFilesById),
- );
for (const agent of input.agents ?? []) {
const agentFilesById = new Map<string, ModelBoundCanonicalFile>();
for (const file of getHydratedAgentFiles(agent)) {
@@ -3748,7 +3757,10 @@ function inspectModelBoundContent(
}
assertInspectableFileInput(
input.filters,
- omitResolvedCanonicalFileLocators(agent, agentFilesById),
+ omitResolvedCanonicalFileLocators(agent, agentFilesById, {
+ onTraversalFailure: input.onTraversalFailure,
+ messageCount: input.storedMessages?.length ?? 0,
+ }),
);
appendExtractedContent(() => extractAgentContent(agent));
}
diff --git a/packages/api/src/protection/adapters/nested.ts b/packages/api/src/protection/adapters/nested.ts
index e2f66d2478..0590339fc1 100644
--- a/packages/api/src/protection/adapters/nested.ts
+++ b/packages/api/src/protection/adapters/nested.ts
@@ -71,10 +71,14 @@ export interface VisitNestedStringsOptions {
export function getBoundedOwnEnumerableEntries(
value: object,
limit: number,
-): { readonly entries: [string, unknown][]; readonly complete: boolean } {
+): {
+ readonly entries: [string, unknown][];
+ readonly complete: boolean;
+ readonly reason?: 'object_entries' | 'reflection_error';
+} {
const entries: [string, unknown][] = [];
if (limit !== Number.POSITIVE_INFINITY && (!Number.isSafeInteger(limit) || limit < 0)) {
- return { entries, complete: false };
+ return { entries, complete: false, reason: 'object_entries' };
}
try {
for (const key in value) {
@@ -82,12 +86,12 @@ export function getBoundedOwnEnumerableEntries(
continue;
}
if (entries.length >= limit) {
- return { entries, complete: false };
+ return { entries, complete: false, reason: 'object_entries' };
}
entries.push([key, (value as { readonly [key: string]: unknown })[key]]);
}
} catch {
- return { entries, complete: false };
+ return { entries, complete: false, reason: 'reflection_error' };
}
return { entries, complete: true };
}
@@ -109,14 +113,30 @@ export type ContentTraversalScope = {
const CONTENT_TRAVERSAL_FRAGMENTS = new WeakMap<object, readonly TextContentFragment[]>();
const CONTENT_TRAVERSAL_SCOPES = new WeakMap<object, readonly ContentTraversalScope[]>();
+export type ContentTraversalLimitReason =
+ | 'max_depth'
+ | 'max_nodes'
+ | 'array_length'
+ | 'object_entries'
+ | 'reflection_error';
+
+export interface ContentTraversalDiagnostics {
+ readonly operation: 'omit_resolved_file_locators';
+ readonly reason: ContentTraversalLimitReason;
+ readonly visitedNodes: number;
+ readonly depth: number;
+}
+
export class ContentTraversalLimitError extends Error {
public readonly code = 'content_filter_uninspectable';
public readonly statusCode = 400;
public readonly body: UninspectableNestedContentResponse;
+ public readonly diagnostics?: ContentTraversalDiagnostics;
constructor(
fragments: readonly TextContentFragment[] = [],
scopes: readonly ContentTraversalScope[] = [],
+ diagnostics?: ContentTraversalDiagnostics,
) {
const primaryScope = scopes.find(({ fields }) => fields.length > 0);
const body: UninspectableNestedContentResponse = {
@@ -128,6 +148,7 @@ export class ContentTraversalLimitError extends Error {
super(body.message);
this.name = 'ContentTraversalLimitError';
this.body = body;
+ this.diagnostics = diagnostics;
CONTENT_TRAVERSAL_FRAGMENTS.set(this, fragments);
CONTENT_TRAVERSAL_SCOPES.set(this, scopes);
Object.setPrototypeOf(this, ContentTraversalLimitError.prototype);
diff --git a/packages/api/src/protection/diagnostics.ts b/packages/api/src/protection/diagnostics.ts
new file mode 100644
index 0000000000..aa085150b5
--- /dev/null
+++ b/packages/api/src/protection/diagnostics.ts
@@ -0,0 +1,8 @@
+import type { ContentTraversalDiagnostics } from './adapters/nested';
+
+export interface LocatorTraversalFailure extends ContentTraversalDiagnostics {
+ readonly messageCount: number;
+ readonly resolvedFileCount: number;
+}
+
+export type LocatorTraversalReporter = (failure: LocatorTraversalFailure) => void;
diff --git a/packages/api/src/protection/files.spec.ts b/packages/api/src/protection/files.spec.ts
index c700e05e38..2c1cc6f994 100644
--- a/packages/api/src/protection/files.spec.ts
+++ b/packages/api/src/protection/files.spec.ts
@@ -18,6 +18,7 @@ import {
UPLOAD_EXTRACTED_TEXT_PLANS,
UninspectableFileError,
} from './files';
+import { ContentTraversalLimitError } from './adapters/nested';
describe('file content inspection policy', () => {
it('defers extracted-text fail-close only to supported agent context extraction paths', () => {
@@ -981,6 +982,7 @@ describe('file content inspection policy', () => {
});
it('hydrates discovered file names without rejecting an unrelated oversized subtree', async () => {
+ const onTraversalFailure = jest.fn();
const canonicalFile = {
file_id: 'owned-file',
filename: 'safe-report.txt',
@@ -1014,11 +1016,21 @@ describe('file content inspection policy', () => {
input,
user: { id: 'user-1' },
getFiles,
+ onTraversalFailure,
+ messageCount: input.messages.length,
}),
).resolves.toMatchObject({
sanitizedInput: input,
hydratedFiles: [canonicalFile],
});
+ expect(onTraversalFailure).toHaveBeenCalledWith(
+ expect.objectContaining({
+ operation: 'omit_resolved_file_locators',
+ reason: 'array_length',
+ messageCount: 4200,
+ resolvedFileCount: 1,
+ }),
+ );
expect(getFiles).toHaveBeenCalledWith(
{ file_id: { $in: ['owned-file'] }, user: 'user-1' },
{},
@@ -1380,6 +1392,90 @@ describe('file content inspection policy', () => {
});
});
+ it.each([
+ [
+ 'max_depth',
+ () => {
+ let value: object = {};
+ for (let i = 0; i < 26; i++) value = { child: value };
+ return value;
+ },
+ ],
+ ['max_nodes', () => [...Array.from({ length: 2047 }, () => ({ child: {} })), {}, {}]],
+ ['array_length', () => new Array(4096)],
+ [
+ 'object_entries',
+ () => Object.fromEntries(Array.from({ length: 4096 }, (_, i) => [i, 'safe'])),
+ ],
+ [
+ 'reflection_error',
+ () =>
+ Object.defineProperty({}, 'payload', {
+ enumerable: true,
+ get() {
+ throw new Error('PRIVATE-CONTENT');
+ },
+ }),
+ ],
+ [
+ 'reflection_error',
+ () =>
+ Object.defineProperty([], '0', {
+ get() {
+ throw new Error('PRIVATE-CONTENT');
+ },
+ }),
+ ],
+ [
+ 'reflection_error',
+ () => {
+ const { proxy, revoke } = Proxy.revocable({}, {});
+ revoke();
+ return proxy;
+ },
+ ],
+ ] as const)('reports safe %s diagnostics for locator sanitization', (reason, makeInput) => {
+ const report = jest.fn();
+ let failure: ContentTraversalLimitError | undefined;
+ try {
+ omitResolvedCanonicalFileLocators(makeInput(), new Map([['owned', { file_id: 'owned' }]]), {
+ onTraversalFailure: report,
+ messageCount: 58,
+ });
+ } catch (error) {
+ expect(error).toBeInstanceOf(ContentTraversalLimitError);
+ failure = error as ContentTraversalLimitError;
+ }
+ expect(failure).toBeDefined();
+ expect(failure?.diagnostics).toEqual({
+ operation: 'omit_resolved_file_locators',
+ reason,
+ visitedNodes: expect.any(Number),
+ depth: expect.any(Number),
+ });
+ expect(failure?.body).not.toHaveProperty('diagnostics');
+ expect(report).toHaveBeenCalledTimes(1);
+ expect(report).toHaveBeenCalledWith({
+ ...failure?.diagnostics,
+ messageCount: 58,
+ resolvedFileCount: 1,
+ });
+ expect(JSON.stringify(report.mock.calls)).not.toContain('PRIVATE-CONTENT');
+ });
+
+ it('preserves own __proto__ opaque payloads in a null-prototype inspection copy', () => {
+ const input = JSON.parse('{"file_id":"owned","__proto__":{"file_id":"unresolved"}}');
+ const sanitized = omitResolvedCanonicalFileLocators(
+ input,
+ new Map([['owned', { file_id: 'owned' }]]),
+ );
+ expect(Object.getPrototypeOf(sanitized)).toBeNull();
+ expect(Object.prototype.hasOwnProperty.call(sanitized, '__proto__')).toBe(true);
+ expect(
+ getBlockedOpaqueFileField({ files: { pii: { uninspectable: 'block' } } }, sanitized),
+ ).not.toBeNull();
+ });
+
it('omits only locators that exactly match the resolved canonical row', () => {
const canonicalFile = {
file_id: 'owned-file',
diff --git a/packages/api/src/protection/files.ts b/packages/api/src/protection/files.ts
index 6a20f35914..aefa675d83 100644
--- a/packages/api/src/protection/files.ts
+++ b/packages/api/src/protection/files.ts
@@ -8,6 +8,8 @@ import {
isPermissiveMimeConfig,
} from 'librechat-data-provider';
import type { FileConfig, FileFilterField, FiltersConfig } from 'librechat-data-provider';
+import type { ContentTraversalLimitReason } from './adapters/nested';
+import type { LocatorTraversalReporter } from './diagnostics';
import {
ContentTraversalLimitError,
escapeJsonPointer,
@@ -91,6 +93,8 @@ export type GetCanonicalFilesForInspection = (
) => Promise<CanonicalFileInspectionFile[] | null | undefined>;
export interface CanonicalFileReferenceInspectionInput<T> {
+ readonly messageCount?: number;
+ readonly onTraversalFailure?: LocatorTraversalReporter;
readonly filters?: FiltersConfig;
readonly input: T;
readonly user?: CanonicalFileInspectionUser;
@@ -1031,114 +1035,132 @@ function omitResolvedFileLocators(
if (value == null || typeof value !== 'object') {
return value;
}
- if (depth > MAX_OPAQUE_DEPTH) {
- throw new ContentTraversalLimitError();
- }
-
const traversal = state ?? { seen: new WeakMap<object, unknown>(), visited: 0 };
- if (traversal.visited >= MAX_OPAQUE_NODES) {
- throw new ContentTraversalLimitError();
- }
- const seenValue = traversal.seen.get(value);
- if (seenValue !== undefined) {
- return seenValue;
- }
- traversal.visited++;
-
- let valueIsArray: boolean;
+ const fail = (reason: ContentTraversalLimitReason): ContentTraversalLimitError =>
+ new ContentTraversalLimitError([], [], {
+ operation: 'omit_resolved_file_locators',
+ reason,
+ visitedNodes: traversal.visited,
+ depth,
+ });
try {
- valueIsArray = Array.isArray(value);
- } catch {
- throw new ContentTraversalLimitError();
- }
- if (valueIsArray) {
- const arrayValue = value as readonly unknown[];
- const arrayLength = captureOpaqueArrayLength(arrayValue);
- const remainingNodes = MAX_OPAQUE_NODES - traversal.visited;
- if (arrayLength > remainingNodes) {
- throw new ContentTraversalLimitError();
+ if (depth > MAX_OPAQUE_DEPTH) {
+ throw fail('max_depth');
}
- const cloned: unknown[] = [];
- traversal.seen.set(value, cloned);
- for (let index = 0; index < arrayLength; index++) {
- cloned.push(
- omitResolvedFileLocators(arrayValue[index], resolvedFilesById, depth + 1, traversal),
- );
+ if (traversal.visited >= MAX_OPAQUE_NODES) {
+ throw fail('max_nodes');
}
- return cloned;
- }
-
- const remainingNodes = MAX_OPAQUE_NODES - traversal.visited;
- const boundedEntries = getBoundedOwnEnumerableEntries(value, remainingNodes);
- if (!boundedEntries.complete) {
- throw new ContentTraversalLimitError();
- }
- const entries = boundedEntries.entries;
-
- const cloned = Object.create(null) as MutableUnknownDictionary;
- traversal.seen.set(value, cloned);
- const fileId = entries.find(([key]) => key === 'file_id')?.[1];
- const resolvedFile = typeof fileId === 'string' ? resolvedFilesById.get(fileId) : undefined;
- const matchesResolvedLocator = (locator: unknown): boolean => {
- if (typeof locator !== 'string' || resolvedFile == null) {
- return false;
- }
- return (
- resolvedFile.filepath === locator ||
- resolvedFile.uri === locator ||
- resolvedFile.url === locator ||
- resolvedFile.preview === locator
- );
- };
-
- for (const [key, child] of entries) {
- if (resolvedFile != null && key === 'file_id') {
- continue;
+ const seenValue = traversal.seen.get(value);
+ if (seenValue !== undefined) {
+ return seenValue;
}
- if (
- resolvedFile != null &&
- (key === 'uri' || key === 'url' || key === 'filepath' || key === 'preview') &&
- matchesResolvedLocator(child)
- ) {
- continue;
+ traversal.visited++;
+
+ const valueIsArray = Array.isArray(value);
+ if (valueIsArray) {
+ const arrayValue = value as readonly unknown[];
+ const arrayLength = captureOpaqueArrayLength(arrayValue);
+ const remainingNodes = MAX_OPAQUE_NODES - traversal.visited;
+ if (arrayLength > remainingNodes) {
+ throw fail('array_length');
+ }
+ const cloned: unknown[] = [];
+ traversal.seen.set(value, cloned);
+ for (let index = 0; index < arrayLength; index++) {
+ cloned.push(
+ omitResolvedFileLocators(arrayValue[index], resolvedFilesById, depth + 1, traversal),
+ );
+ }
+ return cloned;
}
- let childIsArray: boolean;
- try {
- childIsArray = Array.isArray(child);
- } catch {
- throw new ContentTraversalLimitError();
+
+ const remainingNodes = MAX_OPAQUE_NODES - traversal.visited;
+ const boundedEntries = getBoundedOwnEnumerableEntries(value, remainingNodes);
+ if (!boundedEntries.complete) {
+ throw fail(boundedEntries.reason ?? 'object_entries');
}
- if (key === 'file_ids' && childIsArray) {
- const childFileIds = child as readonly unknown[];
- const childFileIdCount = captureOpaqueArrayLength(childFileIds);
- if (childFileIdCount > MAX_OPAQUE_NODES - traversal.visited) {
- throw new ContentTraversalLimitError();
+ const entries = boundedEntries.entries;
+
+ const cloned = Object.create(null) as MutableUnknownDictionary;
+ traversal.seen.set(value, cloned);
+ const fileId = entries.find(([key]) => key === 'file_id')?.[1];
+ const resolvedFile = typeof fileId === 'string' ? resolvedFilesById.get(fileId) : undefined;
+ const matchesResolvedLocator = (locator: unknown): boolean => {
+ if (typeof locator !== 'string' || resolvedFile == null) {
+ return false;
}
- const unresolvedFileIds: unknown[] = [];
- for (let index = 0; index < childFileIdCount; index++) {
- const childFileId = childFileIds[index];
- if (typeof childFileId !== 'string' || !resolvedFilesById.has(childFileId)) {
- unresolvedFileIds.push(childFileId);
- }
+ return (
+ resolvedFile.filepath === locator ||
+ resolvedFile.uri === locator ||
+ resolvedFile.url === locator ||
+ resolvedFile.preview === locator
+ );
+ };
+
+ for (const [key, child] of entries) {
+ if (resolvedFile != null && key === 'file_id') {
+ continue;
}
- if (unresolvedFileIds.length > 0) {
- cloned[key] = unresolvedFileIds;
+ if (
+ resolvedFile != null &&
+ (key === 'uri' || key === 'url' || key === 'filepath' || key === 'preview') &&
+ matchesResolvedLocator(child)
+ ) {
+ continue;
}
- continue;
+ const childIsArray = Array.isArray(child);
+ if (key === 'file_ids' && childIsArray) {
+ const childFileIds = child as readonly unknown[];
+ const childFileIdCount = captureOpaqueArrayLength(childFileIds);
+ if (childFileIdCount > MAX_OPAQUE_NODES - traversal.visited) {
+ throw fail('array_length');
+ }
+ const unresolvedFileIds: unknown[] = [];
+ for (let index = 0; index < childFileIdCount; index++) {
+ const childFileId = childFileIds[index];
+ if (typeof childFileId !== 'string' || !resolvedFilesById.has(childFileId)) {
+ unresolvedFileIds.push(childFileId);
+ }
+ }
+ if (unresolvedFileIds.length > 0) {
+ cloned[key] = unresolvedFileIds;
+ }
+ continue;
+ }
+ cloned[key] = omitResolvedFileLocators(child, resolvedFilesById, depth + 1, traversal);
+ }
+ return cloned;
+ } catch (error) {
+ if (error instanceof ContentTraversalLimitError && error.diagnostics != null) {
+ throw error;
}
- cloned[key] = omitResolvedFileLocators(child, resolvedFilesById, depth + 1, traversal);
+ throw fail(error instanceof ContentTraversalLimitError ? 'array_length' : 'reflection_error');
}
- return cloned;
}
export function omitResolvedCanonicalFileLocators<T>(
input: T,
resolvedFilesById: ReadonlyMap<string, CanonicalFileInspectionFile>,
+ context: {
+ readonly messageCount?: number;
+ readonly onTraversalFailure?: LocatorTraversalReporter;
+ } = {},
): T {
if (resolvedFilesById.size === 0) {
return input;
}
- return omitResolvedFileLocators(input, resolvedFilesById) as T;
+ try {
+ return omitResolvedFileLocators(input, resolvedFilesById) as T;
+ } catch (error) {
+ if (error instanceof ContentTraversalLimitError && error.diagnostics != null) {
+ context.onTraversalFailure?.({
+ ...error.diagnostics,
+ messageCount: context.messageCount ?? 0,
+ resolvedFileCount: resolvedFilesById.size,
+ });
+ }
+ throw error;
+ }
}
export function allowHydratedFileReferences(
@@ -1254,7 +1276,10 @@ export async function resolveCanonicalFileReferences<T>(
let sanitizedInput = input.input;
if (currentById.size > 0) {
try {
- sanitizedInput = omitResolvedCanonicalFileLocators(input.input, currentById);
+ sanitizedInput = omitResolvedCanonicalFileLocators(input.input, currentById, {
+ messageCount: input.messageCount,
+ onTraversalFailure: input.onTraversalFailure,
+ });
} catch (error) {
if (!(error instanceof ContentTraversalLimitError)) {
throw error;
diff --git a/packages/api/src/protection/messageMutations.spec.ts b/packages/api/src/protection/messageMutations.spec.ts
index 3e6c6f8843..bbe2530a5d 100644
--- a/packages/api/src/protection/messageMutations.spec.ts
+++ b/packages/api/src/protection/messageMutations.spec.ts
@@ -56,6 +56,36 @@ describe('typed message mutation policy', () => {
).toThrow(expect.objectContaining({ code: 'content_filter_uninspectable' }));
});
+ it('reports locator traversal failures through branch dependencies', async () => {
+ const onTraversalFailure = jest.fn();
+ const message = {
+ isUserSubmitted: true,
+ files: [{ file_id: 'owned' }],
+ content: Array.from({ length: 4200 }, () => ({ type: 'text', text: 'safe' })),
+ };
+ await expect(
+ assertStoredMessageBranchAllowed(
+ {
+ filters: { files: { pii: { fields: ['name'], starterPatterns: ['sk_prefix'] } } },
+ user: { id: 'user-1' },
+ message,
+ },
+ {
+ getFiles: jest.fn().mockResolvedValue([{ file_id: 'owned', filename: 'safe.txt' }]),
+ onTraversalFailure,
+ },
+ ),
+ ).rejects.toMatchObject({ code: 'content_filter_uninspectable' });
+ expect(onTraversalFailure).toHaveBeenCalledWith(
+ expect.objectContaining({
+ operation: 'omit_resolved_file_locators',
+ reason: 'array_length',
+ messageCount: 1,
+ resolvedFileCount: 1,
+ }),
+ );
+ });
+
it('hydrates canonical files before admitting a branch message', async () => {
const getFiles = jest.fn().mockResolvedValue([
{
diff --git a/packages/api/src/protection/messageMutations.ts b/packages/api/src/protection/messageMutations.ts
index 50d24247ea..0f3c5ab0c7 100644
--- a/packages/api/src/protection/messageMutations.ts
+++ b/packages/api/src/protection/messageMutations.ts
@@ -3,6 +3,7 @@ import type { FiltersConfig, MessageFilterPiiConfig } from 'librechat-data-provi
import type { CanonicalFileInspectionUser, GetCanonicalFilesForInspection } from './files';
import type { ModelBoundContentInput } from '../middleware/modelBoundContent';
import type { StoredMessageContentInput } from './adapters/submissions';
+import type { LocatorTraversalReporter } from './diagnostics';
import type { ChatSubmissionBody } from './adapters/chat';
import type { TextContentFragment } from './types';
import { hasActiveFilePolicy, resolveCanonicalFileReferences } from './files';
@@ -58,12 +59,17 @@ export interface StoredMessageBranchPolicyInput {
*/
export async function assertStoredMessageBranchAllowed(
input: StoredMessageBranchPolicyInput,
- dependencies: { readonly getFiles: GetCanonicalFilesForInspection },
+ dependencies: {
+ readonly getFiles: GetCanonicalFilesForInspection;
+ readonly onTraversalFailure?: LocatorTraversalReporter;
+ },
): Promise<void> {
let storedMessage: StoredMessageContentInput = input.message;
let resolvedFiles: NonNullable<ModelBoundContentInput['resolvedFiles']> = [];
if (hasActiveFilePolicy(input.filters)) {
const inspection = await resolveCanonicalFileReferences({
+ messageCount: 1,
+ onTraversalFailure: dependencies.onTraversalFailure,
filters: input.filters,
input: input.message,
user: input.user,
@@ -73,6 +79,7 @@ export async function assertStoredMessageBranchAllowed(
resolvedFiles = inspection.hydratedFiles;
}
assertModelBoundContent({
+ onTraversalFailure: dependencies.onTraversalFailure,
filters: input.filters,
legacyPii: input.legacyPii,
storedMessages: [storedMessage],
diff --git a/packages/api/src/shared-links/protection.ts b/packages/api/src/shared-links/protection.ts
index 68364bf71a..5a788a28b1 100644
--- a/packages/api/src/shared-links/protection.ts
+++ b/packages/api/src/shared-links/protection.ts
@@ -12,6 +12,7 @@ import type {
} from '../protection/files';
import type { JsonPointer, TextContentFragment } from '../protection/types';
import type { FileContentInput } from '../protection/adapters/submissions';
+import type { LocatorTraversalReporter } from '../protection/diagnostics';
import type { ConversationImportMessage } from '../imports';
import {
CONTENT_TRAVERSAL_MAX_DEPTH,
@@ -101,6 +102,7 @@ export interface ShareContentPreflightInput {
}
export interface ShareContentPreflightOptions {
+ readonly onTraversalFailure?: LocatorTraversalReporter;
readonly legacyPii?: MessageFilterPiiConfig | null;
readonly snapshotFiles?: boolean;
readonly user?: CanonicalFileInspectionUser;
@@ -162,6 +164,7 @@ export function createShareContentPreflight(
legacyPii,
user: options.user,
getFiles: options.getFiles,
+ onTraversalFailure: options.onTraversalFailure,
},
);
if (!inspectSharedFileMetadata) {