fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix isSameOrigin() with relative URLs

Browse source
This commit is contained in:
Kijin Sung 2018-01-11 17:36:05 +09:00
parent 7563ab859d
commit 2bbf4d902f
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/js/common.js
View file

@ -33,7 +33,12 @@
* @brief Check if two URLs belong to the same origin
*/
window.isSameOrigin = function(url1, url2) {
if(!url1 || !url2) return false;
if(!url1 || !url2) {
return false;
}
if (url1.match(/^\.?\/[^\/]*/) || url2.match(/^\.?\/[^\/]*/)) {
return true;
}
url1 = window.XE.URI(url1).normalizePort().normalizePathname().origin();
url2 = window.XE.URI(url2).normalizePort().normalizePathname().origin();
return (url1 === url2) ? true : false;
@ -203,7 +208,7 @@
if (typeof url !== "string") {
return false;
}
if (url.match(/^\/[^\/]/)) {
if (url.match(/^\.?\/[^\/]*/)) {
return true;
}
if (url.match(/^\w+:[^\/]*$/)) {