-
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
🔐 feat: Implement Allowed Action Domains (#4964)
* chore: RequestExecutor typing * feat: allowed action domains * fix: rename TAgentsEndpoint to TAssistantEndpoint in typedefs * chore: update librechat-data-provider version to 0.7.62
- Loading branch information
1 parent
e82af23
commit 69bd8e3
Showing
18 changed files
with
364 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| const { getCustomConfig } = require('~/server/services/Config'); | ||
|
|
||
| /** | ||
| * @param {string} email | ||
| * @returns {Promise<boolean>} | ||
| */ | ||
| async function isEmailDomainAllowed(email) { | ||
| if (!email) { | ||
| return false; | ||
| } | ||
|
|
||
| const domain = email.split('@')[1]; | ||
|
|
||
| if (!domain) { | ||
| return false; | ||
| } | ||
|
|
||
| const customConfig = await getCustomConfig(); | ||
| if (!customConfig) { | ||
| return true; | ||
| } else if (!customConfig?.registration?.allowedDomains) { | ||
| return true; | ||
| } | ||
|
|
||
| return customConfig.registration.allowedDomains.includes(domain); | ||
| } | ||
|
|
||
| /** | ||
| * Normalizes a domain string | ||
| * @param {string} domain | ||
| * @returns {string|null} | ||
| */ | ||
| /** | ||
| * Normalizes a domain string. If the domain is invalid, returns null. | ||
| * Normalized === lowercase, trimmed, and protocol added if missing. | ||
| * @param {string} domain | ||
| * @returns {string|null} | ||
| */ | ||
| function normalizeDomain(domain) { | ||
| try { | ||
| let normalizedDomain = domain.toLowerCase().trim(); | ||
|
|
||
| // Early return for obviously invalid formats | ||
| if (normalizedDomain === 'http://' || normalizedDomain === 'https://') { | ||
| return null; | ||
| } | ||
|
|
||
| // If it's not already a URL, make it one | ||
| if (!normalizedDomain.startsWith('http://') && !normalizedDomain.startsWith('https://')) { | ||
| normalizedDomain = `https://${normalizedDomain}`; | ||
| } | ||
|
|
||
| const url = new URL(normalizedDomain); | ||
| // Additional validation that hostname isn't just protocol | ||
| if (!url.hostname || url.hostname === 'http:' || url.hostname === 'https:') { | ||
| return null; | ||
| } | ||
|
|
||
| return url.hostname.replace(/^www\./i, ''); | ||
| } catch { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Checks if the given domain is allowed. If no restrictions are set, allows all domains. | ||
| * @param {string} [domain] | ||
| * @returns {Promise<boolean>} | ||
| */ | ||
| async function isActionDomainAllowed(domain) { | ||
| if (!domain || typeof domain !== 'string') { | ||
| return false; | ||
| } | ||
|
|
||
| const customConfig = await getCustomConfig(); | ||
| const allowedDomains = customConfig?.actions?.allowedDomains; | ||
|
|
||
| if (!Array.isArray(allowedDomains) || !allowedDomains.length) { | ||
| return true; | ||
| } | ||
|
|
||
| const normalizedInputDomain = normalizeDomain(domain); | ||
| if (!normalizedInputDomain) { | ||
| return false; | ||
| } | ||
|
|
||
| for (const allowedDomain of allowedDomains) { | ||
| const normalizedAllowedDomain = normalizeDomain(allowedDomain); | ||
| if (!normalizedAllowedDomain) { | ||
| continue; | ||
| } | ||
|
|
||
| if (normalizedAllowedDomain.startsWith('*.')) { | ||
| const baseDomain = normalizedAllowedDomain.slice(2); | ||
| if ( | ||
| normalizedInputDomain === baseDomain || | ||
| normalizedInputDomain.endsWith(`.${baseDomain}`) | ||
| ) { | ||
| return true; | ||
| } | ||
| } else if (normalizedInputDomain === normalizedAllowedDomain) { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| module.exports = { isEmailDomainAllowed, isActionDomainAllowed }; |
Oops, something went wrong.