Skip to content
This repository has been archived by the owner on May 10, 2019. It is now read-only.

Commit

Permalink
fixupAbsolutePath: filter out scheme-relative URLs
Browse files Browse the repository at this point in the history
The current check to ensure that only absolute paths are accepted
fails to take into account scheme-relative URLs like "//foo.com".

These URLs end up in fixupURL and get the origin prepended to them
to something like "https://origin.example.com//foo.com", which is
invalid but still follows our same-origin restrictions.

So the solution is to require that the character after the leading
slash be anything but a slash.
  • Loading branch information
Francois Marier committed Sep 20, 2012
1 parent 3f3dfba commit 60d61f5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions resources/static/dialog/js/modules/dialog.js
Expand Up @@ -83,7 +83,7 @@ BrowserID.Modules.Dialog = (function() {
if (typeof(url) !== "string")
throw "urls must be strings: (" + url + ")";
if (/^http(s)?:\/\//.test(url)) u = URLParse(url);
else if (/^\//.test(url)) u = URLParse(origin + url);
else if (/^\/[^\/]/.test(url)) u = URLParse(origin + url);
else throw "relative urls not allowed: (" + url + ")";
// encodeURI limits our return value to [a-z0-9:/?%], excluding <script>
var encodedURI = encodeURI(u.validate().normalize().toString());
Expand All @@ -105,7 +105,8 @@ BrowserID.Modules.Dialog = (function() {
}

function fixupAbsolutePath(origin_url, path) {
if (/^\//.test(path)) return fixupURL(origin_url, path);
// Ensure URL is an absolute path (not a relative path or a scheme-relative URL)
if (/^\/[^\/]/.test(path)) return fixupURL(origin_url, path);

throw "must be an absolute path: (" + path + ")";
}
Expand Down

0 comments on commit 60d61f5

Please sign in to comment.