Skip to content
Open
Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions src/lib/isFQDN.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ const default_fqdn_options = {

export default function isFQDN(str, options) {
assertString(str);

// Reject unpaired surrogates while preserving valid surrogate pairs.
if (/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(^|[^\uD800-\uDBFF])[\uDC00-\uDFFF]/.test(str)) {
return false;
}

options = merge(options, default_fqdn_options);

/* Remove the optional trailing dot before checking validity */
Expand Down
23 changes: 20 additions & 3 deletions test/validators.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5785,9 +5785,26 @@ describe('Validators', () => {
});

it('should reject emails containing unpaired UTF-16 surrogates without throwing', () => {
test({
validator: 'isEmail',
invalid: ['\uD800@example.com', '\uDC00@example.com'],
[undefined, { ignore_max_length: true }].forEach((options) => {
test({
validator: 'isEmail',
args: [options],
valid: ['user@example.com', 'user@é.com', 'user@\uD83D\uDE00.com', 'user@a\uD83D\uDE00b.com'],
invalid: [
'\uD800@example.com',
'\uDC00@example.com',
'user@\uD800.com',
'user@\uDC00.com',
'user@\uD800abc.com',
'user@\uDC00abc.com',
'user@a\uD800b.com',
'user@a\uDC00b.com',
'user@abc\uD800.com',
'user@abc\uDC00.com',
'user@\uD83D\uDE00\uDC00.com',
'user@\uD800\uD83D\uDE00.com',
],
});
});
});

Expand Down
22 changes: 22 additions & 0 deletions test/validators/isFQDN.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
import test from '../testFunctions';

describe('isFQDN', () => {
it('should reject unpaired UTF-16 surrogates without throwing', () => {
[undefined, { ignore_max_length: true }].forEach((options) => {
test({
validator: 'isFQDN',
args: [options],
valid: ['example.com', 'é.com', '\uD83D\uDE00.com', 'a\uD83D\uDE00b.com'],
invalid: [
'\uD800.com',
'\uDC00.com',
'\uD800abc.com',
'\uDC00abc.com',
'a\uD800b.com',
'a\uDC00b.com',
'abc\uD800.com',
'abc\uDC00.com',
'\uD83D\uDE00\uDC00.com',
'\uD800\uD83D\uDE00.com',
],
});
});
});

it('should validate domain names.', () => {
test({
validator: 'isFQDN',
Expand Down
Loading