mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
fdaefb68d6
These scriptable interfaces use uint_64 arguments with sentinel values of UINT64_MAX. However, UINT64_MAX exceeds MAX_SAFE_INTEGER and cannot be gatewayed to/from javascript - so they cannot be used correctly. Change them to use signed 64 bit numbers and -1 as the sentinnel. C++ implementations ought to be enough to audit as the special value could never be used correctly in JS anyhow - also audited OnProgressChange() uses for downstream use of this data. --- dom/base/nsXMLHttpRequest.cpp | 19 +++++++---- dom/base/nsXMLHttpRequest.h | 10 +++--- dom/plugins/base/nsPluginStreamListenerPeer.cpp | 4 +-- .../webbrowserpersist/nsWebBrowserPersist.cpp | 14 ++++---- image/src/imgLoader.cpp | 4 +-- modules/libjar/nsJARChannel.cpp | 3 +- netwerk/base/public/nsIProgressEventSink.idl | 8 ++--- netwerk/base/public/nsITransport.idl | 8 ++--- netwerk/base/public/nsNetUtil.h | 24 ++++++++++++++ netwerk/base/src/Dashboard.cpp | 2 +- netwerk/base/src/nsBaseChannel.cpp | 12 +++---- netwerk/base/src/nsIncrementalDownload.cpp | 4 +-- netwerk/base/src/nsSocketTransport2.cpp | 5 +-- netwerk/base/src/nsStreamTransportService.cpp | 38 +++++++++++++--------- netwerk/base/src/nsTransportUtils.cpp | 12 +++---- netwerk/protocol/file/nsFileChannel.cpp | 8 +++-- netwerk/protocol/ftp/nsFtpConnectionThread.cpp | 4 +-- netwerk/protocol/http/Http2Push.cpp | 2 +- netwerk/protocol/http/Http2Session.cpp | 2 +- netwerk/protocol/http/HttpChannelChild.cpp | 31 +++++++++--------- netwerk/protocol/http/HttpChannelChild.h | 6 ++-- netwerk/protocol/http/HttpChannelParent.cpp | 4 +-- netwerk/protocol/http/HttpChannelParent.h | 4 +-- netwerk/protocol/http/NullHttpTransaction.cpp | 2 +- netwerk/protocol/http/PHttpChannel.ipdl | 2 +- netwerk/protocol/http/SpdyPush31.cpp | 2 +- netwerk/protocol/http/SpdySession31.cpp | 2 +- netwerk/protocol/http/TunnelUtils.cpp | 2 +- netwerk/protocol/http/nsAHttpTransaction.h | 4 +-- netwerk/protocol/http/nsHttpChannel.cpp | 30 +++++++++++------ netwerk/protocol/http/nsHttpConnection.cpp | 4 +-- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 4 +-- netwerk/protocol/http/nsHttpPipeline.cpp | 4 +-- netwerk/protocol/http/nsHttpPipeline.h | 6 ++-- netwerk/protocol/http/nsHttpResponseHead.cpp | 2 +- netwerk/protocol/http/nsHttpResponseHead.h | 2 +- netwerk/protocol/http/nsHttpTransaction.cpp | 32 +++++++++--------- netwerk/protocol/http/nsHttpTransaction.h | 2 +- netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp | 2 +- netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp | 3 +- netwerk/test/TestIncrementalDownload.cpp | 7 ++-- uriloader/base/nsDocLoader.cpp | 14 ++++---- 42 files changed, 203 insertions(+), 151 deletions(-)
255 lines
10 KiB
C++
255 lines
10 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set sw=2 ts=8 et 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/. */
|
|
|
|
#ifndef mozilla_net_HttpChannelChild_h
|
|
#define mozilla_net_HttpChannelChild_h
|
|
|
|
#include "mozilla/net/HttpBaseChannel.h"
|
|
#include "mozilla/net/PHttpChannelChild.h"
|
|
#include "mozilla/net/ChannelEventQueue.h"
|
|
|
|
#include "nsIStreamListener.h"
|
|
#include "nsILoadGroup.h"
|
|
#include "nsIInterfaceRequestor.h"
|
|
#include "nsIInterfaceRequestorUtils.h"
|
|
#include "nsIProgressEventSink.h"
|
|
#include "nsICacheInfoChannel.h"
|
|
#include "nsIApplicationCache.h"
|
|
#include "nsIApplicationCacheChannel.h"
|
|
#include "nsIUploadChannel2.h"
|
|
#include "nsIResumableChannel.h"
|
|
#include "nsIProxiedChannel.h"
|
|
#include "nsIAsyncVerifyRedirectCallback.h"
|
|
#include "nsIAssociatedContentSecurity.h"
|
|
#include "nsIChildChannel.h"
|
|
#include "nsIHttpChannelChild.h"
|
|
#include "nsIDivertableChannel.h"
|
|
#include "mozilla/net/DNS.h"
|
|
|
|
class nsInputStreamPump;
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
class InterceptedChannelContent;
|
|
class InterceptStreamListener;
|
|
|
|
class HttpChannelChild MOZ_FINAL : public PHttpChannelChild
|
|
, public HttpBaseChannel
|
|
, public HttpAsyncAborter<HttpChannelChild>
|
|
, public nsICacheInfoChannel
|
|
, public nsIProxiedChannel
|
|
, public nsIApplicationCacheChannel
|
|
, public nsIAsyncVerifyRedirectCallback
|
|
, public nsIAssociatedContentSecurity
|
|
, public nsIChildChannel
|
|
, public nsIHttpChannelChild
|
|
, public nsIDivertableChannel
|
|
{
|
|
virtual ~HttpChannelChild();
|
|
public:
|
|
NS_DECL_ISUPPORTS_INHERITED
|
|
NS_DECL_NSICACHEINFOCHANNEL
|
|
NS_DECL_NSIPROXIEDCHANNEL
|
|
NS_DECL_NSIAPPLICATIONCACHECONTAINER
|
|
NS_DECL_NSIAPPLICATIONCACHECHANNEL
|
|
NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
|
|
NS_DECL_NSIASSOCIATEDCONTENTSECURITY
|
|
NS_DECL_NSICHILDCHANNEL
|
|
NS_DECL_NSIHTTPCHANNELCHILD
|
|
NS_DECL_NSIDIVERTABLECHANNEL
|
|
|
|
HttpChannelChild();
|
|
|
|
// Methods HttpBaseChannel didn't implement for us or that we override.
|
|
//
|
|
// nsIRequest
|
|
NS_IMETHOD Cancel(nsresult status) MOZ_OVERRIDE;
|
|
NS_IMETHOD Suspend() MOZ_OVERRIDE;
|
|
NS_IMETHOD Resume() MOZ_OVERRIDE;
|
|
// nsIChannel
|
|
NS_IMETHOD GetSecurityInfo(nsISupports **aSecurityInfo) MOZ_OVERRIDE;
|
|
NS_IMETHOD AsyncOpen(nsIStreamListener *listener, nsISupports *aContext) MOZ_OVERRIDE;
|
|
// HttpBaseChannel::nsIHttpChannel
|
|
NS_IMETHOD SetRequestHeader(const nsACString& aHeader,
|
|
const nsACString& aValue,
|
|
bool aMerge) MOZ_OVERRIDE;
|
|
NS_IMETHOD RedirectTo(nsIURI *newURI) MOZ_OVERRIDE;
|
|
// nsIHttpChannelInternal
|
|
NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey) MOZ_OVERRIDE;
|
|
NS_IMETHOD GetLocalAddress(nsACString& addr) MOZ_OVERRIDE;
|
|
NS_IMETHOD GetLocalPort(int32_t* port) MOZ_OVERRIDE;
|
|
NS_IMETHOD GetRemoteAddress(nsACString& addr) MOZ_OVERRIDE;
|
|
NS_IMETHOD GetRemotePort(int32_t* port) MOZ_OVERRIDE;
|
|
// nsISupportsPriority
|
|
NS_IMETHOD SetPriority(int32_t value) MOZ_OVERRIDE;
|
|
// nsIClassOfService
|
|
NS_IMETHOD SetClassFlags(uint32_t inFlags) MOZ_OVERRIDE;
|
|
NS_IMETHOD AddClassFlags(uint32_t inFlags) MOZ_OVERRIDE;
|
|
NS_IMETHOD ClearClassFlags(uint32_t inFlags) MOZ_OVERRIDE;
|
|
// nsIResumableChannel
|
|
NS_IMETHOD ResumeAt(uint64_t startPos, const nsACString& entityID) MOZ_OVERRIDE;
|
|
|
|
// IPDL holds a reference while the PHttpChannel protocol is live (starting at
|
|
// AsyncOpen, and ending at either OnStopRequest or any IPDL error, either of
|
|
// which call NeckoChild::DeallocPHttpChannelChild()).
|
|
void AddIPDLReference();
|
|
void ReleaseIPDLReference();
|
|
|
|
bool IsSuspended();
|
|
|
|
bool RecvNotifyTrackingProtectionDisabled() MOZ_OVERRIDE;
|
|
void FlushedForDiversion();
|
|
|
|
protected:
|
|
bool RecvOnStartRequest(const nsresult& channelStatus,
|
|
const nsHttpResponseHead& responseHead,
|
|
const bool& useResponseHead,
|
|
const nsHttpHeaderArray& requestHeaders,
|
|
const bool& isFromCache,
|
|
const bool& cacheEntryAvailable,
|
|
const uint32_t& cacheExpirationTime,
|
|
const nsCString& cachedCharset,
|
|
const nsCString& securityInfoSerialization,
|
|
const NetAddr& selfAddr,
|
|
const NetAddr& peerAddr,
|
|
const int16_t& redirectCount) MOZ_OVERRIDE;
|
|
bool RecvOnTransportAndData(const nsresult& channelStatus,
|
|
const nsresult& status,
|
|
const uint64_t& progress,
|
|
const uint64_t& progressMax,
|
|
const nsCString& data,
|
|
const uint64_t& offset,
|
|
const uint32_t& count) MOZ_OVERRIDE;
|
|
bool RecvOnStopRequest(const nsresult& statusCode, const ResourceTimingStruct& timing) MOZ_OVERRIDE;
|
|
bool RecvOnProgress(const int64_t& progress, const int64_t& progressMax) MOZ_OVERRIDE;
|
|
bool RecvOnStatus(const nsresult& status) MOZ_OVERRIDE;
|
|
bool RecvFailedAsyncOpen(const nsresult& status) MOZ_OVERRIDE;
|
|
bool RecvRedirect1Begin(const uint32_t& newChannel,
|
|
const URIParams& newURI,
|
|
const uint32_t& redirectFlags,
|
|
const nsHttpResponseHead& responseHead) MOZ_OVERRIDE;
|
|
bool RecvRedirect3Complete() MOZ_OVERRIDE;
|
|
bool RecvAssociateApplicationCache(const nsCString& groupID,
|
|
const nsCString& clientID) MOZ_OVERRIDE;
|
|
bool RecvFlushedForDiversion() MOZ_OVERRIDE;
|
|
bool RecvDivertMessages() MOZ_OVERRIDE;
|
|
bool RecvDeleteSelf() MOZ_OVERRIDE;
|
|
|
|
bool GetAssociatedContentSecurity(nsIAssociatedContentSecurity** res = nullptr);
|
|
virtual void DoNotifyListenerCleanup() MOZ_OVERRIDE;
|
|
|
|
private:
|
|
nsresult ContinueAsyncOpen();
|
|
|
|
void DoOnStartRequest(nsIRequest* aRequest, nsISupports* aContext);
|
|
void DoOnStatus(nsIRequest* aRequest, nsresult status);
|
|
void DoOnProgress(nsIRequest* aRequest, int64_t progress, int64_t progressMax);
|
|
void DoOnDataAvailable(nsIRequest* aRequest, nsISupports* aContext, nsIInputStream* aStream,
|
|
uint64_t offset, uint32_t count);
|
|
void DoPreOnStopRequest(nsresult aStatus);
|
|
void DoOnStopRequest(nsIRequest* aRequest, nsISupports* aContext);
|
|
|
|
// Discard the prior interception and continue with the original network request.
|
|
void ResetInterception();
|
|
|
|
// Override this channel's pending response with a synthesized one. The content will be
|
|
// asynchronously read from the pump.
|
|
void OverrideWithSynthesizedResponse(nsHttpResponseHead* aResponseHead, nsInputStreamPump* aPump);
|
|
|
|
RequestHeaderTuples mClientSetRequestHeaders;
|
|
nsCOMPtr<nsIChildChannel> mRedirectChannelChild;
|
|
nsCOMPtr<nsISupports> mSecurityInfo;
|
|
nsRefPtr<InterceptStreamListener> mInterceptListener;
|
|
nsRefPtr<nsInputStreamPump> mSynthesizedResponsePump;
|
|
|
|
bool mIsFromCache;
|
|
bool mCacheEntryAvailable;
|
|
uint32_t mCacheExpirationTime;
|
|
nsCString mCachedCharset;
|
|
|
|
// If ResumeAt is called before AsyncOpen, we need to send extra data upstream
|
|
bool mSendResumeAt;
|
|
|
|
bool mIPCOpen;
|
|
bool mKeptAlive; // IPC kept open, but only for security info
|
|
nsRefPtr<ChannelEventQueue> mEventQ;
|
|
|
|
// Once set, OnData and possibly OnStop will be diverted to the parent.
|
|
bool mDivertingToParent;
|
|
// Once set, no OnStart/OnData/OnStop callbacks should be received from the
|
|
// parent channel, nor dequeued from the ChannelEventQueue.
|
|
bool mFlushedForDiversion;
|
|
// Set if SendSuspend is called. Determines if SendResume is needed when
|
|
// diverting callbacks to parent.
|
|
bool mSuspendSent;
|
|
|
|
// true after successful AsyncOpen until OnStopRequest completes.
|
|
bool RemoteChannelExists() { return mIPCOpen && !mKeptAlive; }
|
|
|
|
void AssociateApplicationCache(const nsCString &groupID,
|
|
const nsCString &clientID);
|
|
void OnStartRequest(const nsresult& channelStatus,
|
|
const nsHttpResponseHead& responseHead,
|
|
const bool& useResponseHead,
|
|
const nsHttpHeaderArray& requestHeaders,
|
|
const bool& isFromCache,
|
|
const bool& cacheEntryAvailable,
|
|
const uint32_t& cacheExpirationTime,
|
|
const nsCString& cachedCharset,
|
|
const nsCString& securityInfoSerialization,
|
|
const NetAddr& selfAddr,
|
|
const NetAddr& peerAddr);
|
|
void OnTransportAndData(const nsresult& channelStatus,
|
|
const nsresult& status,
|
|
const uint64_t progress,
|
|
const uint64_t& progressMax,
|
|
const nsCString& data,
|
|
const uint64_t& offset,
|
|
const uint32_t& count);
|
|
void OnStopRequest(const nsresult& channelStatus, const ResourceTimingStruct& timing);
|
|
void OnProgress(const int64_t& progress, const int64_t& progressMax);
|
|
void OnStatus(const nsresult& status);
|
|
void FailedAsyncOpen(const nsresult& status);
|
|
void HandleAsyncAbort();
|
|
void Redirect1Begin(const uint32_t& newChannelId,
|
|
const URIParams& newUri,
|
|
const uint32_t& redirectFlags,
|
|
const nsHttpResponseHead& responseHead);
|
|
void Redirect3Complete();
|
|
void DeleteSelf();
|
|
|
|
friend class AssociateApplicationCacheEvent;
|
|
friend class StartRequestEvent;
|
|
friend class StopRequestEvent;
|
|
friend class TransportAndDataEvent;
|
|
friend class ProgressEvent;
|
|
friend class StatusEvent;
|
|
friend class FailedAsyncOpenEvent;
|
|
friend class Redirect1Event;
|
|
friend class Redirect3Event;
|
|
friend class DeleteSelfEvent;
|
|
friend class HttpAsyncAborter<HttpChannelChild>;
|
|
friend class InterceptStreamListener;
|
|
friend class InterceptedChannelContent;
|
|
};
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// inline functions
|
|
//-----------------------------------------------------------------------------
|
|
|
|
inline bool
|
|
HttpChannelChild::IsSuspended()
|
|
{
|
|
return mSuspendCount != 0;
|
|
}
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|
|
|
|
#endif // mozilla_net_HttpChannelChild_h
|