mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
12dc484cbd
- Bug 1257611 - Fix wrong CondVar::Wait() and Monitor::Wait() usage in netwerk/cache2, r=honzab (54f1a79f43) - Bug 1239687 - Leak invalid/doomed file handles immediately after HTTP cache shutdown. r=michal (a20bcf662b) - Bug 996836 - Merge CLOSE and WRITE priority in cache2 I/O thread. r=michal (8b0af50593) - Bug 1265243 - Do not initialize CacheObserver in the child process, r=honzab (87f69529d2) - Bug 1247432 - Don't do any unnecessary I/O in cache2 after shutdown. r=michal (7c5a2b89ac) - Bug 1220272 - Fix signalling in HTTP cache test code suspender. r=michal (293a16731d) - Bug 1160368 - Part 2: Clean up some cruft in nsCookie.h from PRBool/bool conversions. r=jdm (aa873f2dcc) - Bug 1160368 - Part 5: Clean up some confusing browser_storage_listings.js checks. r=jdm (b27f5930a9) - Bug 866380 - Null check for amlogic libc implementation. r=valentin (c3a487af9c) - Bug 1257320 - Disable C4577 to unblock compilation on VS2015; r=mayhemer (2f800ca85c) - Bug 1229726 - fix the data copy from sockaddr to NetAddr on OSX/FreeBSD. r=mcmanus. (fde11e004e) - Bug 1241368 - provide JS implemented MDNS service as a fallback. r=nwgh,nalexander. (afe1445eb8) - Bug 571126: Remove NECKO_SEPARATE_STACKS support, r=jduell (fb5b87bb3a) - Bug 1057689 - Add xpcshell test checking correct notifications and app-offline state r=jduell (89946b44ba) - Bug 1259459 - h2 0 length options puts end-stream on headers r=hurley (618480a609) - Bug 1234251 - Remove HttpChannelChild::mSynthesizedResponseHead; r=jdm (20981affea) - Bug 904559 - Veto redirect when target channel doesn't implement nsIParentRedirectingChannel. r=jduell (b3da2fae91) - Bug 1261784 Make sure InterceptedChannel body streams are always closed. r=jdm (cd50b1a52b) - Bug 1224508 - Use URI path without reference as the callback key. r=valentin. (b8a953f23a) - Bug 1226760 - ViewSource doesn't work for packaged app resources r=mcmanus (ec9b0297de) - Bug 1254061 - Rewrite nsHttp::ParseInt64 using strtoll r=mcmanus (2125b8ae6f) - Bug 1241565 - nsIHttpChannelInternal should be a builtinclass, r=honzab.moz (d24da6a95a) - Bug 1252386 - Removed debugging printf,r=me (c5d89f353c) - bug 277813 - autogenerated expires needs max r=mayhemer (6aa7c255a5) - Bug 1225384 - Change how the default resource "host names" are handled. r=michal (868732baab) - Bug 719905: Fix resolution of resource: URLs containing : and / characters. r=valentin (f60f4baacf) - Bug 1195173 - Convert ExtensionProtocolHandler to use channel->Open2() (r=maglione) (063f5d5d10) - Bug 1226909 followup to fix bustage. Make sure that the channel returned by NS_NewChannel doesn't have a loadinfo that indicates that the channel has already been opened (42ebe0f44e) - Bug 241698 - Fixed init and use of nsDirIndex::mLastModified (-1LL) + built in nullptr checks where they were missing. r=dragana (e9c2277a3d) - Bug 1261318 - make sure brotli context is created in onstoprequest r=bagder (6646fed64d) - Bug 1212223 - Update |bufLen| as well when we probed the multipart preamble. r=valentin. (ec878c5b0f) - Bug 1259561: Increase CRAZY_COORD (threshold for debug build layout warnings) by an order of magnitude. r=mats (c05c16dd85) - Bug 1261698. Make ReparentFrameViewTo return void because it always returns NS_OK. r=mats (e806d6abcb) - Bug 1261698. Remove comment that is not relevant in nsContainerFrame.cpp. (f570189d15) - Bug 1261698. Don't descend into child frames looking for views in ReparentFrameViewTo if the frame doesn't have the NS_FRAME_HAS_CHILD_WITH_VIEW bit set. r=mats (0d42befd46) - Bug 1265154 - Fix compile error in MSVC 2013 caused by ArrayLength; r=heycam (1c962f2840) - Bug 1260351 - Image: Enable ConvolveVertically/Horizontally in LS3 MMI. r=tnikkel (576b6bbdb3) - Bug 1209780 (Part 1) - Mark DrawResult MOZ_MUST_USE. r=tn (e6c113bef2) - Bug 1253753 - Remove unnecessary switch fallthrough to avoid -Wimplicit-fallthrough warning. r=karlt (96bd93fc5c) - bug 1260178 null check pattern from -unico-border-gradient r=acomminos (f63c9c7ffb) - Bug 1247796. Use keyboardFocusIndicatorColor for ActiveBorder system color keyword. r=mstange (7ed133de97) - Bug 1248675 - Update the cached mBounds in nsChildView when its backing scale factor (display DPI) changes. r=mstange (8197274118) - Bug 1256576 - Make sure texture is (re)initialized if the size changed. r=snorp (2c56790ca9) - Bug 1242449 - Fix confusion among CSS, desktop and device pixel units in nsXULWindow position/size and window staggering so as to work consistently across mixed resolution displays. r=emk (f73d2fd41d) - Bug 1255645 - Ensure nsXULWindow constrains the window to the bounds of its screen after applying intrinsic sizing (if appropriate), by re-doing positioning after the window has been sized properly. r=emk (e87e0cea81) - Bug 1259492 - Ensure window position is constrained to the screen after it has been sized properly in nsXULWindow::OnChromeLoaded. r=emk (7cf599b39b) - Bug 1251620 - Update pdf.js to version 1.4.95. r=bdahl, r=Mossop (f8bbd73419) - Bug 1228655 - Move TabsInTitlebar to its own file to remove ifdefs. r=Gijs (ca6cd981bf) - Bug 1832708 - Disable std::__throw_* wrapping on libc++ >= 14.0. r=firefox-build-system-reviewers,andi (29e0cc9319)
400 lines
11 KiB
C++
400 lines
11 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/chrome/RegistryMessageUtils.h"
|
|
#include "mozilla/dom/ContentParent.h"
|
|
#include "mozilla/unused.h"
|
|
|
|
#include "SubstitutingProtocolHandler.h"
|
|
#include "nsIChannel.h"
|
|
#include "nsIIOService.h"
|
|
#include "nsIFile.h"
|
|
#include "nsNetCID.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsURLHelper.h"
|
|
#include "nsEscape.h"
|
|
|
|
using mozilla::dom::ContentParent;
|
|
|
|
namespace mozilla {
|
|
|
|
// Log module for Substituting Protocol logging. We keep the pre-existing module
|
|
// name of "nsResProtocol" to avoid disruption.
|
|
static LazyLogModule gResLog("nsResProtocol");
|
|
|
|
static NS_DEFINE_CID(kSubstitutingURLCID, NS_SUBSTITUTINGURL_CID);
|
|
|
|
//---------------------------------------------------------------------------------
|
|
// SubstitutingURL : overrides nsStandardURL::GetFile to provide nsIFile resolution
|
|
//---------------------------------------------------------------------------------
|
|
|
|
nsresult
|
|
SubstitutingURL::EnsureFile()
|
|
{
|
|
nsAutoCString ourScheme;
|
|
nsresult rv = GetScheme(ourScheme);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// Get the handler associated with this scheme. It would be nice to just
|
|
// pass this in when constructing SubstitutingURLs, but we need a generic
|
|
// factory constructor.
|
|
nsCOMPtr<nsIIOService> io = do_GetIOService(&rv);
|
|
nsCOMPtr<nsIProtocolHandler> handler;
|
|
rv = io->GetProtocolHandler(ourScheme.get(), getter_AddRefs(handler));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
nsCOMPtr<nsISubstitutingProtocolHandler> substHandler = do_QueryInterface(handler);
|
|
MOZ_ASSERT(substHandler);
|
|
|
|
nsAutoCString spec;
|
|
rv = substHandler->ResolveURI(this, spec);
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
nsAutoCString scheme;
|
|
rv = net_ExtractURLScheme(spec, scheme);
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
// Bug 585869:
|
|
// In most cases, the scheme is jar if it's not file.
|
|
// Regardless, net_GetFileFromURLSpec should be avoided
|
|
// when the scheme isn't file.
|
|
if (!scheme.EqualsLiteral("file"))
|
|
return NS_ERROR_NO_INTERFACE;
|
|
|
|
return net_GetFileFromURLSpec(spec, getter_AddRefs(mFile));
|
|
}
|
|
|
|
/* virtual */ nsStandardURL*
|
|
SubstitutingURL::StartClone()
|
|
{
|
|
SubstitutingURL *clone = new SubstitutingURL();
|
|
return clone;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
SubstitutingURL::GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
|
|
{
|
|
*aClassIDNoAlloc = kSubstitutingURLCID;
|
|
return NS_OK;
|
|
}
|
|
|
|
SubstitutingProtocolHandler::SubstitutingProtocolHandler(const char* aScheme, uint32_t aFlags,
|
|
bool aEnforceFileOrJar)
|
|
: mScheme(aScheme)
|
|
, mSubstitutions(16)
|
|
, mEnforceFileOrJar(aEnforceFileOrJar)
|
|
{
|
|
mFlags.emplace(aFlags);
|
|
ConstructInternal();
|
|
}
|
|
|
|
SubstitutingProtocolHandler::SubstitutingProtocolHandler(const char* aScheme)
|
|
: mScheme(aScheme)
|
|
, mSubstitutions(16)
|
|
, mEnforceFileOrJar(true)
|
|
{
|
|
ConstructInternal();
|
|
}
|
|
|
|
void
|
|
SubstitutingProtocolHandler::ConstructInternal()
|
|
{
|
|
nsresult rv;
|
|
mIOService = do_GetIOService(&rv);
|
|
MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv) && mIOService);
|
|
}
|
|
|
|
//
|
|
// IPC marshalling.
|
|
//
|
|
|
|
void
|
|
SubstitutingProtocolHandler::CollectSubstitutions(InfallibleTArray<SubstitutionMapping>& aMappings)
|
|
{
|
|
for (auto iter = mSubstitutions.ConstIter(); !iter.Done(); iter.Next()) {
|
|
nsCOMPtr<nsIURI> uri = iter.Data();
|
|
SerializedURI serialized;
|
|
if (uri) {
|
|
uri->GetSpec(serialized.spec);
|
|
uri->GetOriginCharset(serialized.charset);
|
|
}
|
|
SubstitutionMapping substitution = { mScheme, nsCString(iter.Key()), serialized };
|
|
aMappings.AppendElement(substitution);
|
|
}
|
|
}
|
|
|
|
void
|
|
SubstitutingProtocolHandler::SendSubstitution(const nsACString& aRoot, nsIURI* aBaseURI)
|
|
{
|
|
if (GeckoProcessType_Content == XRE_GetProcessType()) {
|
|
return;
|
|
}
|
|
|
|
nsTArray<ContentParent*> parents;
|
|
ContentParent::GetAll(parents);
|
|
if (!parents.Length()) {
|
|
return;
|
|
}
|
|
|
|
SubstitutionMapping mapping;
|
|
mapping.scheme = mScheme;
|
|
mapping.path = aRoot;
|
|
if (aBaseURI) {
|
|
aBaseURI->GetSpec(mapping.resolvedURI.spec);
|
|
aBaseURI->GetOriginCharset(mapping.resolvedURI.charset);
|
|
}
|
|
|
|
for (uint32_t i = 0; i < parents.Length(); i++) {
|
|
Unused << parents[i]->SendRegisterChromeItem(mapping);
|
|
}
|
|
}
|
|
|
|
//----------------------------------------------------------------------------
|
|
// nsIProtocolHandler
|
|
//----------------------------------------------------------------------------
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::GetScheme(nsACString &result)
|
|
{
|
|
result = mScheme;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::GetDefaultPort(int32_t *result)
|
|
{
|
|
*result = -1;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::GetProtocolFlags(uint32_t *result)
|
|
{
|
|
if (mFlags.isNothing()) {
|
|
NS_WARNING("Trying to get protocol flags the wrong way - use nsIProtocolHandlerWithDynamicFlags instead");
|
|
return NS_ERROR_NOT_AVAILABLE;
|
|
}
|
|
|
|
*result = mFlags.ref();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::NewURI(const nsACString &aSpec,
|
|
const char *aCharset,
|
|
nsIURI *aBaseURI,
|
|
nsIURI **result)
|
|
{
|
|
nsresult rv;
|
|
|
|
RefPtr<SubstitutingURL> url = new SubstitutingURL();
|
|
if (!url)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
// unescape any %2f and %2e to make sure nsStandardURL coalesces them.
|
|
// Later net_GetFileFromURLSpec() will do a full unescape and we want to
|
|
// treat them the same way the file system will. (bugs 380994, 394075)
|
|
nsAutoCString spec;
|
|
const char *src = aSpec.BeginReading();
|
|
const char *end = aSpec.EndReading();
|
|
const char *last = src;
|
|
|
|
spec.SetCapacity(aSpec.Length()+1);
|
|
for ( ; src < end; ++src) {
|
|
if (*src == '%' && (src < end-2) && *(src+1) == '2') {
|
|
char ch = '\0';
|
|
if (*(src+2) == 'f' || *(src+2) == 'F') {
|
|
ch = '/';
|
|
} else if (*(src+2) == 'e' || *(src+2) == 'E') {
|
|
ch = '.';
|
|
}
|
|
|
|
if (ch) {
|
|
if (last < src) {
|
|
spec.Append(last, src-last);
|
|
}
|
|
spec.Append(ch);
|
|
src += 2;
|
|
last = src+1; // src will be incremented by the loop
|
|
}
|
|
}
|
|
}
|
|
if (last < src)
|
|
spec.Append(last, src-last);
|
|
|
|
rv = url->Init(nsIStandardURL::URLTYPE_STANDARD, -1, spec, aCharset, aBaseURI);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
url.forget(result);
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::NewChannel2(nsIURI* uri,
|
|
nsILoadInfo* aLoadInfo,
|
|
nsIChannel** result)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(uri);
|
|
nsAutoCString spec;
|
|
nsresult rv = ResolveURI(uri, spec);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsCOMPtr<nsIURI> newURI;
|
|
rv = NS_NewURI(getter_AddRefs(newURI), spec);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
rv = NS_NewChannelInternal(result, newURI, aLoadInfo);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsLoadFlags loadFlags = 0;
|
|
(*result)->GetLoadFlags(&loadFlags);
|
|
(*result)->SetLoadFlags(loadFlags & ~nsIChannel::LOAD_REPLACE);
|
|
rv = (*result)->SetOriginalURI(uri);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
return SubstituteChannel(uri, aLoadInfo, result);
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
|
|
{
|
|
return NewChannel2(uri, nullptr, result);
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::AllowPort(int32_t port, const char *scheme, bool *_retval)
|
|
{
|
|
// don't override anything.
|
|
*_retval = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
//----------------------------------------------------------------------------
|
|
// nsISubstitutingProtocolHandler
|
|
//----------------------------------------------------------------------------
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::SetSubstitution(const nsACString& root, nsIURI *baseURI)
|
|
{
|
|
if (!baseURI) {
|
|
mSubstitutions.Remove(root);
|
|
SendSubstitution(root, baseURI);
|
|
return NS_OK;
|
|
}
|
|
|
|
// If baseURI isn't a same-scheme URI, we can set the substitution immediately.
|
|
nsAutoCString scheme;
|
|
nsresult rv = baseURI->GetScheme(scheme);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
if (!scheme.Equals(mScheme)) {
|
|
if (mEnforceFileOrJar && !scheme.EqualsLiteral("file") && !scheme.EqualsLiteral("jar")
|
|
&& !scheme.EqualsLiteral("app")) {
|
|
NS_WARNING("Refusing to create substituting URI to non-file:// target");
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
mSubstitutions.Put(root, baseURI);
|
|
SendSubstitution(root, baseURI);
|
|
return NS_OK;
|
|
}
|
|
|
|
// baseURI is a same-type substituting URI, let's resolve it first.
|
|
nsAutoCString newBase;
|
|
rv = ResolveURI(baseURI, newBase);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsCOMPtr<nsIURI> newBaseURI;
|
|
rv = mIOService->NewURI(newBase, nullptr, nullptr, getter_AddRefs(newBaseURI));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
mSubstitutions.Put(root, newBaseURI);
|
|
SendSubstitution(root, newBaseURI);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::GetSubstitution(const nsACString& root, nsIURI **result)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(result);
|
|
|
|
if (mSubstitutions.Get(root, result))
|
|
return NS_OK;
|
|
|
|
return GetSubstitutionInternal(root, result);
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::HasSubstitution(const nsACString& root, bool *result)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(result);
|
|
*result = HasSubstitution(root);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
SubstitutingProtocolHandler::ResolveURI(nsIURI *uri, nsACString &result)
|
|
{
|
|
nsresult rv;
|
|
|
|
nsAutoCString host;
|
|
nsAutoCString path;
|
|
|
|
rv = uri->GetAsciiHost(host);
|
|
if (NS_FAILED(rv)) return rv;
|
|
|
|
rv = uri->GetPath(path);
|
|
if (NS_FAILED(rv)) return rv;
|
|
|
|
if (ResolveSpecialCases(host, path, result)) {
|
|
return NS_OK;
|
|
}
|
|
|
|
nsCOMPtr<nsIURI> baseURI;
|
|
rv = GetSubstitution(host, getter_AddRefs(baseURI));
|
|
if (NS_FAILED(rv)) return rv;
|
|
|
|
// Unescape the path so we can perform some checks on it.
|
|
nsCOMPtr<nsIURL> url = do_QueryInterface(uri);
|
|
if (!url) {
|
|
return NS_ERROR_MALFORMED_URI;
|
|
}
|
|
|
|
nsAutoCString unescapedPath;
|
|
rv = url->GetFilePath(unescapedPath);
|
|
if (NS_FAILED(rv)) return rv;
|
|
|
|
NS_UnescapeURL(unescapedPath);
|
|
if (unescapedPath.FindChar('\\') != -1) {
|
|
return NS_ERROR_MALFORMED_URI;
|
|
}
|
|
|
|
// Some code relies on an empty path resolving to a file rather than a
|
|
// directory.
|
|
NS_ASSERTION(path.CharAt(0) == '/', "Path must begin with '/'");
|
|
if (path.Length() == 1) {
|
|
rv = baseURI->GetSpec(result);
|
|
} else {
|
|
// Make sure we always resolve the path as file-relative to our target URI.
|
|
path.InsertLiteral(".", 0);
|
|
|
|
rv = baseURI->Resolve(path, result);
|
|
}
|
|
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
if (MOZ_LOG_TEST(gResLog, LogLevel::Debug)) {
|
|
nsAutoCString spec;
|
|
uri->GetAsciiSpec(spec);
|
|
MOZ_LOG(gResLog, LogLevel::Debug, ("%s\n -> %s\n", spec.get(), PromiseFlatCString(result).get()));
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
} // namespace mozilla
|