mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 660770 caps should use mozilla::Preferences r=roc+jst

This commit is contained in:
Masayuki Nakano 2011-06-20 12:00:16 +09:00
Родитель 53aa754486
Коммит 3546f49e30
3 изменённых файлов: 98 добавлений и 164 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
caps/include/nsScriptSecurityManager.h
Просмотреть файл

@ -50,7 +50,6 @@
#include "nsInterfaceHashtable.h"
#include "nsHashtable.h"
#include "nsCOMPtr.h"
#include "nsIPrefService.h"
#include "nsIChannelEventSink.h"
#include "nsIJSContextStack.h"
#include "nsIObserver.h"
@ -617,24 +616,20 @@ private:
inline void
ScriptSecurityPrefChanged();
static const char sJSEnabledPrefName[];
static const char sFileOriginPolicyPrefName[];
nsObjectHashtable* mOriginToPolicyMap;
DomainPolicy* mDefaultPolicy;
nsObjectHashtable* mCapabilities;
nsCOMPtr<nsIPrefBranch> mPrefBranch;
nsCOMPtr<nsIPrincipal> mSystemPrincipal;
nsCOMPtr<nsIPrincipal> mSystemCertificate;
ContextPrincipal *mContextPrincipals;
nsInterfaceHashtable<PrincipalKey, nsIPrincipal> mPrincipals;
PRPackedBool mPrefInitialized;
PRPackedBool mIsJavaScriptEnabled;
PRPackedBool mIsWritingPrefs;
PRPackedBool mPolicyPrefsChanged;
#ifdef XPC_IDISPATCH_SUPPORT
PRPackedBool mXPCDefaultGrantAll;
static const char sXPCDefaultGrantAllName[];
#endif
static PRBool sStrictFileOriginPolicy;

83
caps/src/nsPrincipal.cpp
Просмотреть файл

