| Index: lib/url.js |
| =================================================================== |
| --- a/lib/url.js |
| +++ b/lib/url.js |
| @@ -45,3 +45,110 @@ |
| return URL; |
| })(); |
| + |
| +/** |
| + * Gets the IDN-decoded hostname from a URL object. |
| + * |
| + * @param {URL} [url] |
| + * @return {string} |
| + */ |
| +function getDecodedHostname(url) |
| +{ |
| + let hostname = url.hostname; |
| + |
| + if (hostname.indexOf("xn--") == -1) |
| + return hostname; |
| + |
| + return punycode.toUnicode(hostname); |
| +} |
| +exports.getDecodedHostname = getDecodedHostname; |
| + |
| +/** |
| + * Gets the IDN-decoded hostname from the URL of a frame. |
| + * If the URL don't have host information (like "about:blank" |
| + * and "data:" URLs) it falls back to the parent frame. |
| + * |
| + * @param {Frame} [frame] |
| + * @return {string} |
| + */ |
| +function extractHostFromFrame(frame) |
| +{ |
| + for (; frame; frame = frame.parent) |
|
kzar
2015/01/26 10:27:38
Took me a second to grok this loop, wouldn't a whi
Sebastian Noack
2015/01/26 10:38:39
I think this a typical case for-lops exist for, to
kzar
2015/01/26 17:19:05
Hmm well I guess it's subjective which form is eas
Sebastian Noack
2015/01/26 17:26:31
As long as you don't consider for-loops generally
Wladimir Palant
2015/02/11 13:45:45
I think I wrote the for loop in the original code,
|
| + { |
| + let hostname = getDecodedHostname(frame.url); |
| + if (hostname) |
| + return hostname; |
| + } |
| + |
| + return ""; |
| +} |
| +exports.extractHostFromFrame = extractHostFromFrame; |
| + |
| +/** |
| + * Converts a URL object into a string. For HTTP(S) URLs the hash and |
| + * auth crendetials are stripped, and the hostname gets IDN-decoded. |
| + * |
| + * @param {URL} [url] |
| + * @return {string} |
| + */ |
| +function stringifyURL(url) |
| +{ |
| + let protocol = url.protocol; |
| + if (protocol != "http:" && protocol != "https:") |
| + return url.href; |
| + |
| + let host = getDecodedHostname(url); |
| + if (url.port) |
| + host += ":" + url.port; |
| + return protocol + "//" + host + url.pathname + url.search; |
| +} |
| +exports.stringifyURL = stringifyURL; |
| + |
| +function isDomain(hostname) |
| +{ |
| + return /[^\d.]/.test(hostname) && hostname.indexOf(":") == -1; |
|
Wladimir Palant
2015/02/09 12:54:29
new URL("http://0x5bec7a38/").hostname - gives you
Sebastian Noack
2015/02/11 10:55:51
Done.
|
| +} |
| + |
| +function getBaseDomain(hostname) |
| +{ |
| + let bits = hostname.split("."); |
| + let cutoff = bits.length - 2; |
| + |
| + for (let i = 0; i < bits.length; i++) |
| + { |
| + let offset = publicSuffixes[bits.slice(i).join(".")]; |
| + |
| + if (typeof offset != "undefined") |
| + { |
| + cutoff = i - offset; |
| + break; |
| + } |
| + } |
| + |
| + if (cutoff <= 0) |
| + return hostname; |
| + |
| + return bits.slice(cutoff).join("."); |
| +} |
| + |
| +/** |
| + * Checks whether the request's origin is different from the document's origin. |
| + * |
| + * @param {URL} [url] The request URL |
| + * @param {string} [documentHost] The IDN-decoded hostname of the document |
| + * @return {Boolean} |
| + */ |
| +function isThirdParty(url, documentHost) |
| +{ |
| + let requestHost = getDecodedHostname(url).replace(/\.+$/, ""); |
| + documentHost = documentHost.replace(/\.+$/, ""); |
| + |
| + if (requestHost == documentHost) |
| + return false; |
| + |
| + if (!isDomain(requestHost) || !isDomain(documentHost)) |
| + return true; |
| + |
| + return getBaseDomain(requestHost) != getBaseDomain(documentHost); |
| +} |
| +exports.isThirdParty = isThirdParty; |