nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1855142 - Simplify PrincipalInfo handling in FactoryOp::Open; r=dom-storage-reviewers,jari

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D189910
This commit is contained in:
Jan Varga 2024-02-29 15:28:51 +00:00
parent 4f633736bc
commit 8e3ebecd63
1 changed files with 22 additions and 29 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

51
dom/indexedDB/ActorsParent.cpp
View file

@ -14606,6 +14606,8 @@ void FactoryOp::Stringify(nsACString& aResult) const {
nsresult FactoryOp::Open() { nsresult FactoryOp::Open() {
AssertIsOnOwningThread(); AssertIsOnOwningThread();
MOZ_ASSERT(mState == State::Initial); MOZ_ASSERT(mState == State::Initial);
MOZ_ASSERT(mOriginMetadata.mOrigin.IsEmpty());
MOZ_ASSERT(!mDirectoryLock);
if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) || if (NS_WARN_IF(QuotaClient::IsShuttingDownOnBackgroundThread()) ||
IsActorDestroyed()) { IsActorDestroyed()) {
@ -14613,10 +14615,27 @@ nsresult FactoryOp::Open() {
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR; return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
} }
QM_TRY(QuotaManager::EnsureCreated());
QuotaManager* const quotaManager = QuotaManager::Get();
MOZ_ASSERT(quotaManager);
const DatabaseMetadata& metadata = mCommonParams.metadata();
const PersistenceType persistenceType = metadata.persistenceType();
const PrincipalInfo& principalInfo = mCommonParams.principalInfo(); const PrincipalInfo& principalInfo = mCommonParams.principalInfo();
QM_TRY_UNWRAP(auto principalMetadata,
quotaManager->GetInfoFromValidatedPrincipalInfo(principalInfo));
mOriginMetadata = {std::move(principalMetadata), persistenceType};
if (principalInfo.type() == PrincipalInfo::TSystemPrincipalInfo) { if (principalInfo.type() == PrincipalInfo::TSystemPrincipalInfo) {
MOZ_ASSERT(mCommonParams.metadata().persistenceType() == MOZ_ASSERT(mCommonParams.metadata().persistenceType() ==
PERSISTENCE_TYPE_PERSISTENT); PERSISTENCE_TYPE_PERSISTENT);
mEnforcingQuota = false;
} else if (principalInfo.type() == PrincipalInfo::TContentPrincipalInfo) { } else if (principalInfo.type() == PrincipalInfo::TContentPrincipalInfo) {
const ContentPrincipalInfo& contentPrincipalInfo = const ContentPrincipalInfo& contentPrincipalInfo =
principalInfo.get_ContentPrincipalInfo(); principalInfo.get_ContentPrincipalInfo();
@ -14626,7 +14645,9 @@ nsresult FactoryOp::Open() {
mCommonParams.metadata().persistenceType() == mCommonParams.metadata().persistenceType() ==
PERSISTENCE_TYPE_PERSISTENT); PERSISTENCE_TYPE_PERSISTENT);
if (contentPrincipalInfo.attrs().mPrivateBrowsingId != 0) { mEnforcingQuota = persistenceType != PERSISTENCE_TYPE_PERSISTENT;
if (mOriginMetadata.mIsPrivate) {
if (StaticPrefs::dom_indexedDB_privateBrowsing_enabled()) { if (StaticPrefs::dom_indexedDB_privateBrowsing_enabled()) {
// Explicitly disallow moz-extension urls from using the encrypted // Explicitly disallow moz-extension urls from using the encrypted
// indexedDB storage mode when the caller is an extension (see Bug // indexedDB storage mode when the caller is an extension (see Bug
@ -14645,34 +14666,6 @@ nsresult FactoryOp::Open() {
MOZ_ASSERT(false); MOZ_ASSERT(false);
} }
MOZ_ASSERT(mOriginMetadata.mOrigin.IsEmpty());
MOZ_ASSERT(!mDirectoryLock);
QM_TRY(QuotaManager::EnsureCreated());
QuotaManager* const quotaManager = QuotaManager::Get();
MOZ_ASSERT(quotaManager);
const DatabaseMetadata& metadata = mCommonParams.metadata();
const PersistenceType persistenceType = metadata.persistenceType();
if (principalInfo.type() == PrincipalInfo::TSystemPrincipalInfo) {
mOriginMetadata = {QuotaManager::GetInfoForChrome(), persistenceType};
mEnforcingQuota = false;
} else {
MOZ_ASSERT(principalInfo.type() == PrincipalInfo::TContentPrincipalInfo);
QM_TRY_UNWRAP(
auto principalMetadata,
quotaManager->GetInfoFromValidatedPrincipalInfo(principalInfo));
mOriginMetadata = {std::move(principalMetadata), persistenceType};
mEnforcingQuota = persistenceType != PERSISTENCE_TYPE_PERSISTENT;
}
QuotaManager::GetStorageId(persistenceType, mOriginMetadata.mOrigin, QuotaManager::GetStorageId(persistenceType, mOriginMetadata.mOrigin,
Client::IDB, mDatabaseId); Client::IDB, mDatabaseId);