mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
1e24b22ef4
- Bug 1150366 - Remove duplicate d3.js. r=jsantell (71f991da6) - Bug 1175352 - Refactor LoadInfo arguments to be more self contained (r=bent) (3f7d08164) - Bug 1181533 - Add nsCRTGlue.h and prtime.h includes to nsDownloadManager.cpp to fix --disable-safe-browsing build bustage. r=froydnj (af338edf1) - Bug 905127 - Part 1 - Make some functions from nsNetUtil not inline. r=jduell Bug 905127 - Part 2 - remove unnecessary nsNetUtil.h includes r=jduell Bug 905127 - Make some functions from nsNetUtil not inline. r=jduell (bc47d5b3a) - Bug 1117650 - Part 1: Move all CORS tests into dom/security/test. r=sicking (6f727387c) - Bug 1117650 - Part 2: Move all MixedContent tests into dom/security/test. r=tanvi (73f273829) - Bug 1004703 - ignore 'unsafe-inline' if nonce- or hash-source specifed - tests (r=sstamm) (ebf411159) - Bug 921493 - CSP: test whitelisting of scheme-relative sources (r=dveditz) (f0618b189) - Bug 1139569 - Optimize update function for element editors in markup view;r=mratcliffe (c60d38dca) - Partil of Bug 1139644 - Make markupview use sdk timers instead of individual timers for each window;r=pbrosset (8bc1a4d66) - Bug 1146568 - Avoid unsafe CPOW usage warnings in browser_markupview_tag_edit_08.js; r=bgrins Making use of the devtools test frame-script to set the test node's attributes instead of using a CPOW. (61d7eed64) - Bug 1146568 - Avoid unsafe CPOW usage in markupview tests, in assertAttributes helper; r=bgrins (efc492d5d) - Bug 858038 - Allow moving elements in the markupview by drag/drop; r=pbrosset (51d79c15c) - Bug 1139644 - Flash only relevant attributes in markup view when changed;r=pbrosset (29807fa46) - Bug 1147128 - Make sure attribute shows up in markup view after removing and setting to the previous value;r=mratcliffe (1947f7417) - Bug 1147325 - Clear box model timer on markup view destroy. r=pbrosset Prevents 'this._inspector.toolbox is null' spam in mochitest-dt (1d6808b4a) - Bug 921102 - 1 - Linkify URIs in the inspector; r=tromey, miker This first part adds a parser for node attributes which, given some node information and an attribute name, generates a small AST-like array of objects that tells which parts of the attribute (if any) are links, and what they link to. Using this, the markup-view generates the right HTML structure to display these parts as links. This part 1 doesn't yet allow users to follow these links. (c500e270e) - Bug 1139667 - CSP tests for fetch(). r=ckirschb (df030457f) - Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions - tests (r=sstamm) (dee0f2239) - Bug 1117650 - Part 3: Move all CSP tests into dom/security/test. r=sstamm (29c95475c) - Bug 1146566 - 1 - Use devtools common frame-script in markupview tests and add helper; r=bgrins (b10e42468) - Bug 1146566 - 2 - Avoid using CPOWs in test browser_markupview_tag_edit_03.js; r=bgrins This change updates the browser_markupview_tag_edit_03.js test by making use of the getDomElementInfo message listener to retrieve information about the tested nodes without having to go through CPOWs. (07f0ee3ff) - Bug 1036324 - Adds option to walker.parents() to not traverse DocShellTreeItems of different types (24123a5d2) - Bug 921102 - 2 - Markup-view tests for attribute links; r=miker (f6da81799) - Bug 901250 - Add scroll into view menu item for the inspector. r=bgrins (bfc7518b1) - Bug 994055 - Part 1: Add a toggle sidebar panel button to the inspector. r=miker This adds a new icon, next to the searchbox (like in the debugger) to expand or collapse the sidebar panel in the inspector. The state is *not* persisted yet when the toolbox is closed. The button is hidden when the toolbox host switches to 'side'. (87730e20a) - Bug 994055 - Part 2: Add tests for the inspector sidebar toggle button. r=miker (2872c3fbd) - Bug 921102 - 3 - Open/copy markup-view attribute links; r=bgrins This part adds contextual menu items that become enabled when the user right clicks on an attribute that has a link. Depending on the nature of the link, a new tab will be opened or a node selected. The user can also choose to copy the link in the clipboard. (9b93485f6) - Bug 921102 - 4 - Tests for the open/copy links on markup-view attributes; r=bgrins (861ba51f6)
368 lines
11 KiB
C++
368 lines
11 KiB
C++
//* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* 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/. */
|
|
|
|
/**
|
|
* Implementation of moz-anno: URLs for accessing favicons. The urls are sent
|
|
* to the favicon service. If the favicon service doesn't have the
|
|
* data, a stream containing the default favicon will be returned.
|
|
*
|
|
* The reference to annotations ("moz-anno") is a leftover from previous
|
|
* iterations of this component. As of now the moz-anno protocol is independent
|
|
* of annotations.
|
|
*/
|
|
|
|
#include "nsAnnoProtocolHandler.h"
|
|
#include "nsFaviconService.h"
|
|
#include "nsIChannel.h"
|
|
#include "nsIInputStreamChannel.h"
|
|
#include "nsILoadGroup.h"
|
|
#include "nsIStandardURL.h"
|
|
#include "nsIStringStream.h"
|
|
#include "nsISupportsUtils.h"
|
|
#include "nsIURI.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsIOutputStream.h"
|
|
#include "nsContentUtils.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsStringStream.h"
|
|
#include "mozilla/storage.h"
|
|
#include "nsIPipe.h"
|
|
#include "Helpers.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::places;
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
//// Global Functions
|
|
|
|
/**
|
|
* Creates a channel to obtain the default favicon.
|
|
*/
|
|
static
|
|
nsresult
|
|
GetDefaultIcon(nsIChannel **aChannel)
|
|
{
|
|
nsCOMPtr<nsIURI> defaultIconURI;
|
|
nsresult rv = NS_NewURI(getter_AddRefs(defaultIconURI),
|
|
NS_LITERAL_CSTRING(FAVICON_DEFAULT_URL));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
return NS_NewChannel(aChannel,
|
|
defaultIconURI,
|
|
nsContentUtils::GetSystemPrincipal(),
|
|
nsILoadInfo::SEC_NORMAL,
|
|
nsIContentPolicy::TYPE_IMAGE);
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
//// faviconAsyncLoader
|
|
|
|
namespace {
|
|
|
|
/**
|
|
* An instance of this class is passed to the favicon service as the callback
|
|
* for getting favicon data from the database. We'll get this data back in
|
|
* HandleResult, and on HandleCompletion, we'll close our output stream which
|
|
* will close the original channel for the favicon request.
|
|
*
|
|
* However, if an error occurs at any point, we do not set mReturnDefaultIcon to
|
|
* false, so we will open up another channel to get the default favicon, and
|
|
* pass that along to our output stream in HandleCompletion. If anything
|
|
* happens at that point, the world must be against us, so we return nothing.
|
|
*/
|
|
class faviconAsyncLoader : public AsyncStatementCallback
|
|
, public nsIRequestObserver
|
|
{
|
|
public:
|
|
NS_DECL_ISUPPORTS_INHERITED
|
|
|
|
faviconAsyncLoader(nsIChannel *aChannel, nsIOutputStream *aOutputStream) :
|
|
mChannel(aChannel)
|
|
, mOutputStream(aOutputStream)
|
|
, mReturnDefaultIcon(true)
|
|
{
|
|
NS_ASSERTION(aChannel,
|
|
"Not providing a channel will result in crashes!");
|
|
NS_ASSERTION(aOutputStream,
|
|
"Not providing an output stream will result in crashes!");
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//// mozIStorageStatementCallback
|
|
|
|
NS_IMETHOD HandleResult(mozIStorageResultSet *aResultSet) override
|
|
{
|
|
// We will only get one row back in total, so we do not need to loop.
|
|
nsCOMPtr<mozIStorageRow> row;
|
|
nsresult rv = aResultSet->GetNextRow(getter_AddRefs(row));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// We do not allow favicons without a MIME type, so we'll return the default
|
|
// icon.
|
|
nsAutoCString mimeType;
|
|
(void)row->GetUTF8String(1, mimeType);
|
|
NS_ENSURE_FALSE(mimeType.IsEmpty(), NS_OK);
|
|
|
|
// Set our mimeType now that we know it.
|
|
rv = mChannel->SetContentType(mimeType);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// Obtain the binary blob that contains our favicon data.
|
|
uint8_t *favicon;
|
|
uint32_t size = 0;
|
|
rv = row->GetBlob(0, &size, &favicon);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
uint32_t totalWritten = 0;
|
|
do {
|
|
uint32_t bytesWritten;
|
|
rv = mOutputStream->Write(
|
|
&(reinterpret_cast<const char *>(favicon)[totalWritten]),
|
|
size - totalWritten,
|
|
&bytesWritten
|
|
);
|
|
if (NS_FAILED(rv) || !bytesWritten)
|
|
break;
|
|
totalWritten += bytesWritten;
|
|
} while (size != totalWritten);
|
|
NS_ASSERTION(NS_FAILED(rv) || size == totalWritten,
|
|
"Failed to write all of our data out to the stream!");
|
|
|
|
// Free our favicon array.
|
|
NS_Free(favicon);
|
|
|
|
// Handle an error to write if it occurred, but only after we've freed our
|
|
// favicon.
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// At this point, we should have written out all of our data to our stream.
|
|
// HandleCompletion will close the output stream, so we are done here.
|
|
mReturnDefaultIcon = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHOD HandleCompletion(uint16_t aReason) override
|
|
{
|
|
if (!mReturnDefaultIcon)
|
|
return mOutputStream->Close();
|
|
|
|
// We need to return our default icon, so we'll open up a new channel to get
|
|
// that data, and push it to our output stream. If at any point we get an
|
|
// error, we can't do anything, so we'll just close our output stream.
|
|
nsCOMPtr<nsIStreamListener> listener;
|
|
nsresult rv = NS_NewSimpleStreamListener(getter_AddRefs(listener),
|
|
mOutputStream, this);
|
|
NS_ENSURE_SUCCESS(rv, mOutputStream->Close());
|
|
|
|
nsCOMPtr<nsIChannel> newChannel;
|
|
rv = GetDefaultIcon(getter_AddRefs(newChannel));
|
|
NS_ENSURE_SUCCESS(rv, mOutputStream->Close());
|
|
|
|
rv = newChannel->AsyncOpen(listener, nullptr);
|
|
NS_ENSURE_SUCCESS(rv, mOutputStream->Close());
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
//// nsIRequestObserver
|
|
|
|
NS_IMETHOD OnStartRequest(nsIRequest *, nsISupports *) override
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHOD OnStopRequest(nsIRequest *, nsISupports *, nsresult aStatusCode) override
|
|
{
|
|
// We always need to close our output stream, regardless of the status code.
|
|
(void)mOutputStream->Close();
|
|
|
|
// But, we'll warn about it not being successful if it wasn't.
|
|
NS_WARN_IF_FALSE(NS_SUCCEEDED(aStatusCode),
|
|
"Got an error when trying to load our default favicon!");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
protected:
|
|
virtual ~faviconAsyncLoader() {}
|
|
|
|
private:
|
|
nsCOMPtr<nsIChannel> mChannel;
|
|
nsCOMPtr<nsIOutputStream> mOutputStream;
|
|
bool mReturnDefaultIcon;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED(
|
|
faviconAsyncLoader,
|
|
AsyncStatementCallback,
|
|
nsIRequestObserver
|
|
)
|
|
|
|
} // namespace
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
//// nsAnnoProtocolHandler
|
|
|
|
NS_IMPL_ISUPPORTS(nsAnnoProtocolHandler, nsIProtocolHandler)
|
|
|
|
// nsAnnoProtocolHandler::GetScheme
|
|
|
|
NS_IMETHODIMP
|
|
nsAnnoProtocolHandler::GetScheme(nsACString& aScheme)
|
|
{
|
|
aScheme.AssignLiteral("moz-anno");
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
// nsAnnoProtocolHandler::GetDefaultPort
|
|
//
|
|
// There is no default port for annotation URLs
|
|
|
|
NS_IMETHODIMP
|
|
nsAnnoProtocolHandler::GetDefaultPort(int32_t *aDefaultPort)
|
|
{
|
|
*aDefaultPort = -1;
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
// nsAnnoProtocolHandler::GetProtocolFlags
|
|
|
|
NS_IMETHODIMP
|
|
nsAnnoProtocolHandler::GetProtocolFlags(uint32_t *aProtocolFlags)
|
|
{
|
|
*aProtocolFlags = (URI_NORELATIVE | URI_NOAUTH | URI_DANGEROUS_TO_LOAD |
|
|
URI_IS_LOCAL_RESOURCE);
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
// nsAnnoProtocolHandler::NewURI
|
|
|
|
NS_IMETHODIMP
|
|
nsAnnoProtocolHandler::NewURI(const nsACString& aSpec,
|
|
const char *aOriginCharset,
|
|
nsIURI *aBaseURI, nsIURI **_retval)
|
|
{
|
|
nsCOMPtr <nsIURI> uri = do_CreateInstance(NS_SIMPLEURI_CONTRACTID);
|
|
if (!uri)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
nsresult rv = uri->SetSpec(aSpec);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
*_retval = nullptr;
|
|
uri.swap(*_retval);
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
// nsAnnoProtocolHandler::NewChannel
|
|
//
|
|
|
|
NS_IMETHODIMP
|
|
nsAnnoProtocolHandler::NewChannel2(nsIURI* aURI,
|
|
nsILoadInfo* aLoadInfo,
|
|
nsIChannel** _retval)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aURI);
|
|
|
|
// annotation info
|
|
nsCOMPtr<nsIURI> annoURI;
|
|
nsAutoCString annoName;
|
|
nsresult rv = ParseAnnoURI(aURI, getter_AddRefs(annoURI), annoName);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// Only favicon annotation are supported.
|
|
if (!annoName.EqualsLiteral(FAVICON_ANNOTATION_NAME))
|
|
return NS_ERROR_INVALID_ARG;
|
|
|
|
return NewFaviconChannel(aURI, annoURI, aLoadInfo, _retval);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsAnnoProtocolHandler::NewChannel(nsIURI *aURI, nsIChannel **_retval)
|
|
{
|
|
return NewChannel2(aURI, nullptr, _retval);
|
|
}
|
|
|
|
|
|
// nsAnnoProtocolHandler::AllowPort
|
|
//
|
|
// Don't override any bans on bad ports.
|
|
|
|
NS_IMETHODIMP
|
|
nsAnnoProtocolHandler::AllowPort(int32_t port, const char *scheme,
|
|
bool *_retval)
|
|
{
|
|
*_retval = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
// nsAnnoProtocolHandler::ParseAnnoURI
|
|
//
|
|
// Splits an annotation URL into its URI and name parts
|
|
|
|
nsresult
|
|
nsAnnoProtocolHandler::ParseAnnoURI(nsIURI* aURI,
|
|
nsIURI** aResultURI, nsCString& aName)
|
|
{
|
|
nsresult rv;
|
|
nsAutoCString path;
|
|
rv = aURI->GetPath(path);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
int32_t firstColon = path.FindChar(':');
|
|
if (firstColon <= 0)
|
|
return NS_ERROR_MALFORMED_URI;
|
|
|
|
rv = NS_NewURI(aResultURI, Substring(path, firstColon + 1));
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
aName = Substring(path, 0, firstColon);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsAnnoProtocolHandler::NewFaviconChannel(nsIURI *aURI, nsIURI *aAnnotationURI,
|
|
nsILoadInfo* aLoadInfo, nsIChannel **_channel)
|
|
{
|
|
// Create our pipe. This will give us our input stream and output stream
|
|
// that will be written to when we get data from the database.
|
|
nsCOMPtr<nsIInputStream> inputStream;
|
|
nsCOMPtr<nsIOutputStream> outputStream;
|
|
nsresult rv = NS_NewPipe(getter_AddRefs(inputStream),
|
|
getter_AddRefs(outputStream),
|
|
MAX_FAVICON_SIZE, MAX_FAVICON_SIZE, true,
|
|
true);
|
|
NS_ENSURE_SUCCESS(rv, GetDefaultIcon(_channel));
|
|
|
|
// Create our channel. We'll call SetContentType with the right type when
|
|
// we know what it actually is.
|
|
nsCOMPtr<nsIChannel> channel;
|
|
rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
|
|
aURI,
|
|
inputStream,
|
|
EmptyCString(), // aContentType
|
|
EmptyCString(), // aContentCharset
|
|
aLoadInfo);
|
|
NS_ENSURE_SUCCESS(rv, GetDefaultIcon(_channel));
|
|
|
|
// Now we go ahead and get our data asynchronously for the favicon.
|
|
nsCOMPtr<mozIStorageStatementCallback> callback =
|
|
new faviconAsyncLoader(channel, outputStream);
|
|
NS_ENSURE_TRUE(callback, GetDefaultIcon(_channel));
|
|
nsFaviconService* faviconService = nsFaviconService::GetFaviconService();
|
|
NS_ENSURE_TRUE(faviconService, GetDefaultIcon(_channel));
|
|
|
|
rv = faviconService->GetFaviconDataAsync(aAnnotationURI, callback);
|
|
NS_ENSURE_SUCCESS(rv, GetDefaultIcon(_channel));
|
|
|
|
channel.forget(_channel);
|
|
return NS_OK;
|
|
}
|