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: Keep API Keys and Internal Errors Out of Logs and Responses (#17258)

Marco Berettae57aa3aa5be0
diff --git a/api/app/clients/tools/structured/OpenWeather.js b/api/app/clients/tools/structured/OpenWeather.js
index 9b68f8f2ae..10629c104e 100644
--- a/api/app/clients/tools/structured/OpenWeather.js
+++ b/api/app/clients/tools/structured/OpenWeather.js
@@ -1,4 +1,5 @@
const fetch = require('node-fetch');
+const { formatToolError } = require('@librechat/api');
const { Tool } = require('@librechat/agents/langchain/tools');
const { getEnvironmentVariable } = require('@librechat/agents/langchain/utils/env');
@@ -347,7 +348,7 @@ class OpenWeather extends Tool {
const roundedJson = roundTemperatures(json);
return JSON.stringify(roundedJson);
} catch (err) {
- return `Error: ${err.message}`;
+ return formatToolError(err);
}
}
}
diff --git a/api/app/clients/tools/structured/specs/openweather.test.js b/api/app/clients/tools/structured/specs/openweather.test.js
index 3340c80cc4..e3fc2c3ff1 100644
--- a/api/app/clients/tools/structured/specs/openweather.test.js
+++ b/api/app/clients/tools/structured/specs/openweather.test.js
@@ -355,4 +355,15 @@ describe('OpenWeather Tool', () => {
});
expect(result).toMatch(/Error: Invalid date format. Expected YYYY-MM-DD./);
});
+
+ test('a failed request does not echo the API key to the model', async () => {
+ fetch.mockImplementationOnce((url) =>
+ Promise.reject(new Error(`request to ${url} failed, reason: getaddrinfo ENOTFOUND`)),
+ );
+
+ const result = await tool.call({ action: 'current_forecast', lat: 35.96, lon: -83.92 });
+
+ expect(result).toMatch(/^Error: request to .*appid=\[REDACTED\]/);
+ expect(result).not.toContain('test-api-key');
+ });
});
diff --git a/api/server/controllers/AuthController.spec.js b/api/server/controllers/AuthController.spec.js
index c64680993a..a9eaee764a 100644
--- a/api/server/controllers/AuthController.spec.js
+++ b/api/server/controllers/AuthController.spec.js
@@ -3142,7 +3142,7 @@ describe('resetPasswordController', () => {
expect(deleteAllUserSessions).not.toHaveBeenCalled();
expect(deletePasskeysByUser).not.toHaveBeenCalled();
expect(res.status).toHaveBeenCalledWith(400);
- expect(res.json).toHaveBeenCalledWith({ message: resetError.message });
+ expect(res.json).toHaveBeenCalledWith({ message: 'Password reset failed' });
expect(logger.error).toHaveBeenCalledWith('[resetPasswordController]', resetError);
});
});
diff --git a/api/server/routes/__tests__/config.spec.js b/api/server/routes/__tests__/config.spec.js
index 22bbe5ccd0..b2470b5017 100644
--- a/api/server/routes/__tests__/config.spec.js
+++ b/api/server/routes/__tests__/config.spec.js
@@ -352,7 +352,7 @@ describe('GET /api/config', () => {
const response = await request(app).get('/api/config');
expect(response.statusCode).toBe(500);
- expect(response.body).toHaveProperty('error');
+ expect(response.body).toEqual({ error: 'Failed to load startup config' });
});
it('should not expose endpointsDropParamsMap to unauthenticated callers', async () => {
diff --git a/api/server/routes/config.js b/api/server/routes/config.js
index fa59dde953..905a735602 100644
--- a/api/server/routes/config.js
+++ b/api/server/routes/config.js
@@ -388,7 +388,7 @@ router.get('/', async function (req, res) {
return res.status(200).send(payload);
} catch (err) {
logger.error('Error in startup config', err);
- return res.status(500).send({ error: err.message });
+ return res.status(500).send({ error: 'Failed to load startup config' });
}
});
diff --git a/e2e/specs/mock/scenarios/reset-password-failure.spec.ts b/e2e/specs/mock/scenarios/reset-password-failure.spec.ts
new file mode 100644
index 0000000000..1c59717dd4
--- /dev/null
+++ b/e2e/specs/mock/scenarios/reset-password-failure.spec.ts
@@ -0,0 +1,28 @@
+import { expect, test } from '@playwright/test';
+
+test.describe('password reset failure', () => {
+ /* A user id that is not an ObjectId makes the token lookup throw a cast error; its text
+ names the schema path and value, so the anonymous caller must only see a fixed message. */
+ test('a reset that fails unexpectedly returns a fixed message @scenario:reset-failure-hides-internal-error', async ({
+ playwright,
+ baseURL,
+ }) => {
+ const request = await playwright.request.newContext({ baseURL });
+ try {
+ const response = await request.post('/api/auth/resetPassword', {
+ data: {
+ userId: 'not-an-object-id',
+ token: 'not-a-token',
+ password: 'Reset-Failure-1!',
+ confirm_password: 'Reset-Failure-1!',
+ },
+ failOnStatusCode: false,
+ });
+
+ expect(response.status()).toBe(400);
+ expect(await response.json()).toEqual({ message: 'Password reset failed' });
+ } finally {
+ await request.dispose();
+ }
+ });
+});
diff --git a/packages/api/src/auth/passwordReset.ts b/packages/api/src/auth/passwordReset.ts
index 3b52235218..20300fca7a 100644
--- a/packages/api/src/auth/passwordReset.ts
+++ b/packages/api/src/auth/passwordReset.ts
@@ -93,7 +93,7 @@ export function createResetPasswordController(deps: PasswordResetControllerDeps)
return res.status(200).json(result);
} catch (error) {
logger.error('[resetPasswordController]', error);
- return res.status(400).json({ message: error instanceof Error ? error.message : undefined });
+ return res.status(400).json({ message: 'Password reset failed' });
}
};
}
diff --git a/packages/api/src/tools/format.spec.ts b/packages/api/src/tools/format.spec.ts
index 68a32090e9..a04fbb4b5d 100644
--- a/packages/api/src/tools/format.spec.ts
+++ b/packages/api/src/tools/format.spec.ts
@@ -1,6 +1,6 @@
import { AuthType, EToolResources } from 'librechat-data-provider';
import type { TPlugin } from 'librechat-data-provider';
-import { filterUniquePlugins, checkPluginAuth, getToolkitKey } from './format';
+import { filterUniquePlugins, checkPluginAuth, getToolkitKey, formatToolError } from './format';
describe('format.ts helper functions', () => {
describe('filterUniquePlugins', () => {
@@ -347,4 +347,22 @@ describe('format.ts helper functions', () => {
expect(result).toBe('complex_toolkit_with_underscores');
});
});
+
+ describe('formatToolError', () => {
+ it('redacts a key carried in the failed request URL', () => {
+ const error = new Error(
+ 'request to https://api.example.test/data?lat=1&appid=secret-key failed, reason: ENOTFOUND',
+ );
+ expect(formatToolError(error)).toBe(
+ 'Error: request to https://api.example.test/data?lat=1&appid=[REDACTED] failed, reason: ENOTFOUND',
+ );
+ });
+
+ it('keeps a plain message and stringifies non-errors', () => {
+ expect(formatToolError(new Error('Could not find coordinates for city: Rome'))).toBe(
+ 'Error: Could not find coordinates for city: Rome',
+ );
+ expect(formatToolError('timeout')).toBe('Error: timeout');
+ });
+ });
});
diff --git a/packages/api/src/tools/format.ts b/packages/api/src/tools/format.ts
index feab29461e..3304e56c1b 100644
--- a/packages/api/src/tools/format.ts
+++ b/packages/api/src/tools/format.ts
@@ -1,3 +1,4 @@
+import { redactMessage } from '@librechat/data-schemas';
import { AuthType, EToolResources } from 'librechat-data-provider';
import type { TPlugin } from 'librechat-data-provider';
@@ -82,3 +83,9 @@ export function getToolkitKey({
}
return toolkitKey;
}
+
+/** Error text a tool returns to the model, with credentials in request URLs and headers redacted. */
+export function formatToolError(error: unknown): string {
+ const message = error instanceof Error ? error.message : String(error);
+ return `Error: ${redactMessage(message)}`;
+}
diff --git a/packages/data-schemas/src/config/parsers.spec.ts b/packages/data-schemas/src/config/parsers.spec.ts
index 5b94d43c5d..d2d472296f 100644
--- a/packages/data-schemas/src/config/parsers.spec.ts
+++ b/packages/data-schemas/src/config/parsers.spec.ts
@@ -63,6 +63,9 @@ describe('redactMessage', () => {
expect(redactMessage('https://example.test/?api_key=secretvalue&next=true')).toBe(
'https://example.test/?api_key=[REDACTED]&next=true',
);
+ expect(redactMessage('https://example.test/?input=x&appid=secretvalue&limit=1')).toBe(
+ 'https://example.test/?input=x&appid=[REDACTED]&limit=1',
+ );
});
it('masks email addresses in messages', () => {
@@ -857,6 +860,7 @@ describe('redactFormat', () => {
it('redacts values under sensitive splat metadata keys', () => {
const metadata = {
apiKey: 'secretvalue',
+ appid: 'secretvalue',
authorization: 'secretvalue',
nested: { token: 'secretvalue' },
safe: 'secretvalue',
@@ -873,6 +877,7 @@ describe('redactFormat', () => {
const splat = info[SPLAT_SYMBOL] as Array<typeof metadata>;
expect(splat[0].apiKey).toBe('[REDACTED]');
+ expect(splat[0].appid).toBe('[REDACTED]');
expect(splat[0].authorization).toBe('[REDACTED]');
expect(splat[0].nested.token).toBe('[REDACTED]');
expect(splat[0]['x-api-key']).toBe('[REDACTED]');
diff --git a/packages/data-schemas/src/config/parsers.ts b/packages/data-schemas/src/config/parsers.ts
index 671c42fc9a..3af5fca305 100644
--- a/packages/data-schemas/src/config/parsers.ts
+++ b/packages/data-schemas/src/config/parsers.ts
@@ -50,8 +50,8 @@ const sensitiveKeys: RegExp[] = [
/\b(api-key:? )[^\s"']+/gi, // Header: API key pattern
/\b(api_key=)[^\s"'&]+/gi, // URL query param: API key pattern
/\b(key=)[^\s"'&]+/g, // URL query param: sensitive key pattern
- /(\b(?:access_token|assertion|client_assertion|client_secret|code|code_verifier|credential|id_token|refresh_token|sig|signature|x-amz-security-token|x-amz-signature|x-goog-signature)\b"?\s*:\s*")(?:\\.|[^"\\])*/gi,
- /\b((?:access_token|assertion|client_assertion|client_secret|code|code_verifier|credential|id_token|refresh_token|sig|signature|x-amz-security-token|x-amz-signature|x-goog-signature)=)[^\s"'&]+/gi,
+ /(\b(?:access_token|appid|assertion|client_assertion|client_secret|code|code_verifier|credential|id_token|refresh_token|sig|signature|x-amz-security-token|x-amz-signature|x-goog-signature)\b"?\s*:\s*")(?:\\.|[^"\\])*/gi,
+ /\b((?:access_token|appid|assertion|client_assertion|client_secret|code|code_verifier|credential|id_token|refresh_token|sig|signature|x-amz-security-token|x-amz-signature|x-goog-signature)=)[^\s"'&]+/gi,
/(\b)eyJ[a-zA-Z0-9_-]{5,}\.[a-zA-Z0-9_-]{5,}\.[a-zA-Z0-9_-]+/g,
/\b((?:Proxy-)?Authorization:\s*)[^\r\n]+/gi,
/\b((?:Cookie|Set-Cookie):\s*)[^\r\n]+/gi,
@@ -73,7 +73,7 @@ const REDACTION_WINDOW_SLACK = 1024;
const REDACTED_EMAIL_VALUE = '[REDACTED_EMAIL]';
const sensitiveMetadataKey =
- /^(authorization|proxy-authorization|cookie|set-cookie|x-api-key|api[-_]?key|access[-_]?token|refresh[-_]?token|id[-_]?token|token|secret|password|assertion|client[-_]?assertion|client[-_]?secret|code[-_]?verifier|credential|signature|connection[-_]?string)$/i;
+ /^(authorization|proxy-authorization|cookie|set-cookie|x-api-key|api[-_]?key|appid|access[-_]?token|refresh[-_]?token|id[-_]?token|token|secret|password|assertion|client[-_]?assertion|client[-_]?secret|code[-_]?verifier|credential|signature|connection[-_]?string)$/i;
const errorStringProperties = new Set(['name', 'message', 'stack']);
/**