bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 08:43:33 +00:00
Code Issues Releases Wiki Activity

better domain parsing with tldjs backup

Browse Source
This commit is contained in:
Kyle Spearrin
2017-03-28 22:11:47 -04:00
parent 02dc3609b4
commit 45d6c6f341
6 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/services/utilsService.js
View File

@@ -128,4 +128,53 @@ function initUtilsService() {
$(this).parent().removeClass('active');
});
}
UtilsService.prototype.getDomain = function (uriString) {
if (!uriString) {
return null;
}
uriString = uriString.trim();
if (uriString === '') {
return null;
}
if (uriString.startsWith('http://') || uriString.startsWith('https://')) {
try {
var url = new URL(uriString);
if (!url || !url.hostname) {
return null;
}
if (url.hostname === 'localhost' || validIpAddress(url.hostname)) {
return url.hostname;
}
if (tldjs) {
var domain = tldjs.getDomain(uriString);
if (domain) {
return domain;
}
}
return url.hostname;
}
catch (e) {
return null;
}
}
else if (tldjs) {
var domain2 = tldjs.getDomain(uriString);
if (domain2) {
return domain2;
}
}
return null;
}
function validIpAddress(ipString) {
var ipRegex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
return ipRegex.test(ipString);
}
};