Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 11:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean up p3p a little, by making it not observe nsIHttpNotify notifications. cookies pushes a channel to the p3pservice, so there's no point wasting cycles doing the same work twice.

Browse Source 
b=210491, r=harishd, sr=darin.
This commit is contained in:
dwitte%stanford.edu 2003-07-02 07:30:50 +00:00
parent fbca1ac9e1
commit fcdbfdbca9
3 changed files with 9 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/p3p/src/nsP3PModule.cpp
View File

@ -38,14 +38,13 @@
#include "nsICategoryManager.h"
#include "nsIComponentManager.h"
#include "nsIGenericFactory.h"
#include "nsIHttpProtocolHandler.h"
#include "nsIServiceManager.h"
#include "nsP3PCIID.h"
#include "nsP3PService.h"
#include "nsCompactPolicy.h"
#include "nsPolicyReference.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsP3PService,Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsP3PService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsPolicyReference)
static nsModuleComponentInfo gP3PComponents[] =
@ -75,4 +74,3 @@ Shutdown(nsIModule* aSelf)
}
NS_IMPL_NSGETMODULE_WITH_CTOR_DTOR(nsP3PModule, gP3PComponents,Initialize,Shutdown)

121
extensions/p3p/src/nsP3PService.cpp
View File

@ -36,65 +36,21 @@
* ***** END LICENSE BLOCK ***** */
#include "nsP3PService.h"
#include "nsCompactPolicy.h"
#include "nsIHttpChannel.h"
#include "nsINetModuleMgr.h"
#include "nsIServiceManager.h"
#include "nsIURI.h"
#include "nsString.h"
#include "nsCRT.h"
#include "nsIPrefService.h"
#include "nsIPrefBranchInternal.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#define NS_P3P_ENABLED 3
static NS_DEFINE_CID(kINetModuleMgrCID, NS_NETMODULEMGR_CID);
static nsresult
StartListeningToHeaders(nsP3PService* aService)
{
nsresult result = NS_OK;
nsCOMPtr<nsINetModuleMgr> netModuleMgr(do_GetService(kINetModuleMgrCID));
if (netModuleMgr) {
result = netModuleMgr->RegisterModule(NS_NETWORK_MODULE_MANAGER_HTTP_RESPONSE_CONTRACTID,
aService);
}
return result;
}
static nsresult
StopListeningToHeaders(nsP3PService* aService)
{
nsresult result = NS_OK;
nsCOMPtr<nsINetModuleMgr> netModuleMgr(do_GetService(kINetModuleMgrCID));
if (netModuleMgr) {
result = netModuleMgr->UnregisterModule(NS_NETWORK_MODULE_MANAGER_HTTP_RESPONSE_CONTRACTID,
aService);
}
return result;
}
#include "nsCOMPtr.h"
/***********************************
* nsP3PService Implementation *
***********************************/
NS_IMPL_ISUPPORTS4(nsP3PService,
nsICookieConsent,
nsIHttpNotify,
nsINetNotify,
nsIObserver);
NS_IMPL_ISUPPORTS1(nsP3PService, nsICookieConsent)
nsP3PService::nsP3PService()
: mCompactPolicy(nsnull)
{
NS_INIT_ISUPPORTS( );
}
nsP3PService::~nsP3PService()
@ -102,34 +58,9 @@ nsP3PService::~nsP3PService()
delete mCompactPolicy;
}
nsresult
nsP3PService::Init()
{
// Register perf.
nsresult result = NS_OK;
nsCOMPtr<nsIPrefService> prefService(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefService) {
nsCOMPtr<nsIPrefBranchInternal> prefInternal(do_QueryInterface(prefService));
if (prefInternal) {
prefInternal->AddObserver("network.cookie.cookieBehavior", this, PR_FALSE);
}
nsCOMPtr<nsIPrefBranch> prefBranch;
prefService->GetBranch(0,getter_AddRefs(prefBranch));
result = PrefChanged(prefBranch,"network.cookie.cookieBehavior");
}
return result;
}
nsresult
nsP3PService::ProcessResponseHeader(nsIHttpChannel* aHttpChannel)
{
NS_ENSURE_ARG_POINTER(aHttpChannel);
nsresult result = NS_OK;
nsCAutoString p3pHeader;
@ -155,48 +86,6 @@ nsP3PService::ProcessResponseHeader(nsIHttpChannel* aHttpChannel)
return result;
}
nsresult
nsP3PService::PrefChanged(nsIPrefBranch *aPrefBranch,
const char *aPrefValue)
{
NS_ASSERTION(aPrefBranch,"pref not available");
nsresult result = NS_OK;
if (aPrefBranch) {
PRInt32 val;
aPrefBranch->GetIntPref(aPrefValue, &val);
result = (val == NS_P3P_ENABLED)? StartListeningToHeaders(this):
StopListeningToHeaders(this);
}
return result;
}
NS_IMETHODIMP
nsP3PService::Observe(nsISupports* aSubject,
const char * aTopic,
const PRUnichar *aData)
{
nsresult result = NS_OK;
nsCOMPtr<nsIPrefBranch> prefBranch(do_QueryInterface(aSubject));
if (prefBranch) {
result = PrefChanged(prefBranch,NS_ConvertUCS2toUTF8(aData).get());
}
return result;
}
NS_IMETHODIMP
nsP3PService::OnExamineResponse(nsIHttpChannel* aHttpChannel)
{
return ProcessResponseHeader(aHttpChannel);
}
NS_IMETHODIMP
nsP3PService::OnModifyRequest(nsIHttpChannel* aHttpChannel)
{
return NS_OK;
}
NS_IMETHODIMP
nsP3PService::GetConsent(const char* aURI,
nsIHttpChannel* aHttpChannel,
@ -211,11 +100,11 @@ nsP3PService::GetConsent(const char* aURI,
aHttpChannel->GetURI(getter_AddRefs(uri));
if (uri) {
nsXPIDLCString spec;
nsCAutoString spec;
uri->GetSpec(spec);
if (aURI) {
NS_ASSERTION(nsCRT::strcmp(aURI,spec) == 0,"URIs don't match");
NS_ASSERTION(spec.Equals(aURI), "URIs don't match");
}
}
#endif

17
extensions/p3p/src/nsP3PService.h
View File

@ -39,34 +39,23 @@
#define NS_P3PSERVICE_H__
#include "nsICookieConsent.h"
#include "nsIHttpNotify.h"
#include "nsCompactPolicy.h"
#include "nsIObserver.h"
class nsIPrefBranch;
class nsCompactPolicy;
class nsIHttpChannel;
class nsP3PService : public nsICookieConsent,
public nsIHttpNotify,
public nsIObserver
class nsP3PService : public nsICookieConsent
{
public:
// nsISupports
NS_DECL_ISUPPORTS
// nsICookieConsent
NS_DECL_NSICOOKIECONSENT
// nsIHttpNotify
NS_DECL_NSIHTTPNOTIFY
// nsIObserver
NS_DECL_NSIOBSERVER
nsP3PService( );
virtual ~nsP3PService( );
// P3PService
nsresult Init();
protected:
nsresult ProcessResponseHeader(nsIHttpChannel* aHttpChannel);
nsresult PrefChanged(nsIPrefBranch *aPrefBranch, const char *aPrefValue);
nsCompactPolicy* mCompactPolicy;
};