Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions apps/meteor/app/lib/server/lib/validateEmailDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,57 +9,69 @@ import { settings } from '../../../settings/server';

const dnsResolveMx = util.promisify(dns.resolveMx);

let emailDomainBlackList = [];
let emailDomainWhiteList = [];
let emailDomainBlackSet = new Set();
let emailDomainWhiteSet = new Set();
let defaultBlackSet = new Set();

// Normalization helper (single source of truth)
const normalize = (domain) => domain.trim().toLowerCase();

// Normalize default blacklist once at startup
defaultBlackSet = new Set(emailDomainDefaultBlackList.map(normalize));

// Watch for admin config changes → normalize at ingestion
settings.watch('Accounts_BlockedDomainsList', (value) => {
if (!value) {
emailDomainBlackList = [];
emailDomainBlackSet = new Set();
return;
}

emailDomainBlackList = value
.split(',')
.filter(Boolean)
.map((domain) => domain.trim());
emailDomainBlackSet = new Set(value.split(',').map(normalize).filter(Boolean));
});

settings.watch('Accounts_AllowedDomainsList', (value) => {
if (!value) {
emailDomainWhiteList = [];
emailDomainWhiteSet = new Set();
return;
}

emailDomainWhiteList = value
.split(',')
.filter(Boolean)
.map((domain) => domain.trim());
emailDomainWhiteSet = new Set(value.split(',').map(normalize).filter(Boolean));
});

export const validateEmailDomain = async function (email) {
// Step 1: Validate basic email format
if (!validateEmail(email)) {
throw new Meteor.Error('error-invalid-email', `Invalid email ${email}`, {
function: 'RocketChat.validateEmailDomain',
email,
});
}

const emailDomain = email.substr(email.lastIndexOf('@') + 1);
// Step 2: Extract + normalize domain
const atIndex = email.lastIndexOf('@');
if (atIndex === -1) {
throw new Meteor.Error('error-invalid-email', `Invalid email ${email}`, {
function: 'RocketChat.validateEmailDomain',
});
}

if (emailDomainWhiteList.length && !emailDomainWhiteList.includes(emailDomain)) {
const emailDomain = normalize(email.slice(atIndex + 1));

// Step 3: Whitelist enforcement
if (emailDomainWhiteSet.size > 0 && !emailDomainWhiteSet.has(emailDomain)) {
throw new Meteor.Error('error-invalid-domain', 'The email domain is not in whitelist', {
function: 'RocketChat.validateEmailDomain',
});
}
if (
emailDomainBlackList.length &&
(emailDomainBlackList.indexOf(emailDomain) !== -1 ||
(settings.get('Accounts_UseDefaultBlockedDomainsList') && emailDomainDefaultBlackList.indexOf(emailDomain) !== -1))
) {

// Step 4: Blacklist enforcement (takes priority)
if (emailDomainBlackSet.has(emailDomain) || (settings.get('Accounts_UseDefaultBlockedDomainsList') && defaultBlackSet.has(emailDomain))) {
throw new Meteor.Error('error-email-domain-blacklisted', 'The email domain is blacklisted', {
function: 'RocketChat.validateEmailDomain',
});
}

// Step 5: DNS validation (optional)
if (settings.get('Accounts_UseDNSDomainCheck')) {
try {
await dnsResolveMx(emailDomain);
Expand Down