@ -53,77 +53,18 @@
#include "nsHashtable.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
#include "nsIPrefBranch2.h"
#include "nsIPrefService.h"
#include "nsIClassInfoImpl.h"
#include "nsDOMError.h"
#include "nsIContentSecurityPolicy.h"
#include "nsPrincipal.h"
class nsCodeBasePrefObserver : nsIObserver
{
public:
nsCodeBasePrefObserver()
{
NS_ASSERTION(!sObserverInstalled, "Shouldn't recreate observer\n");
}
~nsCodeBasePrefObserver()
{
sObserverInstalled = PR_FALSE;
}
#include "mozilla/Preferences.h"
void Init()
{
nsCOMPtr<nsIPrefBranch2> prefBranch =
do_GetService(NS_PREFSERVICE_CONTRACTID);
if (prefBranch) {
if (NS_FAILED(prefBranch->GetBoolPref(PrefName(), &sPrefValue))) {
sPrefValue = PR_FALSE;
}
if (NS_SUCCEEDED(prefBranch->AddObserver(PrefName(), this, PR_FALSE))) {
sObserverInstalled = PR_TRUE;
}
}
}
using namespace mozilla;
NS_DECL_ISUPPORTS
NS_IMETHOD Observe(nsISupports* aSubject,
const char* aTopic,
const PRUnichar* aData)
{
NS_ASSERTION(!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID),
"Wrong topic!");
NS_ASSERTION(!strcmp(NS_ConvertUTF16toUTF8(aData).get(), PrefName()),
"Wrong pref!");
nsCOMPtr<nsIPrefBranch> prefBranch(do_QueryInterface(aSubject));
if (!prefBranch ||
NS_FAILED(prefBranch->GetBoolPref(PrefName(), &sPrefValue))) {
sPrefValue = PR_FALSE;
}
return NS_OK;
}
const char* PrefName()
{
static const char pref[] = "signed.applets.codebase_principal_support";
return pref;
}
static PRBool PrefValue() { return sPrefValue; }
static PRBool Installed() { return sObserverInstalled; }
protected:
static PRBool sPrefValue;
static PRBool sObserverInstalled;
};
PRBool nsCodeBasePrefObserver::sPrefValue = PR_FALSE;
PRBool nsCodeBasePrefObserver::sObserverInstalled = PR_FALSE;
NS_IMPL_ISUPPORTS1(nsCodeBasePrefObserver, nsIObserver)
static PRBool gCodeBasePrincipalSupport = PR_FALSE;
static PRBool gIsObservingCodeBasePrincipalSupport = PR_FALSE;
static PRBool URIIsImmutable(nsIURI* aURI)
{
@ -180,12 +121,14 @@ nsPrincipal::nsPrincipal()
mCodebaseImmutable(PR_FALSE),
mDomainImmutable(PR_FALSE)
{
if (!nsCodeBasePrefObserver::Installed()) {
nsRefPtr<nsCodeBasePrefObserver> obs = new nsCodeBasePrefObserver();
if (obs)
obs->Init();
NS_WARN_IF_FALSE(nsCodeBasePrefObserver::Installed(),
"Installing nsCodeBasePrefObserver failed!");
if (!gIsObservingCodeBasePrincipalSupport) {
nsresult rv =
Preferences::AddBoolVarCache(&gCodeBasePrincipalSupport,
"signed.applets.codebase_principal_support",
PR_FALSE);
gIsObservingCodeBasePrincipalSupport = NS_SUCCEEDED(rv);
NS_WARN_IF_FALSE(gIsObservingCodeBasePrincipalSupport,
"Installing gCodeBasePrincipalSupport failed!");
}
}
@ -538,7 +481,7 @@ nsPrincipal::CanEnableCapability(const char *capability, PRInt16 *result)
// schemes are special and may be able to get extra capabilities
// even with the pref disabled.
if (!nsCodeBasePrefObserver::PrefValue()) {
if (!gCodeBasePrincipalSupport) {
PRBool mightEnable = PR_FALSE;
nsresult rv = mCodebase->SchemeIs("file", &mightEnable);
if (NS_FAILED(rv) || !mightEnable) {

172
caps/src/nsScriptSecurityManager.cpp
Просмотреть файл

@ -81,7 +81,6 @@
#include "nsIWindowWatcher.h"
#include "nsIConsoleService.h"
#include "nsISecurityCheckedComponent.h"
#include "nsIPrefBranch2.h"
#include "nsIJSRuntimeService.h"
#include "nsIObserverService.h"
#include "nsIContent.h"
@ -95,6 +94,9 @@
#include "nsPrintfCString.h"
#include "nsIContentSecurityPolicy.h"
#include "nsIAsyncVerifyRedirectCallback.h"
#include "mozilla/Preferences.h"
using namespace mozilla;
static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
@ -1121,7 +1123,7 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal,
//-- Initialize policies if necessary
if (mPolicyPrefsChanged)
{
if (!mPrefBranch) {
if (!mPrefInitialized) {
rv = InitPrefs();
NS_ENSURE_SUCCESS(rv, rv);
}
@ -2537,30 +2539,30 @@ nsScriptSecurityManager::SavePrincipal(nsIPrincipal* aToSave)
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
mIsWritingPrefs = PR_TRUE;
if (grantedList)
mPrefBranch->SetCharPref(grantedPrefName.get(), grantedList);
else
mPrefBranch->ClearUserPref(grantedPrefName.get());
if (grantedList) {
Preferences::SetCString(grantedPrefName.get(), grantedList);
} else {
Preferences::ClearUser(grantedPrefName.get());
}
if (deniedList)
mPrefBranch->SetCharPref(deniedPrefName.get(), deniedList);
else
mPrefBranch->ClearUserPref(deniedPrefName.get());
if (deniedList) {
Preferences::SetCString(deniedPrefName.get(), deniedList);
} else {
Preferences::ClearUser(deniedPrefName.get());
}
if (grantedList || deniedList) {
mPrefBranch->SetCharPref(idPrefName, id);
mPrefBranch->SetCharPref(subjectNamePrefName.get(),
subjectName);
}
else {
mPrefBranch->ClearUserPref(idPrefName);
mPrefBranch->ClearUserPref(subjectNamePrefName.get());
Preferences::SetCString(idPrefName, id);
Preferences::SetCString(subjectNamePrefName.get(), subjectName);
} else {
Preferences::ClearUser(idPrefName);
Preferences::ClearUser(subjectNamePrefName.get());
}
mIsWritingPrefs = PR_FALSE;
nsCOMPtr<nsIPrefService> prefService(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
nsIPrefService* prefService = Preferences::GetService();
NS_ENSURE_TRUE(prefService, NS_ERROR_FAILURE);
return prefService->SavePrefFile(nsnull);
}
@ -3332,9 +3334,27 @@ nsScriptSecurityManager::AsyncOnChannelRedirect(nsIChannel* oldChannel,
/////////////////////////////////////
// Method implementing nsIObserver //
/////////////////////////////////////
const char sJSEnabledPrefName[] = "javascript.enabled";
const char sFileOriginPolicyPrefName[] =
"security.fileuri.strict_origin_policy";
#ifdef XPC_IDISPATCH_SUPPORT
const char sXPCDefaultGrantAllName[] = "security.classID.allowByDefault";
#endif
static const char sPrincipalPrefix[] = "capability.principal";
static const char sPolicyPrefix[] = "capability.policy.";
static const char* kObservedPrefs[] = {
sJSEnabledPrefName,
sFileOriginPolicyPrefName,
#ifdef XPC_IDISPATCH_SUPPORT
sXPCDefaultGrantAllName,
#endif
sPolicyPrefix,
sPrincipalPrefix,
nsnull
};
NS_IMETHODIMP
nsScriptSecurityManager::Observe(nsISupports* aObject, const char* aTopic,
const PRUnichar* aMessage)
@ -3379,6 +3399,7 @@ nsScriptSecurityManager::nsScriptSecurityManager(void)
mDefaultPolicy(nsnull),
mCapabilities(nsnull),
mContextPrincipals(nsnull),
mPrefInitialized(PR_FALSE),
mIsJavaScriptEnabled(PR_FALSE),
mIsWritingPrefs(PR_FALSE),
mPolicyPrefsChanged(PR_TRUE)
@ -3463,6 +3484,7 @@ jsid nsScriptSecurityManager::sEnabledID = JSID_VOID;
nsScriptSecurityManager::~nsScriptSecurityManager(void)
{
Preferences::RemoveObservers(this, kObservedPrefs);
NS_ASSERTION(!mContextPrincipals, "Leaking mContextPrincipals");
delete mOriginToPolicyMap;
if(mDefaultPolicy)
@ -3588,13 +3610,11 @@ nsScriptSecurityManager::InitPolicies()
rv = InitDomainPolicy(cx, "default", mDefaultPolicy);
NS_ENSURE_SUCCESS(rv, rv);
nsXPIDLCString policyNames;
rv = mPrefBranch->GetCharPref("capability.policy.policynames",
getter_Copies(policyNames));
nsAdoptingCString policyNames =
Preferences::GetCString("capability.policy.policynames");
nsXPIDLCString defaultPolicyNames;
rv = mPrefBranch->GetCharPref("capability.policy.default_policynames",
getter_Copies(defaultPolicyNames));
nsAdoptingCString defaultPolicyNames =
Preferences::GetCString("capability.policy.default_policynames");
policyNames += NS_LITERAL_CSTRING(" ") + defaultPolicyNames;
//-- Initialize domain policies
@ -3619,11 +3639,11 @@ nsScriptSecurityManager::InitPolicies()
NS_LITERAL_CSTRING(sPolicyPrefix) +
nsDependentCString(nameBegin) +
NS_LITERAL_CSTRING(".sites"));
nsXPIDLCString domainList;
rv = mPrefBranch->GetCharPref(sitesPrefName.get(),
getter_Copies(domainList));
if (NS_FAILED(rv))
nsAdoptingCString domainList =
Preferences::GetCString(sitesPrefName.get());
if (!domainList) {
continue;
}
DomainPolicy* domainPolicy = new DomainPolicy();
if (!domainPolicy)
@ -3724,8 +3744,9 @@ nsScriptSecurityManager::InitDomainPolicy(JSContext* cx,
PRUint32 prefCount;
char** prefNames;
rv = mPrefBranch->GetChildList(policyPrefix.get(),
&prefCount, &prefNames);
nsIPrefBranch* branch = Preferences::GetRootBranch();
NS_ASSERTION(branch, "failed to get the root pref branch");
rv = branch->GetChildList(policyPrefix.get(), &prefCount, &prefNames);
if (NS_FAILED(rv)) return rv;
if (prefCount == 0)
return NS_OK;
@ -3747,11 +3768,11 @@ nsScriptSecurityManager::InitDomainPolicy(JSContext* cx,
continue;
// Get the pref value
nsXPIDLCString prefValue;
rv = mPrefBranch->GetCharPref(prefNames[currentPref],
getter_Copies(prefValue));
if (NS_FAILED(rv) || !prefValue)
nsAdoptingCString prefValue =
Preferences::GetCString(prefNames[currentPref]);
if (!prefValue) {
continue;
}
SecurityLevel secLevel;
if (PL_strcasecmp(prefValue, "noAccess") == 0)
@ -3904,9 +3925,10 @@ nsScriptSecurityManager::InitPrincipals(PRUint32 aPrefCount, const char** aPrefN
if (PL_strcasecmp(aPrefNames[c] + prefNameLen, idSuffix) != 0)
continue;
nsXPIDLCString id;
if (NS_FAILED(mPrefBranch->GetCharPref(aPrefNames[c], getter_Copies(id))))
nsAdoptingCString id = Preferences::GetCString(aPrefNames[c]);
if (!id) {
return NS_ERROR_FAILURE;
}
nsCAutoString grantedPrefName;
nsCAutoString deniedPrefName;
@ -3920,23 +3942,20 @@ nsScriptSecurityManager::InitPrincipals(PRUint32 aPrefCount, const char** aPrefN
if (NS_FAILED(rv))
continue;
nsXPIDLCString grantedList;
mPrefBranch->GetCharPref(grantedPrefName.get(),
getter_Copies(grantedList));
nsXPIDLCString deniedList;
mPrefBranch->GetCharPref(deniedPrefName.get(),
getter_Copies(deniedList));
nsXPIDLCString subjectName;
mPrefBranch->GetCharPref(subjectNamePrefName.get(),
getter_Copies(subjectName));
nsAdoptingCString grantedList =
Preferences::GetCString(grantedPrefName.get());
nsAdoptingCString deniedList =
Preferences::GetCString(deniedPrefName.get());
nsAdoptingCString subjectName =
Preferences::GetCString(subjectNamePrefName.get());
//-- Delete prefs if their value is the empty string
if (id.IsEmpty() || (grantedList.IsEmpty() && deniedList.IsEmpty()))
{
mPrefBranch->ClearUserPref(aPrefNames[c]);
mPrefBranch->ClearUserPref(grantedPrefName.get());
mPrefBranch->ClearUserPref(deniedPrefName.get());
mPrefBranch->ClearUserPref(subjectNamePrefName.get());
Preferences::ClearUser(aPrefNames[c]);
Preferences::ClearUser(grantedPrefName.get());
Preferences::ClearUser(deniedPrefName.get());
Preferences::ClearUser(subjectNamePrefName.get());
continue;
}
@ -3978,15 +3997,6 @@ nsScriptSecurityManager::InitPrincipals(PRUint32 aPrefCount, const char** aPrefN
return NS_OK;
}
const char nsScriptSecurityManager::sJSEnabledPrefName[] =
"javascript.enabled";
const char nsScriptSecurityManager::sFileOriginPolicyPrefName[] =
"security.fileuri.strict_origin_policy";
#ifdef XPC_IDISPATCH_SUPPORT
const char nsScriptSecurityManager::sXPCDefaultGrantAllName[] =
"security.classID.allowByDefault";
#endif
inline void
nsScriptSecurityManager::ScriptSecurityPrefChanged()
{
@ -4001,25 +4011,21 @@ nsScriptSecurityManager::ScriptSecurityPrefChanged()
#endif
nsresult rv;
if (!mPrefBranch) {
if (!mPrefInitialized) {
rv = InitPrefs();
if (NS_FAILED(rv))
return;
}
PRBool temp;
rv = mPrefBranch->GetBoolPref(sJSEnabledPrefName, &temp);
if (NS_SUCCEEDED(rv))
mIsJavaScriptEnabled = temp;
mIsJavaScriptEnabled =
Preferences::GetBool(sJSEnabledPrefName, mIsJavaScriptEnabled);
rv = mPrefBranch->GetBoolPref(sFileOriginPolicyPrefName, &temp);
if (NS_SUCCEEDED(rv))
sStrictFileOriginPolicy = NS_SUCCEEDED(rv) && temp;
sStrictFileOriginPolicy =
Preferences::GetBool(sFileOriginPolicyPrefName, PR_FALSE);
#ifdef XPC_IDISPATCH_SUPPORT
rv = mPrefBranch->GetBoolPref(sXPCDefaultGrantAllName, &temp);
if (NS_SUCCEEDED(rv))
mXPCDefaultGrantAll = temp;
mXPCDefaultGrantAll =
Preferences::GetBoolPref(sXPCDefaultGrantAllName, mXPCDefaultGrantAll);
#endif
}
@ -4027,37 +4033,27 @@ nsresult
nsScriptSecurityManager::InitPrefs()
{
nsresult rv;
nsCOMPtr<nsIPrefService> prefService(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
rv = prefService->GetBranch(nsnull, getter_AddRefs(mPrefBranch));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIPrefBranch2> prefBranchInternal(do_QueryInterface(mPrefBranch, &rv));
NS_ENSURE_SUCCESS(rv, rv);
nsIPrefBranch* branch = Preferences::GetRootBranch();
NS_ENSURE_TRUE(branch, NS_ERROR_FAILURE);
mPrefInitialized = PR_TRUE;
// Set the initial value of the "javascript.enabled" prefs
ScriptSecurityPrefChanged();
// set observer callbacks in case the value of the prefs change
prefBranchInternal->AddObserver(sJSEnabledPrefName, this, PR_FALSE);
prefBranchInternal->AddObserver(sFileOriginPolicyPrefName, this, PR_FALSE);
#ifdef XPC_IDISPATCH_SUPPORT
prefBranchInternal->AddObserver(sXPCDefaultGrantAllName, this, PR_FALSE);
#endif
Preferences::AddStrongObservers(this, kObservedPrefs);
PRUint32 prefCount;
char** prefNames;
// Set a callback for policy pref changes
prefBranchInternal->AddObserver(sPolicyPrefix, this, PR_FALSE);
//-- Initialize the principals database from prefs
rv = mPrefBranch->GetChildList(sPrincipalPrefix, &prefCount, &prefNames);
rv = branch->GetChildList(sPrincipalPrefix, &prefCount, &prefNames);
if (NS_SUCCEEDED(rv) && prefCount > 0)
{
rv = InitPrincipals(prefCount, (const char**)prefNames);
NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(prefCount, prefNames);
NS_ENSURE_SUCCESS(rv, rv);
}
//-- Set a callback for principal changes
prefBranchInternal->AddObserver(sPrincipalPrefix, this, PR_FALSE);
return NS_OK;
}