mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

feat: add fileSystem to ses.setPermissionCheckHandler (#48327)

Browse source 
feat: add fileSystem to ses.setPermissionCheckHandler

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2025-09-24 13:10:33 -04:00 • committed by GitHub
commit cf9d0448be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 325 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
shell/browser/file_system_access/file_system_access_permission_context.cc
View file

@ -257,6 +257,28 @@ class FileSystemAccessPermissionContext::PermissionGrantImpl
// FileSystemAccessPermissionGrant:
PermissionStatus GetStatus() override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
auto* permission_manager =
static_cast<electron::ElectronPermissionManager*>(
context_->browser_context()->GetPermissionControllerDelegate());
if (permission_manager && permission_manager->HasPermissionCheckHandler()) {
base::Value::Dict details;
details.Set("filePath", base::FilePathToValue(path_info_.path));
details.Set("isDirectory", handle_type_ == HandleType::kDirectory);
details.Set("fileAccessType",
type_ == GrantType::kWrite ? "writable" : "readable");
bool granted = permission_manager->CheckPermissionWithDetails(
blink::PermissionType::FILE_SYSTEM, nullptr, origin_.GetURL(),
std::move(details));
return granted ? PermissionStatus::GRANTED : PermissionStatus::DENIED;
}
return status_;
}
PermissionStatus GetActivePermissionStatus() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
return status_;
}
@ -279,8 +301,8 @@ class FileSystemAccessPermissionContext::PermissionGrantImpl
// Check if a permission request has already been processed previously. This
// check is done first because we don't want to reset the status of a
// permission if it has already been granted.
if (GetStatus() != PermissionStatus::ASK || !context_) {
if (GetStatus() == PermissionStatus::GRANTED) {
if (GetActivePermissionStatus() != PermissionStatus::ASK || !context_) {
if (GetActivePermissionStatus() == PermissionStatus::GRANTED) {
SetStatus(PermissionStatus::GRANTED);
}
std::move(callback).Run(PermissionRequestOutcome::kRequestAborted);
@ -294,7 +316,7 @@ class FileSystemAccessPermissionContext::PermissionGrantImpl
return;
}
// Don't request permission for an inactive RenderFrameHost as the
// Don't request permission for an inactive RenderFrameHost as the
// page might not distinguish properly between user denying the permission
// and automatic rejection.
if (rfh->IsInactiveAndDisallowActivation(
@ -347,7 +369,7 @@ class FileSystemAccessPermissionContext::PermissionGrantImpl
permission_manager->RequestPermissionWithDetails(
content::PermissionDescriptorUtil::
CreatePermissionDescriptorForPermissionType(type),
rfh, origin, false, std::move(details),
rfh, origin, rfh->HasTransientUserActivation(), std::move(details),
base::BindOnce(&PermissionGrantImpl::OnPermissionRequestResult, this,
std::move(callback)));
}
@ -394,7 +416,8 @@ class FileSystemAccessPermissionContext::PermissionGrantImpl
return;
}
DCHECK_EQ(entry_it->second->GetStatus(), PermissionStatus::GRANTED);
DCHECK_EQ(entry_it->second->GetActivePermissionStatus(),
PermissionStatus::GRANTED);
auto* const grant_impl = entry_it->second;
grant_impl->SetPath(new_path);
@ -963,7 +986,8 @@ bool FileSystemAccessPermissionContext::OriginHasReadAccess(
auto it = active_permissions_map_.find(origin);
if (it != active_permissions_map_.end()) {
return std::ranges::any_of(it->second.read_grants, [&](const auto& grant) {
return grant.second->GetStatus() == PermissionStatus::GRANTED;
return grant.second->GetActivePermissionStatus() ==
PermissionStatus::GRANTED;
});
}
@ -977,7 +1001,8 @@ bool FileSystemAccessPermissionContext::OriginHasWriteAccess(
auto it = active_permissions_map_.find(origin);
if (it != active_permissions_map_.end()) {
return std::ranges::any_of(it->second.write_grants, [&](const auto& grant) {
return grant.second->GetStatus() == PermissionStatus::GRANTED;
return grant.second->GetActivePermissionStatus() ==
PermissionStatus::GRANTED;
});
}
@ -1031,7 +1056,7 @@ bool FileSystemAccessPermissionContext::AncestorHasActivePermission(
parent = parent.DirName()) {
auto i = relevant_grants.find(parent);
if (i != relevant_grants.end() && i->second &&
i->second->GetStatus() == PermissionStatus::GRANTED) {
i->second->GetActivePermissionStatus() == PermissionStatus::GRANTED) {
return true;
}
}
@ -1054,7 +1079,7 @@ void FileSystemAccessPermissionContext::PermissionGrantDestroyed(
// be granted but won't be visible in any UI because the permission context
// isn't tracking them anymore.
if (grant_it == grants.end()) {
DCHECK_EQ(PermissionStatus::DENIED, grant->GetStatus());
DCHECK_EQ(PermissionStatus::DENIED, grant->GetActivePermissionStatus());
return;
}