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

isURL - email addresses validate as URLs #707 #901

Merged
merged 3 commits into from
Oct 11, 2018
Merged

isURL - email addresses validate as URLs #707 #901

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87b43c5
isURL - email addresses validate as URLs #707
Oct 2, 2018
de10e13
Rename to disallow_auth + README update #901
Oct 3, 2018
5d39a99
Merge branch 'master' into 707-url-without-auth
chriso Oct 11, 2018
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
3 changes: 3 additions & 0 deletions lib/isURL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ function isURL(url, options) {

split = url.split('@');
if (split.length > 1) {
if (options.exclude_auth_url) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change this to disallow_auth for consistency with the other options?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes can do.

return false;
}
auth = split.shift();
if (auth.indexOf(':') >= 0 && auth.split(':').length > 2) {
return false;
Expand Down
3 changes: 3 additions & 0 deletions src/lib/isURL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ export default function isURL(url, options) {

split = url.split('@');
if (split.length > 1) {
if (options.exclude_auth_url) {
return false;
}
auth = split.shift();
if (auth.indexOf(':') >= 0 && auth.split(':').length > 2) {
return false;
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 @@ -578,6 +578,20 @@ describe('Validators', () => {
});
});

it('should allow rejecting urls containing authentication information', () => {
test({
validator: 'isURL',
args: [{ exclude_auth_url: true }],
valid: [
'doe.com',
],
invalid: [
'john@doe.com',
'john:john@doe.com',
],
});
});

it('should validate MAC addresses', () => {
test({
validator: 'isMACAddress',
Expand Down
3 changes: 3 additions & 0 deletions validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,9 @@ function isURL(url, options) {

split = url.split('@');
if (split.length > 1) {
if (options.exclude_auth_url) {
return false;
}
auth = split.shift();
if (auth.indexOf(':') >= 0 && auth.split(':').length > 2) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion validator.min.js
View file
Open in desktop

Large diffs are not rendered by default.