Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 758990 - Don't create feed URIs that inherit security context, r=gavin

Browse Source
This commit is contained in:
Phil Ringnalda 2012-05-29 23:27:40 -07:00
parent c15ef6f2b8
commit 3d8333a8de
4 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
browser/components/feeds/src/FeedConverter.js
View File

@ -525,14 +525,19 @@ GenericProtocolHandler.prototype = {
var scheme = this._scheme + ":";
if (spec.substr(0, scheme.length) != scheme)
throw Components.results.NS_ERROR_MALFORMED_URI;
throw Cr.NS_ERROR_MALFORMED_URI;
var prefix = spec.substr(scheme.length, 2) == "//" ? "http:" : "";
var inner = Cc["@mozilla.org/network/io-service;1"].
getService(Ci.nsIIOService).newURI(spec.replace(scheme, prefix),
originalCharset, baseURI);
var uri = Cc["@mozilla.org/network/util;1"].
getService(Ci.nsINetUtil).newSimpleNestedURI(inner);
var netutil = Cc["@mozilla.org/network/util;1"].getService(Ci.nsINetUtil);
const URI_INHERITS_SECURITY_CONTEXT = Ci.nsIProtocolHandler
.URI_INHERITS_SECURITY_CONTEXT;
if (netutil.URIChainHasFlags(inner, URI_INHERITS_SECURITY_CONTEXT))
throw Cr.NS_ERROR_MALFORMED_URI;
var uri = netutil.newSimpleNestedURI(inner);
uri.spec = inner.spec.replace(prefix, scheme);
return uri;
},

4
browser/components/feeds/test/unit/test_355473.js
View File

@ -1,5 +1,3 @@
const NS_ERROR_MALFORMED_URI = 0x804B000A;
function run_test() {
var feedFeedURI = ios.newURI("feed://example.com/feed.xml", null, null);
var httpFeedURI = ios.newURI("feed:http://example.com/feed.xml", null, null);
@ -23,7 +21,7 @@ function run_test() {
do_check_true(httpURI.equals(httpChannel.URI));
do_check_true(httpsURI.equals(httpsChannel.URI));
var dataFeedURI = ios.newURI("feed:data:text/xml,<rss/>", null, null);
// check that we don't throw creating feed: URIs from file and ftp
var ftpFeedURI = ios.newURI("feed:ftp://example.com/feed.xml", null, null);
var fileFeedURI = ios.newURI("feed:file:///var/feed.xml", null, null);
}

42
browser/components/feeds/test/unit/test_758990.js Normal file
View File

@ -0,0 +1,42 @@
function run_test() {
var success = false;
try {
var newURI = ios.newURI("feed:javascript:alert('hi');", null, null);
}
catch (e) {
success = e.result == Cr.NS_ERROR_MALFORMED_URI;
}
if (!success)
do_throw("We didn't throw NS_ERROR_MALFORMED_URI creating a feed:javascript: URI");
success = false;
try {
newURI = ios.newURI("feed:data:text/html,hi", null, null);
}
catch (e) {
success = e.result == Cr.NS_ERROR_MALFORMED_URI;
}
if (!success)
do_throw("We didn't throw NS_ERROR_MALFORMED_URI creating a feed:data: URI");
success = false;
try {
newURI = ios.newURI("pcast:javascript:alert('hi');", null, null);
}
catch (e) {
success = e.result == Cr.NS_ERROR_MALFORMED_URI;
}
if (!success)
do_throw("We didn't throw NS_ERROR_MALFORMED_URI creating a pcast:javascript: URI");
success = false;
try {
newURI = ios.newURI("pcast:data:text/html,hi", null, null);
}
catch (e) {
success = e.result == Cr.NS_ERROR_MALFORMED_URI;
}
if (!success)
do_throw("We didn't throw NS_ERROR_MALFORMED_URI creating a pcast:data: URI");
}

1
browser/components/feeds/test/unit/xpcshell.ini
View File

@ -3,3 +3,4 @@ head = head_feeds.js
tail =
[test_355473.js]
[test_758990.js]