nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1873944 - Also parse about and data urls with DefaultURI if starting with '/'. r=necko-reviewers,valentin,rpl

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D205062
This commit is contained in:
dylan 2024-04-15 16:51:00 +00:00
parent 63baa88260
commit 70cc93ae5b
8 changed files with 18 additions and 83 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
netwerk/protocol/about/nsAboutProtocolHandler.cpp
View file

@ -21,6 +21,7 @@
#include "nsIChannel.h"
#include "nsIScriptError.h"
#include "nsIClassInfoImpl.h"
#include "DefaultURI.h"
#include "mozilla/ipc/URIUtils.h"
@ -136,6 +137,16 @@ nsresult nsAboutProtocolHandler::CreateNewURI(const nsACString& aSpec,
NS_ENSURE_SUCCESS(rv, rv);
}
// use DefaultURI to check for validity when we have possible hostnames
// since nsSimpleURI doesn't know about hostnames
auto pos = aSpec.Find("about:/");
if (pos != kNotFound) {
rv = NS_MutateURI(new mozilla::net::DefaultURI::Mutator())
.SetSpec(aSpec)
.Finalize(url);
NS_ENSURE_SUCCESS(rv, rv);
}
url.swap(*aResult);
return NS_OK;
}

14
netwerk/protocol/data/nsDataHandler.cpp
View file

