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: Escape SPA Language Attribute (#15248)
Danny Avilaf34a49007dae
diff --git a/api/server/csp.spec.js b/api/server/csp.spec.jsindex 6e2e4eef46..e43a31ce6f 100644--- a/api/server/csp.spec.js+++ b/api/server/csp.spec.js@@ -195,6 +195,14 @@ describe('Content Security Policy', () => {expect(response.headers['content-security-policy']).toContain("script-src 'nonce-");});+ it('keeps replacement patterns in the language cookie as literal attribute text', async () => {+ const response = await request(app).get('/').set('Cookie', 'lang=$&');++ expect(response.status).toBe(200);+ expect(response.text).toContain('<html lang="$&">');+ expect(response.text).not.toContain('<html lang="lang="en-US"">');+ });+it('carries deployment-specific sources and the clickjacking default', async () => {const csp = (await request(app).get('/')).headers['content-security-policy'];diff --git a/api/server/experimental.js b/api/server/experimental.jsindex 4b961cc5f2..78d63b97f6 100644--- a/api/server/experimental.js+++ b/api/server/experimental.js@@ -19,6 +19,7 @@ const {applyCspNonce,createCspPolicy,shellCacheHeaders,+ escapeHtmlAttribute,ErrorController,QUERY_DEVTOOLS_HEADER,createSecurityHeaders,@@ -434,8 +435,8 @@ if (cluster.isMaster) {res.vary(QUERY_DEVTOOLS_HEADER);const lang = req.cookies.lang || req.headers['accept-language']?.split(',')[0] || 'en-US';- const saneLang = lang.replace(/"/g, '"');- let updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${saneLang}"`);+ const saneLang = escapeHtmlAttribute(lang);+ let updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, () => `lang="${saneLang}"`);updatedIndexHtml = maybeInjectQueryDevtoolsBootstrap(updatedIndexHtml, req);/* Nonce last: every injected script above must be stamped too. */diff --git a/api/server/index.js b/api/server/index.jsindex 656f2a817b..bfa7545fe3 100644--- a/api/server/index.js+++ b/api/server/index.js@@ -20,6 +20,7 @@ const {applyCspNonce,createCspPolicy,shellCacheHeaders,+ escapeHtmlAttribute,ErrorController,memoryDiagnostics,createSecurityHeaders,@@ -252,8 +253,8 @@ const startServer = async () => {res.vary(QUERY_DEVTOOLS_HEADER);const lang = req.cookies.lang || req.headers['accept-language']?.split(',')[0] || 'en-US';- const saneLang = lang.replace(/"/g, '"');- let updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${saneLang}"`);+ const saneLang = escapeHtmlAttribute(lang);+ let updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, () => `lang="${saneLang}"`);updatedIndexHtml = maybeInjectQueryDevtoolsBootstrap(updatedIndexHtml, req);/* Nonce last: every injected script above must be stamped too. */diff --git a/packages/api/src/security/html.spec.ts b/packages/api/src/security/html.spec.tsnew file mode 100644index 0000000000..4ed4be4d2e--- /dev/null+++ b/packages/api/src/security/html.spec.ts@@ -0,0 +1,7 @@+import { escapeHtmlAttribute } from './html';++describe('escapeHtmlAttribute', () => {+ it('escapes all characters that can alter a quoted attribute', () => {+ expect(escapeHtmlAttribute(`$&<>'"`)).toBe('$&<>'"');+ });+});diff --git a/packages/api/src/security/html.ts b/packages/api/src/security/html.tsnew file mode 100644index 0000000000..3f401c0d67--- /dev/null+++ b/packages/api/src/security/html.ts@@ -0,0 +1,12 @@+const HTML_ATTRIBUTE_ENTITIES: Readonly<Record<string, string>> = {+ '&': '&',+ '<': '<',+ '>': '>',+ '"': '"',+ "'": ''',+};++/** Escapes text before interpolating it into a quoted HTML attribute. */+export function escapeHtmlAttribute(value: string): string {+ return value.replace(/[&<>"']/g, (character) => HTML_ATTRIBUTE_ENTITIES[character]);+}diff --git a/packages/api/src/security/index.ts b/packages/api/src/security/index.tsindex 555a801a64..befb5289c9 100644--- a/packages/api/src/security/index.ts+++ b/packages/api/src/security/index.ts@@ -1,3 +1,4 @@export * from './env';export * from './headers';export * from './csp';+export * from './html';