Files
cal.diy/packages/features/watchlist/lib/utils/normalization.ts
T
Alex van AndelandDevin AI 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

155 lines
4.7 KiB
TypeScript

import { emailRegex } from "@calcom/lib/emailSchema";
/**
* Centralized normalization utilities for emails and domains
*
*/
/**
* Normalizes an email address for consistent comparison
*
* Rules applied:
* 1. Convert to lowercase
* 2. Trim whitespace
* 3. Validate basic email format
*
* @param email - Raw email address
* @returns Normalized email address
* @throws Error if email format is invalid
*/
export function normalizeEmail(email: string): string {
const normalized = email.trim().toLowerCase();
if (!emailRegex.test(normalized)) {
throw new Error(`Invalid email format: ${email}`);
}
return normalized;
}
/**
* Normalizes a domain for consistent comparison
*
* Rules applied:
* 1. Convert to lowercase
* 2. Trim whitespace
* 3. Remove @ prefix if present
*
* Note: Domains are stored without @ prefix (e.g., mail.google.com, example.co.uk)
* Wildcard matching is configurable:
* - `*.cal.com` blocks all subdomains (app.cal.com, sub.app.cal.com, etc.)
* - `cal.com` only blocks exact matches
*
* @param domain - Raw domain (with or without @ prefix)
* @returns Normalized domain without @ prefix
*/
export function normalizeDomain(domain: string): string {
let normalized = domain.trim().toLowerCase();
if (normalized.startsWith("@")) {
normalized = normalized.slice(1);
}
const domainRegex =
/^[a-zA-Z0-9\u00a1-\uffff]([a-zA-Z0-9\u00a1-\uffff-]*[a-zA-Z0-9\u00a1-\uffff])?(\.[a-zA-Z0-9\u00a1-\uffff]([a-zA-Z0-9\u00a1-\uffff-]*[a-zA-Z0-9\u00a1-\uffff])?)*$/;
if (!domainRegex.test(normalized)) {
throw new Error(`Invalid domain format: ${domain}`);
}
return normalized;
}
/**
* Extracts and normalizes domain from an email address
*
* @param email - Email address
* @returns Normalized domain without @ prefix
*/
export function extractDomainFromEmail(email: string): string {
const normalizedEmail = normalizeEmail(email);
const domain = normalizedEmail.split("@")[1];
if (!domain) {
throw new Error(`Could not extract domain from email: ${email}`);
}
return normalizeDomain(domain);
}
/**
* Normalizes a username for consistent comparison
*
* Rules applied:
* 1. Convert to lowercase
* 2. Trim whitespace
*
* @param username - Raw username
* @returns Normalized username
*/
export function normalizeUsername(username: string): string {
if (!username || typeof username !== "string") {
throw new Error("Invalid username: must be a non-empty string");
}
return username.trim().toLowerCase();
}
/**
* Gets the wildcard pattern that could match a given domain.
* Used to check if a wildcard entry (*.domain.com) would block this domain.
*
* Simply strips the first part before the first `.` and adds `*.` prefix.
* Only returns a pattern if the parent domain has at least 2 parts (to avoid *.com).
*
* Example:
* - Input: "app.cal.com" -> Output: ["*.cal.com"]
* - Input: "bloody-hell.cal.co.uk" -> Output: ["*.cal.co.uk"]
* - Input: "cal.com" -> Output: [] (parent would be just "com")
* - Input: "example.co.uk" -> Output: ["*.co.uk"]
*
* @param domain - Normalized domain (without @ prefix)
* @returns Array with single wildcard pattern, or empty if no valid parent domain
*/
export function getWildcardPatternsForDomain(domain: string): string[] {
const firstDotIndex = domain.indexOf(".");
if (firstDotIndex === -1 || firstDotIndex === domain.length - 1) {
return [];
}
const parentDomain = domain.slice(firstDotIndex + 1);
// Only return pattern if parent domain has at least one dot (e.g., "cal.com" not "com")
if (!parentDomain.includes(".")) {
return [];
}
return [`*.${parentDomain}`];
}
/**
* Checks if a domain matches a watchlist entry value.
* Supports both exact matching and wildcard matching.
*
* - Exact match: "cal.com" only matches "cal.com"
* - Wildcard match: "*.cal.com" matches "app.cal.com", "sub.app.cal.com", etc.
*
* @param emailDomain - The domain extracted from an email (e.g., "app.cal.com")
* @param watchlistValue - The value from the watchlist entry (e.g., "cal.com" or "*.cal.com")
* @returns true if the domain matches the watchlist entry
*/
export function domainMatchesWatchlistEntry(emailDomain: string, watchlistValue: string): boolean {
const normalizedEmailDomain = emailDomain.toLowerCase();
const normalizedWatchlistValue = watchlistValue.toLowerCase();
// Check for wildcard pattern
if (normalizedWatchlistValue.startsWith("*.")) {
const baseDomain = normalizedWatchlistValue.slice(2); // Remove "*." prefix
// Check if emailDomain is a subdomain of baseDomain
// e.g., "app.cal.com" ends with ".cal.com" (subdomain of cal.com)
return normalizedEmailDomain.endsWith(`.${baseDomain}`);
}
// Exact match
return normalizedEmailDomain === normalizedWatchlistValue;
}