@ -68,16 +68,12 @@ nsDataHandler::GetScheme(nsACString& result) {
// use DefaultURI to check for validity when we have possible hostnames
// since nsSimpleURI doesn't know about hostnames
auto pos = aSpec.Find("data:");
auto pos = aSpec.Find("data:/");
if (pos != kNotFound) {
nsDependentCSubstring rest(aSpec, pos + sizeof("data:") - 1, -1);
if (StringBeginsWith(rest, "//"_ns)) {
nsCOMPtr<nsIURI> uriWithHost;
rv = NS_MutateURI(new mozilla::net::DefaultURI::Mutator())
.SetSpec(aSpec)
.Finalize(uriWithHost);
NS_ENSURE_SUCCESS(rv, rv);
}
rv = NS_MutateURI(new mozilla::net::DefaultURI::Mutator())
.SetSpec(aSpec)
.Finalize(uri);
NS_ENSURE_SUCCESS(rv, rv);
}
uri.forget(result);

15
testing/web-platform/meta/url/a-element-xhtml.xhtml.ini
View file

@ -971,9 +971,6 @@
[Parsing: <http://example.com/foo/%2e> against <about:blank>]
expected: FAIL
[Parsing: <about:/../> against <about:blank>]
expected: FAIL
[Parsing: <http://!"$&'()*+,-.;=_`{}~/> against <about:blank>]
expected: FAIL
@ -983,17 +980,5 @@
[Parsing: <wss://host/ !"$%&'()*+,-./:;<=>@[\\\]^_`{|}~> against <about:blank>]
expected: FAIL
[Parsing: <data:/../> against <about:blank>]
expected: FAIL
[Parsing: <data://example.com:8080/pathname?search#hash> against <about:blank>]
expected: FAIL
[Parsing: <data:///test> against <about:blank>]
expected: FAIL
[Parsing: <data://test/a/../b> against <about:blank>]
expected: FAIL
[a-element-xhtml.xhtml?include=mailto]

15
testing/web-platform/meta/url/a-element.html.ini
View file

@ -1000,9 +1000,6 @@
[Parsing: <http://example.com/foo/%2e> against <about:blank>]
expected: FAIL
[Parsing: <about:/../> against <about:blank>]
expected: FAIL
[Parsing: <http://!"$&'()*+,-.;=_`{}~/> against <about:blank>]
expected: FAIL
@ -1012,17 +1009,5 @@
[Parsing: <wss://host/ !"$%&'()*+,-./:;<=>@[\\\]^_`{|}~> against <about:blank>]
expected: FAIL
[Parsing: <data:/../> against <about:blank>]
expected: FAIL
[Parsing: <data://example.com:8080/pathname?search#hash> against <about:blank>]
expected: FAIL
[Parsing: <data:///test> against <about:blank>]
expected: FAIL
[Parsing: <data://test/a/../b> against <about:blank>]
expected: FAIL
[a-element.html?include=mailto]

30
testing/web-platform/meta/url/url-constructor.any.js.ini
View file

@ -1200,9 +1200,6 @@
[Parsing: <http://example.com/foo/%2e> without base]
expected: FAIL
[Parsing: <about:/../> without base]
expected: FAIL
[Parsing: <http://!"$&'()*+,-.;=_`{}~/> without base]
expected: FAIL
@ -1212,18 +1209,6 @@
[Parsing: <wss://host/ !"$%&'()*+,-./:;<=>@[\\\]^_`{|}~> without base]
expected: FAIL
[Parsing: <data:/../> without base]
expected: FAIL
[Parsing: <data://example.com:8080/pathname?search#hash> without base]
expected: FAIL
[Parsing: <data:///test> without base]
expected: FAIL
[Parsing: <data://test/a/../b> without base]
expected: FAIL
[url-constructor.any.html?include=file]
[Parsing: <file:c:\\foo\\bar.html> against <file:///tmp/mock/path>]
@ -1545,9 +1530,6 @@
[Parsing: <http://example.com/foo/%2e> without base]
expected: FAIL
[Parsing: <about:/../> without base]
expected: FAIL
[Parsing: <http://!"$&'()*+,-.;=_`{}~/> without base]
expected: FAIL
@ -1557,18 +1539,6 @@
[Parsing: <wss://host/ !"$%&'()*+,-./:;<=>@[\\\]^_`{|}~> without base]
expected: FAIL
[Parsing: <data:/../> without base]
expected: FAIL
[Parsing: <data://example.com:8080/pathname?search#hash> without base]
expected: FAIL
[Parsing: <data:///test> without base]
expected: FAIL
[Parsing: <data://test/a/../b> without base]
expected: FAIL
[url-constructor.any.html?include=javascript]
[Parsing: <javascript:/../> without base]

6
testing/web-platform/meta/url/url-setters-a-area.window.js.ini
View file

@ -55,12 +55,6 @@
[<area>: Setting <non-spec:/>.pathname = '//p']
expected: FAIL
[<a>: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
expected: FAIL
[<area>: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
expected: FAIL
[<a>: Setting <data:space ?query#fragment>.search = '' Do not drop trailing spaces from non-trailing opaque paths]
expected: FAIL

6
testing/web-platform/meta/url/url-setters.any.js.ini
View file

@ -444,9 +444,6 @@
[URL: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path]
expected: FAIL
[URL: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
expected: FAIL
[url-setters.any.html?include=file]
[URL: Setting <file://hi/path>.protocol = 's']
@ -507,9 +504,6 @@
[URL: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path]
expected: FAIL
[URL: Setting <data:/nospace>.pathname = 'space ' Non-special URLs with non-opaque paths percent-encode U+0020]
expected: FAIL
[url-setters.any.worker.html?include=file]
[URL: Setting <file://hi/path>.protocol = 's']

4
toolkit/modules/tests/xpcshell/test_MatchURLFilters.js
View file

@ -226,14 +226,14 @@ add_task(async function test_match_url_filters() {
// TODO: should we explicitly cover hostContains, hostPrefix, hostSuffix for
// these sub-cases?
{ shouldFail, filters: [{ hostEquals: "blank" }], url: "about:blank" },
{ shouldFail, filters: [{ hostEquals: "blank" }], url: "about://blank" },
{ shouldPass, filters: [{ hostEquals: "blank" }], url: "about://blank" },
{
shouldFail,
filters: [{ hostEquals: "testDataURL" }],
url: "data:,testDataURL",
},
{ shouldPass, filters: [{ hostEquals: "" }], url: "about:blank" },
{ shouldPass, filters: [{ hostEquals: "" }], url: "about://blank" },
{ shouldFail, filters: [{ hostEquals: "" }], url: "about://blank" },
{ shouldPass, filters: [{ hostEquals: "" }], url: "data:,testDataURL" },
// Path filters (pathEquals, pathContains, pathPrefix, pathSuffix).