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
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
👫 fix: Keep Firecrawl and SearXNG Credentials Paired (#16538)
lia-by-librechat[bot]981e73da6800
diff --git a/packages/api/src/web/web.spec.ts b/packages/api/src/web/web.spec.tsindex 6dc6af2104..1a8ae5ceda 100644--- a/packages/api/src/web/web.spec.ts+++ b/packages/api/src/web/web.spec.ts@@ -1591,6 +1591,188 @@ describe('web.ts', () => {});});+ describe('URL and API key credential pairing', () => {+ const userId = 'test-user-id';+ const providers = [+ {+ name: 'Firecrawl',+ apiKey: 'firecrawlApiKey',+ apiUrl: 'firecrawlApiUrl',+ keyField: 'FIRECRAWL_API_KEY',+ urlField: 'FIRECRAWL_API_URL',+ category: SearchCategories.SCRAPERS,+ authenticatedWithoutUrl: true,+ config: {+ searchProvider: SearchProviders.KEENABLE,+ scraperProvider: ScraperProviders.FIRECRAWL,+ rerankerType: RerankerTypes.NONE,+ },+ },+ {+ name: 'SearXNG',+ apiKey: 'searxngApiKey',+ apiUrl: 'searxngInstanceUrl',+ keyField: 'SEARXNG_API_KEY',+ urlField: 'SEARXNG_INSTANCE_URL',+ category: SearchCategories.PROVIDERS,+ authenticatedWithoutUrl: false,+ config: {+ searchProvider: SearchProviders.SEARXNG,+ scraperProvider: ScraperProviders.KEENABLE,+ rerankerType: RerankerTypes.NONE,+ },+ },+ ] as const;++ describe.each(providers)('$name', (provider) => {+ let originalEnv: NodeJS.ProcessEnv;++ beforeEach(() => {+ originalEnv = process.env;+ process.env = { ...originalEnv };+ delete process.env[provider.keyField];+ delete process.env[provider.urlField];+ mockIsSSRFTarget.mockReturnValue(false);+ mockResolveHostnameSSRF.mockResolvedValue(false);+ });++ afterEach(() => {+ process.env = originalEnv;+ });++ const config: TWebSearchConfig = {+ ...provider.config,+ [provider.apiKey]: `\${${provider.keyField}}`,+ [provider.apiUrl]: `\${${provider.urlField}}`,+ safeSearch: SafeSearchTypes.MODERATE,+ };++ it.each([undefined, AuthType.USER_PROVIDED])(+ 'rejects a user URL with a system key when the URL environment value is %s',+ async (urlEnv) => {+ process.env[provider.keyField] = 'system-api-key';+ if (urlEnv != null) {+ process.env[provider.urlField] = urlEnv;+ }++ const result = await loadWebSearchAuth({+ userId,+ webSearchConfig: config,+ loadAuthValues: async () => ({+ [provider.keyField]: 'system-api-key',+ [provider.urlField]: 'https://user-provider.example.com',+ }),+ });++ expect(result.authenticated).toBe(provider.authenticatedWithoutUrl);+ expect(result.authResult[provider.apiUrl]).toBeUndefined();+ expect(result.authResult[provider.apiKey]).toBe(+ provider.authenticatedWithoutUrl ? 'system-api-key' : undefined,+ );+ expect(result.authTypes).toContainEqual([+ provider.category,+ provider.authenticatedWithoutUrl ? AuthType.SYSTEM_DEFINED : AuthType.USER_PROVIDED,+ ]);+ },+ );++ it("preserves a user URL paired with the same user's key", async () => {+ process.env[provider.keyField] = AuthType.USER_PROVIDED;+ const result = await loadWebSearchAuth({+ userId,+ webSearchConfig: config,+ loadAuthValues: async () => ({+ [provider.keyField]: 'user-api-key',+ [provider.urlField]: 'https://user-provider.example.com',+ }),+ });++ expect(result.authenticated).toBe(true);+ expect(result.authResult[provider.apiKey]).toBe('user-api-key');+ expect(result.authResult[provider.apiUrl]).toBe('https://user-provider.example.com');+ expect(result.authTypes).toContainEqual([provider.category, AuthType.USER_PROVIDED]);+ });++ it('preserves a system URL paired with a system key', async () => {+ process.env[provider.keyField] = 'system-api-key';+ process.env[provider.urlField] = 'https://admin-provider.example.com';+ const result = await loadWebSearchAuth({+ userId,+ webSearchConfig: config,+ loadAuthValues: async () => ({+ [provider.keyField]: 'system-api-key',+ [provider.urlField]: 'https://admin-provider.example.com',+ }),+ });++ expect(result.authenticated).toBe(true);+ expect(result.authResult[provider.apiKey]).toBe('system-api-key');+ expect(result.authResult[provider.apiUrl]).toBe('https://admin-provider.example.com');+ expect(result.authTypes).toContainEqual([provider.category, AuthType.SYSTEM_DEFINED]);+ });++ it('rejects mixed ownership with custom environment variable names', async () => {+ process.env.CUSTOM_PROVIDER_API_KEY = 'system-api-key';+ process.env.CUSTOM_PROVIDER_API_URL = AuthType.USER_PROVIDED;+ const result = await loadWebSearchAuth({+ userId,+ webSearchConfig: {+ ...config,+ [provider.apiKey]: '${CUSTOM_PROVIDER_API_KEY}',+ [provider.apiUrl]: '${CUSTOM_PROVIDER_API_URL}',+ },+ loadAuthValues: async () => ({+ CUSTOM_PROVIDER_API_KEY: 'system-api-key',+ CUSTOM_PROVIDER_API_URL: 'https://user-provider.example.com',+ }),+ });++ expect(result.authenticated).toBe(provider.authenticatedWithoutUrl);+ expect(result.authResult[provider.apiUrl]).toBeUndefined();+ });+ });++ it.each([undefined, ''])(+ 'preserves keyless SearXNG with an API key value of %s',+ async (apiKey) => {+ const originalEnv = process.env;+ process.env = { ...originalEnv };+ delete process.env.SEARXNG_API_KEY;+ delete process.env.SEARXNG_INSTANCE_URL;+ mockIsSSRFTarget.mockReturnValue(false);+ mockResolveHostnameSSRF.mockResolvedValue(false);++ try {+ const result = await loadWebSearchAuth({+ userId,+ webSearchConfig: {+ searxngApiKey: '${SEARXNG_API_KEY}',+ searxngInstanceUrl: '${SEARXNG_INSTANCE_URL}',+ searchProvider: SearchProviders.SEARXNG,+ scraperProvider: ScraperProviders.KEENABLE,+ rerankerType: RerankerTypes.NONE,+ safeSearch: SafeSearchTypes.MODERATE,+ },+ loadAuthValues: async () => ({+ ...(apiKey == null ? {} : { SEARXNG_API_KEY: apiKey }),+ SEARXNG_INSTANCE_URL: 'https://user-provider.example.com',+ }),+ });++ expect(result.authenticated).toBe(true);+ expect(result.authResult.searxngInstanceUrl).toBe('https://user-provider.example.com');+ expect(result.authResult.searxngApiKey).toBe(apiKey);+ expect(result.authTypes).toContainEqual([+ SearchCategories.PROVIDERS,+ AuthType.USER_PROVIDED,+ ]);+ } finally {+ process.env = originalEnv;+ }+ },+ );+ });+describe('webSearchAuth', () => {it('should have the expected structure', () => {// Check that all expected categories existdiff --git a/packages/api/src/web/web.ts b/packages/api/src/web/web.tsindex bb56a7c2b8..ca3372a1c5 100644--- a/packages/api/src/web/web.ts+++ b/packages/api/src/web/web.ts@@ -13,12 +13,12 @@ import type { TCustomConfig, TWebSearchConfig } from 'librechat-data-provider';import { isSSRFTarget, resolveHostnameSSRF, getEffectivePort } from '../auth';/**- * User-provided URL keys that may pass through after SSRF preflight.+ * User-provided URL keys and their paired API keys, checked after SSRF preflight.*/-const USER_PROVIDED_URL_KEYS = new Set<TWebSearchKeys>([- 'searxngInstanceUrl',- 'firecrawlApiUrl',- 'jinaApiUrl',+const USER_PROVIDED_URL_KEYS = new Map<TWebSearchKeys, TWebSearchKeys>([+ ['searxngInstanceUrl', 'searxngApiKey'],+ ['firecrawlApiUrl', 'firecrawlApiKey'],+ ['jinaApiUrl', 'jinaApiKey'],]);/**@@ -484,8 +484,6 @@ export async function loadWebSearchAuth({const jinaApiKeyIndex = allKeys.indexOf('jinaApiKey');const jinaApiKeyField = allAuthFields[jinaApiKeyIndex];const jinaApiKeyValue = jinaApiKeyField ? authValues[jinaApiKeyField] : undefined;- const isJinaApiKeyUserProvided =- jinaApiKeyValue != null && process.env[jinaApiKeyField] !== jinaApiKeyValue;let allFieldsAuthenticated = true;for (let j = 0; j < allAuthFields.length; j++) {@@ -527,8 +525,17 @@ export async function loadWebSearchAuth({continue;}- if (originalKey === 'jinaApiUrl' && isFieldUserProvided && !isJinaApiKeyUserProvided) {- continue;+ if (isUserProvidedUrlKey && isFieldUserProvided) {+ const apiKey = USER_PROVIDED_URL_KEYS.get(originalKey);+ const apiKeyField = apiKey ? allAuthFields[allKeys.indexOf(apiKey)] : undefined;+ const apiKeyValue = apiKeyField ? authValues[apiKeyField] : undefined;+ if (apiKeyField && apiKeyValue && process.env[apiKeyField] === apiKeyValue) {+ if (!optionalSet.has(field)) {+ allFieldsAuthenticated = false;+ break;+ }+ continue;+ }}if (originalKey) {authResult[originalKey] = value;