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
🔒 feat: Add Content Security Policy using Helmet middleware (#7377)
Ruben Talstra7a91f6ca6286
diff --git a/api/package.json b/api/package.jsonindex bcf94a6cad..8782457dbc 100644--- a/api/package.json+++ b/api/package.json@@ -71,6 +71,7 @@"firebase": "^11.0.2","googleapis": "^126.0.1","handlebars": "^4.7.7",+ "helmet": "^8.1.0","https-proxy-agent": "^7.0.6","ioredis": "^5.3.2","js-yaml": "^4.1.0",diff --git a/api/server/index.js b/api/server/index.jsindex cd0bdd3f88..3c8d3dd951 100644--- a/api/server/index.js+++ b/api/server/index.js@@ -2,6 +2,7 @@ require('dotenv').config();const path = require('path');require('module-alias')({ base: path.resolve(__dirname, '..') });const cors = require('cors');+const helmet = require('helmet');const axios = require('axios');const express = require('express');const compression = require('compression');@@ -22,7 +23,15 @@ const staticCache = require('./utils/staticCache');const noIndex = require('./middleware/noIndex');const routes = require('./routes');-const { PORT, HOST, ALLOW_SOCIAL_LOGIN, DISABLE_COMPRESSION, TRUST_PROXY } = process.env ?? {};+const {+ PORT,+ HOST,+ ALLOW_SOCIAL_LOGIN,+ DISABLE_COMPRESSION,+ TRUST_PROXY,+ SANDPACK_BUNDLER_URL,+ SANDPACK_STATIC_BUNDLER_URL,+} = process.env ?? {};const port = Number(PORT) || 3080;const host = HOST || 'localhost';@@ -38,6 +47,8 @@ const startServer = async () => {const app = express();app.disable('x-powered-by');+ app.set('trust proxy', trusted_proxy);+await AppService(app);const indexPath = path.join(app.locals.paths.dist, 'index.html');@@ -49,23 +60,54 @@ const startServer = async () => {app.use(noIndex);app.use(errorController);app.use(express.json({ limit: '3mb' }));- app.use(mongoSanitize());app.use(express.urlencoded({ extended: true, limit: '3mb' }));- app.use(staticCache(app.locals.paths.dist));- app.use(staticCache(app.locals.paths.fonts));- app.use(staticCache(app.locals.paths.assets));- app.set('trust proxy', trusted_proxy);+ app.use(mongoSanitize());app.use(cors());app.use(cookieParser());+ app.use(+ helmet({+ contentSecurityPolicy: {+ useDefaults: false,+ directives: {+ defaultSrc: ["'self'"],+ scriptSrc: ["'self'", "'unsafe-inline'", 'https://challenges.cloudflare.com'],+ styleSrc: ["'self'", "'unsafe-inline'"],+ fontSrc: ["'self'", 'data:'],+ objectSrc: ["'none'"],+ imgSrc: ["'self'", 'data:'],+ mediaSrc: ["'self'", 'data:', 'blob:'],+ connectSrc: ["'self'"],+ frameSrc: [+ "'self'",+ 'https://challenges.cloudflare.com',+ 'https://codesandbox.io',+ ...(SANDPACK_BUNDLER_URL ? [SANDPACK_BUNDLER_URL] : []),+ ...(SANDPACK_STATIC_BUNDLER_URL ? [SANDPACK_STATIC_BUNDLER_URL] : []),+ ],+ frameAncestors: [+ "'self'",+ 'https://codesandbox.io',+ ...(SANDPACK_BUNDLER_URL ? [SANDPACK_BUNDLER_URL] : []),+ ...(SANDPACK_STATIC_BUNDLER_URL ? [SANDPACK_STATIC_BUNDLER_URL] : []),+ ],+ },+ },+ }),+ );if (!isEnabled(DISABLE_COMPRESSION)) {app.use(compression());+ } else {+ console.warn('Response compression has been disabled via DISABLE_COMPRESSION.');}+ // Serve static assets with aggressive caching+ app.use(staticCache(app.locals.paths.dist));+ app.use(staticCache(app.locals.paths.fonts));+ app.use(staticCache(app.locals.paths.assets));+if (!ALLOW_SOCIAL_LOGIN) {- console.warn(- 'Social logins are disabled. Set Environment Variable "ALLOW_SOCIAL_LOGIN" to true to enable them.',- );+ console.warn('Social logins are disabled. Set ALLOW_SOCIAL_LOGIN=true to enable them.');}/* OAUTH */@@ -128,7 +170,7 @@ const startServer = async () => {});app.listen(port, host, () => {- if (host == '0.0.0.0') {+ if (host === '0.0.0.0') {logger.info(`Server listening on all interfaces at port ${port}. Use http://localhost:${port} to access it`,);diff --git a/api/server/services/start/turnstile.js b/api/server/services/start/turnstile.jsindex ffd4545dae..be9e5f83c7 100644--- a/api/server/services/start/turnstile.js+++ b/api/server/services/start/turnstile.js@@ -26,7 +26,16 @@ function loadTurnstileConfig(config, configDefaults) {options: customTurnstile.options ?? defaults.options,});- logger.info('Turnstile configuration loaded:\n' + JSON.stringify(loadedTurnstile, null, 2));+ const enabled = Boolean(loadedTurnstile.siteKey);++ if (enabled) {+ logger.info(+ 'Turnstile is ENABLED with configuration:\n' + JSON.stringify(loadedTurnstile, null, 2),+ );+ } else {+ logger.info('Turnstile is DISABLED (no siteKey provided).');+ }+return loadedTurnstile;}diff --git a/client/src/components/Auth/LoginForm.tsx b/client/src/components/Auth/LoginForm.tsxindex 030b6323f7..e34ec3c94d 100644--- a/client/src/components/Auth/LoginForm.tsx+++ b/client/src/components/Auth/LoginForm.tsx@@ -16,6 +16,7 @@ type TLoginFormProps = {const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error, setError }) => {const localize = useLocalize();const { theme } = useContext(ThemeContext);+const {register,getValues,@@ -28,6 +29,7 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,const { data: config } = useGetStartupConfig();const useUsernameLogin = config?.ldap?.username;const validTheme = theme === 'dark' ? 'dark' : 'light';+ const requireCaptcha = Boolean(startupConfig.turnstile?.siteKey);useEffect(() => {if (error && error.includes('422') && !showResendLink) {@@ -100,20 +102,12 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,},})}aria-invalid={!!errors.email}- className="- webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light- bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none- "+ className="peer w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary transition-colors duration-200 focus:border-green-500 focus:outline-none"placeholder=" "/><labelhtmlFor="email"- className="- absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200- peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100- peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-600 dark:peer-focus:text-green-500- rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4- "+ className="absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-600 dark:peer-focus:text-green-500">{useUsernameLogin? localize('com_auth_username').replace(/ \(.*$/, '')@@ -135,20 +129,12 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,maxLength: { value: 128, message: localize('com_auth_password_max_length') },})}aria-invalid={!!errors.password}- className="- webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light- bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none- "+ className="peer w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary transition-colors duration-200 focus:border-green-500 focus:outline-none"placeholder=" "/><labelhtmlFor="password"- className="- absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200- peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100- peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-600 dark:peer-focus:text-green-500- rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4- "+ className="absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-600 dark:peer-focus:text-green-500">{localize('com_auth_password')}</label>@@ -164,16 +150,15 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,</a>)}- {/* Render Turnstile only if enabled in startupConfig */}- {startupConfig.turnstile && (+ {requireCaptcha && (<div className="my-4 flex justify-center"><Turnstile- siteKey={startupConfig.turnstile.siteKey}+ siteKey={startupConfig.turnstile!.siteKey}options={{- ...startupConfig.turnstile.options,+ ...startupConfig.turnstile!.options,theme: validTheme,}}- onSuccess={(token) => setTurnstileToken(token)}+ onSuccess={setTurnstileToken}onError={() => setTurnstileToken(null)}onExpire={() => setTurnstileToken(null)}/>@@ -185,11 +170,8 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,aria-label={localize('com_auth_continue')}data-testid="login-button"type="submit"- disabled={startupConfig.turnstile ? !turnstileToken : false}- className="- w-full rounded-2xl bg-green-600 px-4 py-3 text-sm font-medium text-white- transition-colors hover:bg-green-700 dark:bg-green-600 dark:hover:bg-green-700- "+ disabled={requireCaptcha && !turnstileToken}+ className="w-full rounded-2xl bg-green-600 px-4 py-3 text-sm font-medium text-white transition-colors hover:bg-green-700 disabled:opacity-50 disabled:hover:bg-green-600 dark:bg-green-600 dark:hover:bg-green-700">{localize('com_auth_continue')}</button>diff --git a/client/src/components/Auth/Registration.tsx b/client/src/components/Auth/Registration.tsxindex ab5c945ac8..8e425da2c6 100644--- a/client/src/components/Auth/Registration.tsx+++ b/client/src/components/Auth/Registration.tsx@@ -33,6 +33,9 @@ const Registration: React.FC = () => {const token = queryParams.get('token');const validTheme = theme === 'dark' ? 'dark' : 'light';+ // only require captcha if we have a siteKey+ const requireCaptcha = Boolean(startupConfig?.turnstile?.siteKey);+const registerUser = useRegisterUserMutation({onMutate: () => {setIsSubmitting(true);@@ -73,21 +76,13 @@ const Registration: React.FC = () => {validation,)}aria-invalid={!!errors[id]}- className="- webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light- bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none- "+ className="webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none"placeholder=" "data-testid={id}/><labelhtmlFor={id}- className="- absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200- peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100- peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-500- rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4- "+ className="absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4">{localize(label)}</label>@@ -183,8 +178,7 @@ const Registration: React.FC = () => {value === password || localize('com_auth_password_not_match'),})}- {/* Render Turnstile only if enabled in startupConfig */}- {startupConfig?.turnstile && (+ {startupConfig?.turnstile?.siteKey && (<div className="my-4 flex justify-center"><TurnstilesiteKey={startupConfig.turnstile.siteKey}@@ -204,16 +198,11 @@ const Registration: React.FC = () => {disabled={Object.keys(errors).length > 0 ||isSubmitting ||- (startupConfig?.turnstile ? !turnstileToken : false)+ (requireCaptcha && !turnstileToken)}type="submit"aria-label="Submit registration"- className="- w-full rounded-2xl bg-green-600 px-4 py-3 text-sm font-medium text-white- transition-colors hover:bg-green-700 focus:outline-none focus:ring-2- focus:ring-green-500 focus:ring-offset-2 disabled:opacity-50- disabled:hover:bg-green-600 dark:bg-green-600 dark:hover:bg-green-700- "+ className="w-full rounded-2xl bg-green-600 px-4 py-3 text-sm font-medium text-white transition-colors hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2 disabled:opacity-50 disabled:hover:bg-green-600 dark:bg-green-600 dark:hover:bg-green-700">{isSubmitting ? <Spinner /> : localize('com_auth_continue')}</button>diff --git a/package-lock.json b/package-lock.jsonindex f4690d43c0..fd5e6ab75f 100644--- a/package-lock.json+++ b/package-lock.json@@ -87,6 +87,7 @@"firebase": "^11.0.2","googleapis": "^126.0.1","handlebars": "^4.7.7",+ "helmet": "^8.1.0","https-proxy-agent": "^7.0.6","ioredis": "^5.3.2","js-yaml": "^4.1.0",@@ -31510,6 +31511,15 @@"url": "https://opencollective.com/unified"}},+ "node_modules/helmet": {+ "version": "8.1.0",+ "resolved": "https://registry.npmjs.org/helmet/-/helmet-8.1.0.tgz",+ "integrity": "sha512-jOiHyAZsmnr8LqoPGmCjYAaiuWwjAPLgY8ZX2XrmHawt99/u1y6RgrZMTeoPfpUbV96HOalYgz1qzkRbw54Pmg==",+ "license": "MIT",+ "engines": {+ "node": ">=18.0.0"+ }+ },"node_modules/highlight.js": {"version": "11.8.0","resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz",