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: Honor Admin-Panel `allowedDomains` Override at Registration (#13204)

nangelovv6a04fb89e24c
diff --git a/api/server/services/AuthService.js b/api/server/services/AuthService.js
index 6462c88682..c3aca089d4 100644
--- a/api/server/services/AuthService.js
+++ b/api/server/services/AuthService.js
@@ -3,6 +3,7 @@ const jwt = require('jsonwebtoken');
const { webcrypto } = require('node:crypto');
const {
logger,
+ getTenantId,
DEFAULT_SESSION_EXPIRY,
DEFAULT_REFRESH_TOKEN_EXPIRY,
} = require('@librechat/data-schemas');
@@ -212,7 +213,8 @@ const registerUser = async (user, additionalData = {}) => {
let newUserId;
try {
- const appConfig = await getAppConfig({ baseOnly: true });
+ const tenantId = getTenantId();
+ const appConfig = await getAppConfig(tenantId ? { tenantId } : {});
if (!isEmailDomainAllowed(email, appConfig?.registration?.allowedDomains)) {
const errorMessage =
'The email address provided cannot be used. Please use a different email address.';
diff --git a/api/server/services/AuthService.spec.js b/api/server/services/AuthService.spec.js
index 4ee7fc660f..3fce12cc20 100644
--- a/api/server/services/AuthService.spec.js
+++ b/api/server/services/AuthService.spec.js
@@ -1,5 +1,6 @@
jest.mock('@librechat/data-schemas', () => ({
logger: { info: jest.fn(), warn: jest.fn(), debug: jest.fn(), error: jest.fn() },
+ getTenantId: jest.fn(() => undefined),
DEFAULT_SESSION_EXPIRY: 900000,
DEFAULT_REFRESH_TOKEN_EXPIRY: 604800000,
}));
@@ -69,7 +70,7 @@ const {
parseCloudFrontCookieScope,
} = require('@librechat/api');
const jwt = require('jsonwebtoken');
-const { logger } = require('@librechat/data-schemas');
+const { logger, getTenantId } = require('@librechat/data-schemas');
const {
findUser,
createUser,
@@ -887,3 +888,62 @@ describe('CloudFront cookie integration', () => {
});
});
});
+
+describe('registerUser - allowedDomains admin-panel override', () => {
+ const validUser = {
+ email: '[email protected]',
+ password: 'a-secure-password',
+ name: 'New User',
+ username: 'new-user',
+ };
+
+ beforeEach(() => {
+ jest.clearAllMocks();
+ getTenantId.mockReturnValue(undefined);
+ isEmailDomainAllowed.mockReturnValue(true);
+ getAppConfig.mockResolvedValue({
+ registration: { allowedDomains: ['example.com'] },
+ balance: undefined,
+ });
+ findUser.mockResolvedValue(null);
+ countUsers.mockResolvedValue(0);
+ });
+
+ it('should resolve the full app config so admin-panel overrides on the __base__ principal apply', async () => {
+ // Regression guard for getAppConfig({ baseOnly: true }): that option short-circuits
+ // before the DB override merge, which silently ignores any admin-panel edits to
+ // registration.allowedDomains (the admin panel writes overrides to the __base__
+ // principal in the configs collection). registerUser must request the merged config
+ // so the global __base__ override is honored, same as it is for SSO callbacks via
+ // checkDomainAllowed.
+ await registerUser(validUser);
+
+ expect(getAppConfig).toHaveBeenCalledTimes(1);
+ expect(getAppConfig).toHaveBeenCalledWith({});
+ expect(getAppConfig).not.toHaveBeenCalledWith(expect.objectContaining({ baseOnly: true }));
+ });
+
+ it('should pass tenantId from ALS so the merged-config cache key matches tenant-scoped DB queries', async () => {
+ // /api/auth runs through preAuthTenantMiddleware, which puts a tenantId into
+ // AsyncLocalStorage. Mongoose queries inside getApplicableConfigs are scoped by ALS,
+ // but the per-principal merged-config cache key uses the explicit tenantId param.
+ // If we don't forward the ALS tenantId, tenant A's request caches at `__default__`
+ // and a later tenant B request can hit that entry — leaking config across tenants.
+ getTenantId.mockReturnValue('tenant-x');
+
+ await registerUser(validUser);
+
+ expect(getAppConfig).toHaveBeenCalledWith({ tenantId: 'tenant-x' });
+ });
+
+ it('should block registration when the resolved allowedDomains rejects the email', async () => {
+ isEmailDomainAllowed.mockReturnValue(false);
+
+ const result = await registerUser({ ...validUser, email: '[email protected]' });
+
+ expect(result.status).toBe(403);
+ expect(result.message).toMatch(/cannot be used/i);
+ // Domain check must happen before any DB user lookup.
+ expect(findUser).not.toHaveBeenCalled();
+ });
+});