Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/url.js

Issue 5919468974768128: Issue 2062 - Preserve trailing question mark when converting URL into string (Closed)
Patch Set: Created Feb. 27, 2015, 8:05 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | qunit/tests/url.js » ('j') | qunit/tests/url.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 let hostname = getDecodedHostname(frame.url); 78 let hostname = getDecodedHostname(frame.url);
79 if (hostname) 79 if (hostname)
80 return hostname; 80 return hostname;
81 } 81 }
82 82
83 return ""; 83 return "";
84 } 84 }
85 exports.extractHostFromFrame = extractHostFromFrame; 85 exports.extractHostFromFrame = extractHostFromFrame;
86 86
87 /** 87 /**
88 * Converts a URL object into a string. For HTTP(S) URLs the hash and 88 * Converts a URL object into a string. For HTTP(S) URLs
89 * auth crendetials are stripped, and the hostname gets IDN-decoded. 89 * the hostname gets IDN-decoded and the hash is stripped.
90 * 90 *
91 * @param {URL} [url] 91 * @param {URL} [url]
92 * @return {string} 92 * @return {string}
93 */ 93 */
94 function stringifyURL(url) 94 function stringifyURL(url)
95 { 95 {
96 let protocol = url.protocol; 96 let protocol = url.protocol;
97 if (protocol != "http:" && protocol != "https:") 97 let href = url.href;
98 return url.href;
99 98
100 let host = getDecodedHostname(url); 99 if (protocol == "http:" || protocol == "https:")
101 if (url.port) 100 {
102 host += ":" + url.port; 101 let hostname = url.hostname;
103 return protocol + "//" + host + url.pathname + url.search; 102 if (hostname.indexOf("xn--") != -1)
103 href = href.replace(hostname, punycode.toUnicode(hostname));
104
105 let hash = href.indexOf("#");
106 if (hash != -1)
107 href = href.substr(0, hash);
108 }
109
110 return href;
104 } 111 }
112
105 exports.stringifyURL = stringifyURL; 113 exports.stringifyURL = stringifyURL;
106 114
107 function isDomain(hostname) 115 function isDomain(hostname)
108 { 116 {
109 // No hostname or IPv4 address, also considering hexadecimal octets. 117 // No hostname or IPv4 address, also considering hexadecimal octets.
110 if (/^((0x[\da-f]+|\d+)(\.|$))*$/i.test(hostname)) 118 if (/^((0x[\da-f]+|\d+)(\.|$))*$/i.test(hostname))
111 return false; 119 return false;
112 120
113 // IPv6 address. Since there can't be colons in domains, we can 121 // IPv6 address. Since there can't be colons in domains, we can
114 // just check whether there are any colons to exclude IPv6 addresses. 122 // just check whether there are any colons to exclude IPv6 addresses.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 159
152 if (requestHost == documentHost) 160 if (requestHost == documentHost)
153 return false; 161 return false;
154 162
155 if (!isDomain(requestHost) || !isDomain(documentHost)) 163 if (!isDomain(requestHost) || !isDomain(documentHost))
156 return true; 164 return true;
157 165
158 return getBaseDomain(requestHost) != getBaseDomain(documentHost); 166 return getBaseDomain(requestHost) != getBaseDomain(documentHost);
159 } 167 }
160 exports.isThirdParty = isThirdParty; 168 exports.isThirdParty = isThirdParty;
OLDNEW
« no previous file with comments | « no previous file | qunit/tests/url.js » ('j') | qunit/tests/url.js » ('J')

Powered by Google App Engine
This is Rietveld