Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disallow spaces for a TLD part #677

Merged
merged 7 commits into from
Jun 29, 2017
Merged

Disallow spaces for a TLD part #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf18235
disallow spaces for tld
Jun 28, 2017
16d0b65
Merge branch 'master' into disallow-spaces-tld
IVikulin Jun 28, 2017
ab931f7
Merge branch 'master' of github.com:IVikulin/validator.js into disall…
IVikulin Jun 28, 2017
1af3367
updated validator.min.js
IVikulin Jun 28, 2017
1cf2c26
Merge branch 'disallow-spaces-tld' of github.com:IVikulin/validator.j…
IVikulin Jun 28, 2017
d1f5e64
removed extra simbols from a space regexp, now it works only for:
IVikulin Jun 28, 2017
1e68c0f
updated validator.js and validator.min.js
IVikulin Jun 28, 2017
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
4 changes: 4 additions & 0 deletions lib/isFQDN.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ function isFDQN(str, options) {
if (!parts.length || !/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
return false;
}
// disallow spaces
if (/[\s\u2002-\u200B\u202F\u205F\u3000\uFEFF\uDB40\uDC20]/.test(tld)) {
return false;
}
}
for (var part, i = 0; i < parts.length; i++) {
part = parts[i];
Expand Down
4 changes: 4 additions & 0 deletions src/lib/isFQDN.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ export default function isFDQN(str, options) {
if (!parts.length || !/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
return false;
}
// disallow spaces
if (/[\s\u2002-\u200B\u202F\u205F\u3000\uFEFF\uDB40\uDC20]/.test(tld)) {
return false;
}
}
for (let part, i = 0; i < parts.length; i++) {
part = parts[i];
Expand Down
14 changes: 14 additions & 0 deletions test/validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,19 @@ describe('Validators', function () {
'ｇｍａｉｌｇｍａｉｌｇｍａｉｌｇｍａｉｌｇｍａｉｌ@gmail.com',
`${repeat('a', 64)}@${repeat('a', 251)}.com`,
`${repeat('a', 65)}@${repeat('a', 250)}.com`,
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected] m',
'[email protected]　m',
'[email protected]　m',
],
});
});
Expand Down Expand Up @@ -101,6 +114,7 @@ describe('Validators', function () {
'somename@ｇｍａｉｌ.com',
'hans.m端[email protected]',
'[email protected]',
'tü[email protected]',
],
});
});
Expand Down
4 changes: 4 additions & 0 deletions validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ function isFDQN(str, options) {
if (!parts.length || !/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
return false;
}
// disallow spaces
if (/[\s\u2002-\u200B\u202F\u205F\u3000\uFEFF\uDB40\uDC20]/.test(tld)) {
return false;
}
}
for (var part, i = 0; i < parts.length; i++) {
part = parts[i];
Expand Down
Loading