Files
calendar/packages/features/watchlist/lib/service/OrganizationBlockingService.ts
T
Alex van AndelGitHubalex@cal.com <me@alexvanandel.com>Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
c662a76277 feat: add configurable wildcard domain matching to watchlist (#27409)
* feat: add wildcard domain matching to watchlist

When a domain is blocked in the watchlist (e.g., cal.com), all subdomains
are now also blocked (e.g., app.cal.com, sub.app.cal.com).

Changes:
- Add getParentDomains() utility to extract all parent domains
- Update GlobalBlockingService.isBlocked() and areBlocked() for wildcard matching
- Update OrganizationBlockingService.isBlocked() and areBlocked() for wildcard matching
- Add comprehensive tests for wildcard domain matching
- More specific subdomain matches take precedence over parent domain matches
- Email matches still take precedence over domain matches

Co-Authored-By: alex@cal.com <me@alexvanandel.com>

* feat: make wildcard domain matching configurable

- *.cal.com blocks all subdomains (app.cal.com, sub.app.cal.com, etc.)
- cal.com only blocks exact matches (not subdomains)
- Updated getWildcardPatternsForDomain to generate wildcard patterns
- Added domainMatchesWatchlistEntry for configurable matching logic
- Updated GlobalBlockingService and OrganizationBlockingService
- Updated tests to verify new behavior

Co-Authored-By: alex@cal.com <me@alexvanandel.com>

* refactor: simplify wildcard pattern generation to strip only first part

- Only strips the first part before the first dot
- Handles multi-part TLDs correctly (e.g., .co.uk)
- Returns empty array for two-part domains (e.g., cal.com -> no pattern)
- app.cal.com -> *.cal.com
- bloody-hell.cal.co.uk -> *.cal.co.uk

Co-Authored-By: alex@cal.com <me@alexvanandel.com>

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
2026-01-29 23:59:51 +00:00

154 lines
4.7 KiB
TypeScript

import type { BulkBlockingResult, BlockingResult, IBlockingService } from "../interface/IBlockingService";
import type { IOrganizationWatchlistRepository } from "../interface/IWatchlistRepositories";
import { WatchlistType } from "../types";
import {
domainMatchesWatchlistEntry,
extractDomainFromEmail,
getWildcardPatternsForDomain,
normalizeDomain,
normalizeEmail,
} from "../utils/normalization";
type Deps = {
orgRepo: IOrganizationWatchlistRepository;
};
/**
* Service for organization-specific blocking operations
* Handles blocking rules that apply only to a specific organization
*/
export class OrganizationBlockingService implements IBlockingService {
constructor(private readonly deps: Deps) {}
async isBlocked(email: string, organizationId: number): Promise<BlockingResult> {
const normalizedEmail = normalizeEmail(email);
const normalizedDomain = extractDomainFromEmail(normalizedEmail);
const wildcardPatterns = getWildcardPatternsForDomain(normalizedDomain);
const blockingEntries = await this.deps.orgRepo.findBlockingEntriesForEmailsAndDomains({
emails: [normalizedEmail],
domains: [normalizedDomain, ...wildcardPatterns],
organizationId,
});
const emailEntry = blockingEntries.find(
(entry) => entry.type === WatchlistType.EMAIL && entry.value.toLowerCase() === normalizedEmail
);
if (emailEntry) {
return {
isBlocked: true,
reason: WatchlistType.EMAIL,
watchlistEntry: emailEntry,
};
}
for (const entry of blockingEntries) {
if (entry.type === WatchlistType.DOMAIN && domainMatchesWatchlistEntry(normalizedDomain, entry.value)) {
return {
isBlocked: true,
reason: WatchlistType.DOMAIN,
watchlistEntry: entry,
};
}
}
return { isBlocked: false };
}
/**
* Bulk check multiple emails in a single query for an organization.
* Returns Map<email (lowercase), BlockingResult> for efficient lookup.
* Supports configurable wildcard domain matching:
* - `*.cal.com` blocks all subdomains
* - `cal.com` only blocks exact matches
*/
async areBlocked(emails: string[], organizationId: number): Promise<BulkBlockingResult> {
const result: BulkBlockingResult = new Map();
if (emails.length === 0 || !organizationId) {
return result;
}
const normalizedEmails = emails.map((e) => normalizeEmail(e));
const emailToDomain = new Map<string, string>();
const allDomainsAndPatterns = new Set<string>();
for (const email of normalizedEmails) {
const domain = extractDomainFromEmail(email);
emailToDomain.set(email, domain);
allDomainsAndPatterns.add(domain);
const wildcardPatterns = getWildcardPatternsForDomain(domain);
for (const pattern of wildcardPatterns) {
allDomainsAndPatterns.add(pattern);
}
}
const blockingEntries = await this.deps.orgRepo.findBlockingEntriesForEmailsAndDomains({
emails: normalizedEmails,
domains: Array.from(allDomainsAndPatterns),
organizationId,
});
const emailEntries = new Map<string, (typeof blockingEntries)[0]>();
const domainEntries: Array<(typeof blockingEntries)[0]> = [];
for (const entry of blockingEntries) {
if (entry.type === WatchlistType.EMAIL) {
emailEntries.set(entry.value.toLowerCase(), entry);
} else if (entry.type === WatchlistType.DOMAIN) {
domainEntries.push(entry);
}
}
for (const email of normalizedEmails) {
const domain = emailToDomain.get(email) || "";
const emailEntry = emailEntries.get(email);
if (emailEntry) {
result.set(email, {
isBlocked: true,
reason: WatchlistType.EMAIL,
watchlistEntry: emailEntry,
});
continue;
}
let blocked = false;
for (const entry of domainEntries) {
if (domainMatchesWatchlistEntry(domain, entry.value)) {
result.set(email, {
isBlocked: true,
reason: WatchlistType.DOMAIN,
watchlistEntry: entry,
});
blocked = true;
break;
}
}
if (!blocked) {
result.set(email, { isBlocked: false });
}
}
return result;
}
async isDomainBlocked(domain: string, organizationId: number): Promise<BlockingResult> {
const normalizedDomain = normalizeDomain(domain);
return this.deps.orgRepo.findBlockedDomain(normalizedDomain, organizationId).then((domainEntry) => {
if (domainEntry) {
return {
isBlocked: true,
reason: WatchlistType.DOMAIN,
watchlistEntry: domainEntry,
};
}
return { isBlocked: false };
});
}
}