mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
Bug 879137, Part 2: Remove unnecessary manual registration of PSM content listeners, r=keeler
--HG-- extra : rebase_source : cf0a8e3de83d707097341cf5068ecda04f4c15ac extra : histedit_source : db7f47114779e5ef76de484cc79e458eb2663348
This commit is contained in:
Brian Smith
parent
83b30629cc
commit
d53a688315
303
security/manager/ssl/src/PSMContentDownloader.h
Normal file
303
security/manager/ssl/src/PSMContentDownloader.h
Normal file
@ -0,0 +1,303 @@
|
||||
/* -*- Mode: C++; tab-width: 2; 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/. */
|
||||
|
||||
#ifndef _nsNSSComponent_h_
|
||||
#define _nsNSSComponent_h_
|
||||
|
||||
#include "mozilla/Mutex.h"
|
||||
#include "mozilla/RefPtr.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsISignatureVerifier.h"
|
||||
#include "nsIURIContentListener.h"
|
||||
#include "nsIStreamListener.h"
|
||||
#include "nsIEntropyCollector.h"
|
||||
#include "nsIStringBundle.h"
|
||||
#include "nsIPrefBranch.h"
|
||||
#include "nsIObserver.h"
|
||||
#include "nsIObserverService.h"
|
||||
#include "nsWeakReference.h"
|
||||
#ifndef MOZ_DISABLE_CRYPTOLEGACY
|
||||
#include "nsIDOMEventTarget.h"
|
||||
#endif
|
||||
#include "nsINSSErrorsService.h"
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsNSSCallbacks.h"
|
||||
#include "ScopedNSSTypes.h"
|
||||
#include "nsNSSHelper.h"
|
||||
#include "nsClientAuthRemember.h"
|
||||
#include "prerror.h"
|
||||
|
||||
class nsIPrompt;
|
||||
class SmartCardThreadList;
|
||||
|
||||
namespace mozilla { namespace psm {
|
||||
|
||||
class CertVerifier;
|
||||
|
||||
} } // namespace mozilla::psm
|
||||
|
||||
|
||||
#define NS_NSSCOMPONENT_CID \
|
||||
{0xa277189c, 0x1dd1, 0x11b2, {0xa8, 0xc9, 0xe4, 0xe8, 0xbf, 0xb1, 0x33, 0x8e}}
|
||||
|
||||
#define PSM_COMPONENT_CONTRACTID "@mozilla.org/psm;1"
|
||||
|
||||
//Define an interface that we can use to look up from the
|
||||
//callbacks passed to NSS.
|
||||
|
||||
#define NS_INSSCOMPONENT_IID_STR "6ffbb526-205b-49c5-ae3f-5959c084075e"
|
||||
#define NS_INSSCOMPONENT_IID \
|
||||
{ 0x6ffbb526, 0x205b, 0x49c5, \
|
||||
{ 0xae, 0x3f, 0x59, 0x59, 0xc0, 0x84, 0x7, 0x5e } }
|
||||
|
||||
#define NS_PSMCONTENTLISTEN_CID {0xc94f4a30, 0x64d7, 0x11d4, {0x99, 0x60, 0x00, 0xb0, 0xd0, 0x23, 0x54, 0xa0}}
|
||||
#define NS_PSMCONTENTLISTEN_CONTRACTID "@mozilla.org/security/psmdownload;1"
|
||||
|
||||
enum EnsureNSSOperator
|
||||
{
|
||||
nssLoadingComponent = 0,
|
||||
nssInitSucceeded = 1,
|
||||
nssInitFailed = 2,
|
||||
nssShutdown = 3,
|
||||
nssEnsure = 100,
|
||||
nssEnsureOnChromeOnly = 101
|
||||
};
|
||||
|
||||
extern bool EnsureNSSInitialized(EnsureNSSOperator op);
|
||||
|
||||
//--------------------------------------------
|
||||
// Now we need a content listener to register
|
||||
//--------------------------------------------
|
||||
class PSMContentDownloader : public nsIStreamListener
|
||||
{
|
||||
public:
|
||||
PSMContentDownloader() {NS_ASSERTION(false, "don't use this constructor."); }
|
||||
PSMContentDownloader(uint32_t type);
|
||||
virtual ~PSMContentDownloader();
|
||||
void setSilentDownload(bool flag);
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIREQUESTOBSERVER
|
||||
NS_DECL_NSISTREAMLISTENER
|
||||
|
||||
enum {UNKNOWN_TYPE = 0};
|
||||
enum {X509_CA_CERT = 1};
|
||||
enum {X509_USER_CERT = 2};
|
||||
enum {X509_EMAIL_CERT = 3};
|
||||
enum {X509_SERVER_CERT = 4};
|
||||
|
||||
protected:
|
||||
char* mByteData;
|
||||
int32_t mBufferOffset;
|
||||
int32_t mBufferSize;
|
||||
uint32_t mType;
|
||||
nsCOMPtr<nsIURI> mURI;
|
||||
};
|
||||
|
||||
class nsNSSComponent;
|
||||
|
||||
class NS_NO_VTABLE nsINSSComponent : public nsISupports {
|
||||
public:
|
||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_INSSCOMPONENT_IID)
|
||||
|
||||
NS_IMETHOD ShowAlertFromStringBundle(const char * messageID) = 0;
|
||||
|
||||
NS_IMETHOD GetPIPNSSBundleString(const char *name,
|
||||
nsAString &outString) = 0;
|
||||
NS_IMETHOD PIPBundleFormatStringFromName(const char *name,
|
||||
const PRUnichar **params,
|
||||
uint32_t numParams,
|
||||
nsAString &outString) = 0;
|
||||
|
||||
NS_IMETHOD GetNSSBundleString(const char *name,
|
||||
nsAString &outString) = 0;
|
||||
NS_IMETHOD NSSBundleFormatStringFromName(const char *name,
|
||||
const PRUnichar **params,
|
||||
uint32_t numParams,
|
||||
nsAString &outString) = 0;
|
||||
|
||||
// This method will just disable OCSP in NSS, it will not
|
||||
// alter the respective pref values.
|
||||
NS_IMETHOD SkipOcsp() = 0;
|
||||
|
||||
// This method will set the OCSP value according to the
|
||||
// values in the preferences.
|
||||
NS_IMETHOD SkipOcspOff() = 0;
|
||||
|
||||
NS_IMETHOD LogoutAuthenticatedPK11() = 0;
|
||||
|
||||
#ifndef MOZ_DISABLE_CRYPTOLEGACY
|
||||
NS_IMETHOD LaunchSmartCardThread(SECMODModule *module) = 0;
|
||||
|
||||
NS_IMETHOD ShutdownSmartCardThread(SECMODModule *module) = 0;
|
||||
|
||||
NS_IMETHOD PostEvent(const nsAString &eventType, const nsAString &token) = 0;
|
||||
|
||||
NS_IMETHOD DispatchEvent(const nsAString &eventType, const nsAString &token) = 0;
|
||||
#endif
|
||||
|
||||
#ifndef NSS_NO_LIBPKIX
|
||||
NS_IMETHOD EnsureIdentityInfoLoaded() = 0;
|
||||
#endif
|
||||
|
||||
NS_IMETHOD IsNSSInitialized(bool *initialized) = 0;
|
||||
|
||||
NS_IMETHOD GetDefaultCertVerifier(
|
||||
mozilla::RefPtr<mozilla::psm::CertVerifier> &out) = 0;
|
||||
};
|
||||
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(nsINSSComponent, NS_INSSCOMPONENT_IID)
|
||||
|
||||
class nsNSSShutDownList;
|
||||
class nsCertVerificationThread;
|
||||
|
||||
// Implementation of the PSM component interface.
|
||||
class nsNSSComponent : public nsISignatureVerifier,
|
||||
public nsIEntropyCollector,
|
||||
public nsINSSComponent,
|
||||
public nsIObserver,
|
||||
public nsSupportsWeakReference
|
||||
{
|
||||
typedef mozilla::Mutex Mutex;
|
||||
|
||||
public:
|
||||
NS_DEFINE_STATIC_CID_ACCESSOR( NS_NSSCOMPONENT_CID )
|
||||
|
||||
nsNSSComponent();
|
||||
virtual ~nsNSSComponent();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSISIGNATUREVERIFIER
|
||||
NS_DECL_NSIENTROPYCOLLECTOR
|
||||
NS_DECL_NSIOBSERVER
|
||||
|
||||
NS_METHOD Init();
|
||||
|
||||
static nsresult GetNewPrompter(nsIPrompt ** result);
|
||||
static nsresult ShowAlertWithConstructedString(const nsString & message);
|
||||
NS_IMETHOD ShowAlertFromStringBundle(const char * messageID);
|
||||
|
||||
NS_IMETHOD GetPIPNSSBundleString(const char *name,
|
||||
nsAString &outString);
|
||||
NS_IMETHOD PIPBundleFormatStringFromName(const char *name,
|
||||
const PRUnichar **params,
|
||||
uint32_t numParams,
|
||||
nsAString &outString);
|
||||
NS_IMETHOD GetNSSBundleString(const char *name,
|
||||
nsAString &outString);
|
||||
NS_IMETHOD NSSBundleFormatStringFromName(const char *name,
|
||||
const PRUnichar **params,
|
||||
uint32_t numParams,
|
||||
nsAString &outString);
|
||||
NS_IMETHOD SkipOcsp();
|
||||
NS_IMETHOD SkipOcspOff();
|
||||
NS_IMETHOD LogoutAuthenticatedPK11();
|
||||
|
||||
#ifndef MOZ_DISABLE_CRYPTOLEGACY
|
||||
NS_IMETHOD LaunchSmartCardThread(SECMODModule *module);
|
||||
NS_IMETHOD ShutdownSmartCardThread(SECMODModule *module);
|
||||
NS_IMETHOD PostEvent(const nsAString &eventType, const nsAString &token);
|
||||
NS_IMETHOD DispatchEvent(const nsAString &eventType, const nsAString &token);
|
||||
void LaunchSmartCardThreads();
|
||||
void ShutdownSmartCardThreads();
|
||||
nsresult DispatchEventToWindow(nsIDOMWindow *domWin, const nsAString &eventType, const nsAString &token);
|
||||
#endif
|
||||
|
||||
#ifndef NSS_NO_LIBPKIX
|
||||
NS_IMETHOD EnsureIdentityInfoLoaded();
|
||||
#endif
|
||||
NS_IMETHOD IsNSSInitialized(bool *initialized);
|
||||
|
||||
NS_IMETHOD GetDefaultCertVerifier(
|
||||
mozilla::RefPtr<mozilla::psm::CertVerifier> &out);
|
||||
private:
|
||||
|
||||
nsresult InitializeNSS(bool showWarningBox);
|
||||
void ShutdownNSS();
|
||||
|
||||
void InstallLoadableRoots();
|
||||
void UnloadLoadableRoots();
|
||||
void CleanupIdentityInfo();
|
||||
void setValidationOptions(nsIPrefBranch * pref);
|
||||
nsresult setEnabledTLSVersions(nsIPrefBranch * pref);
|
||||
nsresult InitializePIPNSSBundle();
|
||||
nsresult ConfigureInternalPKCS11Token();
|
||||
nsresult RegisterPSMContentListener();
|
||||
nsresult RegisterObservers();
|
||||
nsresult DeregisterObservers();
|
||||
|
||||
// Methods that we use to handle the profile change notifications (and to
|
||||
// synthesize a full profile change when we're just doing a profile startup):
|
||||
void DoProfileChangeNetTeardown();
|
||||
void DoProfileChangeTeardown(nsISupports* aSubject);
|
||||
void DoProfileBeforeChange(nsISupports* aSubject);
|
||||
void DoProfileChangeNetRestore();
|
||||
|
||||
Mutex mutex;
|
||||
|
||||
nsCOMPtr<nsIStringBundle> mPIPNSSBundle;
|
||||
nsCOMPtr<nsIStringBundle> mNSSErrorsBundle;
|
||||
nsCOMPtr<nsIURIContentListener> mPSMContentListener;
|
||||
nsCOMPtr<nsIPrefBranch> mPrefBranch;
|
||||
bool mNSSInitialized;
|
||||
bool mObserversRegistered;
|
||||
static int mInstanceCount;
|
||||
nsNSSShutDownList *mShutdownObjectList;
|
||||
#ifndef MOZ_DISABLE_CRYPTOLEGACY
|
||||
SmartCardThreadList *mThreadList;
|
||||
#endif
|
||||
bool mIsNetworkDown;
|
||||
|
||||
void deleteBackgroundThreads();
|
||||
void createBackgroundThreads();
|
||||
nsCertVerificationThread *mCertVerificationThread;
|
||||
|
||||
nsNSSHttpInterface mHttpForNSS;
|
||||
mozilla::RefPtr<mozilla::psm::CertVerifier> mDefaultCertVerifier;
|
||||
|
||||
|
||||
static PRStatus IdentityInfoInit(void);
|
||||
PRCallOnceType mIdentityInfoCallOnce;
|
||||
|
||||
public:
|
||||
static bool globalConstFlagUsePKIXVerification;
|
||||
};
|
||||
|
||||
class PSMContentListener : public nsIURIContentListener,
|
||||
public nsSupportsWeakReference {
|
||||
public:
|
||||
PSMContentListener();
|
||||
virtual ~PSMContentListener();
|
||||
nsresult init();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIURICONTENTLISTENER
|
||||
private:
|
||||
nsCOMPtr<nsISupports> mLoadCookie;
|
||||
nsCOMPtr<nsIURIContentListener> mParentContentListener;
|
||||
};
|
||||
|
||||
class nsNSSErrors
|
||||
{
|
||||
public:
|
||||
static const char *getDefaultErrorStringName(PRErrorCode err);
|
||||
static const char *getOverrideErrorStringName(PRErrorCode aErrorCode);
|
||||
static nsresult getErrorMessageFromCode(PRErrorCode err,
|
||||
nsINSSComponent *component,
|
||||
nsString &returnedMessage);
|
||||
};
|
||||
|
||||
class nsPSMInitPanic
|
||||
{
|
||||
private:
|
||||
static bool isPanic;
|
||||
public:
|
||||
static void SetPanic() {isPanic = true;}
|
||||
static bool GetPanic() {return isPanic;}
|
||||
};
|
||||
|
||||
#endif // _nsNSSComponent_h_
|
||||
|
||||
@ -819,22 +819,6 @@ nsNSSComponent::InitializePIPNSSBundle()
|
||||
return rv;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsNSSComponent::RegisterPSMContentListener()
|
||||
{
|
||||
// Called during init only, no mutex required.
|
||||
|
||||
nsresult rv = NS_OK;
|
||||
if (!mPSMContentListener) {
|
||||
nsCOMPtr<nsIURILoader> dispatcher(do_GetService(NS_URI_LOADER_CONTRACTID));
|
||||
if (dispatcher) {
|
||||
mPSMContentListener = do_CreateInstance(NS_PSMCONTENTLISTEN_CONTRACTID);
|
||||
rv = dispatcher->RegisterContentListener(mPSMContentListener);
|
||||
}
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* Table of pref names and SSL cipher ID */
|
||||
typedef struct {
|
||||
const char* pref;
|
||||
@ -1396,8 +1380,6 @@ nsNSSComponent::Init()
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
RegisterPSMContentListener();
|
||||
|
||||
nsCOMPtr<nsIEntropyCollector> ec
|
||||
= do_GetService(NS_ENTROPYCOLLECTOR_CONTRACTID);
|
||||
|
||||
@ -1627,14 +1609,6 @@ nsNSSComponent::Observe(nsISupports *aSubject, const char *aTopic,
|
||||
|
||||
// Cleanup code that requires services, it's too late in destructor.
|
||||
|
||||
if (mPSMContentListener) {
|
||||
nsCOMPtr<nsIURILoader> dispatcher(do_GetService(NS_URI_LOADER_CONTRACTID));
|
||||
if (dispatcher) {
|
||||
dispatcher->UnRegisterContentListener(mPSMContentListener);
|
||||
}
|
||||
mPSMContentListener = nullptr;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIEntropyCollector> ec
|
||||
= do_GetService(NS_ENTROPYCOLLECTOR_CONTRACTID);
|
||||
|
||||
@ -2125,7 +2099,7 @@ PSMContentDownloader::OnStopRequest(nsIRequest* request,
|
||||
uint32_t
|
||||
getPSMContentType(const char * aContentType)
|
||||
{
|
||||
// Don't forget to update RegisterPSMContentListeners in nsNSSModule.cpp
|
||||
// Don't forget to update the registration of content listeners in nsNSSModule.cpp
|
||||
// for every supported content type.
|
||||
|
||||
if (!nsCRT::strcasecmp(aContentType, "application/x-x509-ca-cert"))
|
||||
|
||||
@ -225,7 +225,6 @@ private:
|
||||
nsresult setEnabledTLSVersions(nsIPrefBranch * pref);
|
||||
nsresult InitializePIPNSSBundle();
|
||||
nsresult ConfigureInternalPKCS11Token();
|
||||
nsresult RegisterPSMContentListener();
|
||||
nsresult RegisterObservers();
|
||||
nsresult DeregisterObservers();
|
||||
|
||||
@ -240,7 +239,6 @@ private:
|
||||
|
||||
nsCOMPtr<nsIStringBundle> mPIPNSSBundle;
|
||||
nsCOMPtr<nsIStringBundle> mNSSErrorsBundle;
|
||||
nsCOMPtr<nsIURIContentListener> mPSMContentListener;
|
||||
nsCOMPtr<nsIPrefBranch> mPrefBranch;
|
||||
bool mNSSInitialized;
|
||||
bool mObserversRegistered;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user