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

feat(isUrl): higher priority to whitelist #1748

Merged
merged 2 commits into from Oct 5, 2021
Merged

feat(isUrl): higher priority to whitelist #1748

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2092e62
isUrl higher priority to whitelist
deepanshu2506 Oct 2, 2021
2293c1d
remove extra line at end of package.json
deepanshu2506 Oct 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/lib/isURL.js
View file
Open in desktop
Expand Up @@ -145,15 +145,15 @@ export default function isURL(url, options) {
return false;
}

if (options.host_whitelist) {
return checkHost(host, options.host_whitelist);
}
if (!isIP(host) && !isFQDN(host, options) && (!ipv6 || !isIP(ipv6, 6))) {
return false;
}

host = host || ipv6;

if (options.host_whitelist && !checkHost(host, options.host_whitelist)) {
return false;
}
if (options.host_blacklist && checkHost(host, options.host_blacklist)) {
return false;
}
Expand Down