44 lines
2.1 KiB
Diff
44 lines
2.1 KiB
Diff
From: uazo <uazo@users.noreply.github.com>
|
|
Date: Sun, 29 Oct 2023 15:18:24 +0000
|
|
Subject: Temp guard FileSystemAccessPersistentPermissions
|
|
|
|
---
|
|
.../chrome_file_system_access_permission_context.cc | 4 ++--
|
|
.../browser/file_system_access/file_system_access_features.cc | 4 ++++
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
|
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
|
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
|
@@ -399,7 +399,7 @@ bool ShouldBlockAccessToPath(const base::FilePath& path,
|
|
BlockType nearest_ancestor_block_type = kDontBlockChildren;
|
|
for (const auto& block : rules) {
|
|
if (check_path == block.path || check_path.IsParent(block.path)) {
|
|
- VLOG(1) << "Blocking access to " << check_path
|
|
+ LOG(INFO) << "Blocking access to " << check_path
|
|
<< " because it is a parent of " << block.path;
|
|
return true;
|
|
}
|
|
@@ -426,7 +426,7 @@ bool ShouldBlockAccessToPath(const base::FilePath& path,
|
|
}
|
|
|
|
// The nearest ancestor blocks access to its children, so block access.
|
|
- VLOG(1) << "Blocking access to " << check_path << " because it is inside "
|
|
+ LOG(INFO) << "Blocking access to " << check_path << " because it is inside "
|
|
<< nearest_ancestor;
|
|
return true;
|
|
}
|
|
diff --git a/chrome/browser/file_system_access/file_system_access_features.cc b/chrome/browser/file_system_access/file_system_access_features.cc
|
|
--- a/chrome/browser/file_system_access/file_system_access_features.cc
|
|
+++ b/chrome/browser/file_system_access/file_system_access_features.cc
|
|
@@ -34,4 +34,8 @@ BASE_FEATURE(kFileSystemAccessSymbolicLinkCheck,
|
|
"FileSystemAccessSymbolicLinkCheck",
|
|
base::FEATURE_DISABLED_BY_DEFAULT);
|
|
|
|
+#if BUILDFLAG(IS_WIN)
|
|
+SET_CROMITE_FEATURE_ENABLED(kFileSystemAccessLocalUNCPathBlock);
|
|
+#endif
|
|
+SET_CROMITE_FEATURE_DISABLED(kFileSystemAccessPersistentPermissions);
|
|
} // namespace features
|
|
--
|