Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(945)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/child_process_security_policy_unittest.cc

Issue 31663002: ChildProcessSecurityPolicy: Add DeleteFromFileSystem permission. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/browser/child_process_security_policy_impl.cc ('K') | « content/browser/child_process_security_policy_impl.cc ('k') | content/browser/fileapi/fileapi_message_filter.cc » ('j') | content/browser/fileapi/fileapi_message_filter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_security_policy_unittest.cc
===================================================================
--- content/browser/child_process_security_policy_unittest.cc (revision 229702)
+++ content/browser/child_process_security_policy_unittest.cc (working copy)
@@ -89,6 +89,27 @@
p->GrantPermissionsForFile(child_id, file, permissions);
}
+ void CheckHasNoFileSystemPermission(ChildProcessSecurityPolicyImpl* p,
+ const std::string& child_id) {
+ EXPECT_FALSE(p->CanReadFileSystem(kRendererID, child_id));
+ EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, child_id));
+ EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, child_id));
+ EXPECT_FALSE(p->CanDeleteFromFileSystem(kRendererID, child_id));
+ }
+
+ void CheckHasNoFileSystemFilePermission(ChildProcessSecurityPolicyImpl* p,
+ const base::FilePath& file,
+ const fileapi::FileSystemURL& url) {
+ EXPECT_FALSE(p->CanReadFile(kRendererID, file));
+ EXPECT_FALSE(p->CanCreateReadWriteFile(kRendererID, file));
+ EXPECT_FALSE(p->CanReadFileSystemFile(kRendererID, url));
+ EXPECT_FALSE(p->CanWriteFileSystemFile(kRendererID, url));
+ EXPECT_FALSE(p->CanCreateFileSystemFile(kRendererID, url));
+ EXPECT_FALSE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ EXPECT_FALSE(p->CanCopyIntoFileSystemFile(kRendererID, url));
+ EXPECT_FALSE(p->CanDeleteFileSystemFile(kRendererID, url));
+ }
+
private:
ChildProcessSecurityPolicyTestBrowserClient test_browser_client_;
ContentBrowserClient* old_browser_client_;
@@ -300,70 +321,63 @@
RegisterFileSystemForVirtualPath(fileapi::kFileSystemTypeTest,
"copy_into_filesystem",
base::FilePath());
+ std::string delete_from_id = fileapi::IsolatedContext::GetInstance()->
+ RegisterFileSystemForVirtualPath(fileapi::kFileSystemTypeTest,
+ "delete_from_filesystem",
+ base::FilePath());
// Test initially having no permissions.
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, read_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, read_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, read_id));
+ CheckHasNoFileSystemPermission(p, read_id);
+ CheckHasNoFileSystemPermission(p, read_write_id);
+ CheckHasNoFileSystemPermission(p, copy_into_id);
+ CheckHasNoFileSystemPermission(p, delete_from_id);
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, read_write_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, read_write_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, read_write_id));
-
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, copy_into_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, copy_into_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, copy_into_id));
-
// Testing varying combinations of grants and checks.
p->GrantReadFileSystem(kRendererID, read_id);
EXPECT_TRUE(p->CanReadFileSystem(kRendererID, read_id));
EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, read_id));
EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, read_id));
+ EXPECT_FALSE(p->CanDeleteFromFileSystem(kRendererID, read_id));
p->GrantReadFileSystem(kRendererID, read_write_id);
p->GrantWriteFileSystem(kRendererID, read_write_id);
EXPECT_TRUE(p->CanReadFileSystem(kRendererID, read_write_id));
EXPECT_TRUE(p->CanReadWriteFileSystem(kRendererID, read_write_id));
EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, read_write_id));
+ EXPECT_FALSE(p->CanDeleteFromFileSystem(kRendererID, read_write_id));
p->GrantCopyIntoFileSystem(kRendererID, copy_into_id);
EXPECT_FALSE(p->CanReadFileSystem(kRendererID, copy_into_id));
EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, copy_into_id));
EXPECT_TRUE(p->CanCopyIntoFileSystem(kRendererID, copy_into_id));
+ EXPECT_FALSE(p->CanDeleteFromFileSystem(kRendererID, copy_into_id));
+ p->GrantDeleteFromFileSystem(kRendererID, delete_from_id);
+ EXPECT_FALSE(p->CanReadFileSystem(kRendererID, delete_from_id));
+ EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, delete_from_id));
+ EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, delete_from_id));
+ EXPECT_TRUE(p->CanDeleteFromFileSystem(kRendererID, delete_from_id));
+
// Test revoke permissions on renderer ID removal.
p->Remove(kRendererID);
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, read_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, read_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, read_id));
+ CheckHasNoFileSystemPermission(p, read_id);
+ CheckHasNoFileSystemPermission(p, read_write_id);
+ CheckHasNoFileSystemPermission(p, copy_into_id);
+ CheckHasNoFileSystemPermission(p, delete_from_id);
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, read_write_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, read_write_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, read_write_id));
-
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, copy_into_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, copy_into_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, copy_into_id));
-
// Test having no permissions upon re-adding same renderer ID.
p->Add(kRendererID);
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, read_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, read_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, read_id));
+ CheckHasNoFileSystemPermission(p, read_id);
+ CheckHasNoFileSystemPermission(p, read_write_id);
+ CheckHasNoFileSystemPermission(p, copy_into_id);
+ CheckHasNoFileSystemPermission(p, delete_from_id);
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, read_write_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, read_write_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, read_write_id));
-
- EXPECT_FALSE(p->CanReadFileSystem(kRendererID, copy_into_id));
- EXPECT_FALSE(p->CanReadWriteFileSystem(kRendererID, copy_into_id));
- EXPECT_FALSE(p->CanCopyIntoFileSystem(kRendererID, copy_into_id));
-
// Cleanup.
p->Remove(kRendererID);
fileapi::IsolatedContext::GetInstance()->RevokeFileSystem(read_id);
fileapi::IsolatedContext::GetInstance()->RevokeFileSystem(read_write_id);
fileapi::IsolatedContext::GetInstance()->RevokeFileSystem(copy_into_id);
+ fileapi::IsolatedContext::GetInstance()->RevokeFileSystem(delete_from_id);
}
TEST_F(ChildProcessSecurityPolicyTest, FilePermissionGrantingAndRevoking) {
@@ -381,12 +395,7 @@
GURL("http://foo/"), fileapi::kFileSystemTypeTest, file);
// Test initially having no permissions.
- EXPECT_FALSE(p->CanReadFile(kRendererID, file));
- EXPECT_FALSE(p->CanCreateReadWriteFile(kRendererID, file));
- EXPECT_FALSE(p->CanReadFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanWriteFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ CheckHasNoFileSystemFilePermission(p, file, url);
// Testing every combination of permissions granting and revoking.
p->GrantReadFile(kRendererID, file);
@@ -396,13 +405,10 @@
EXPECT_FALSE(p->CanWriteFileSystemFile(kRendererID, url));
EXPECT_FALSE(p->CanCreateFileSystemFile(kRendererID, url));
EXPECT_FALSE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ EXPECT_FALSE(p->CanCopyIntoFileSystemFile(kRendererID, url));
+ EXPECT_FALSE(p->CanDeleteFileSystemFile(kRendererID, url));
p->RevokeAllPermissionsForFile(kRendererID, file);
- EXPECT_FALSE(p->CanReadFile(kRendererID, file));
- EXPECT_FALSE(p->CanCreateReadWriteFile(kRendererID, file));
- EXPECT_FALSE(p->CanReadFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanWriteFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ CheckHasNoFileSystemFilePermission(p, file, url);
p->GrantCreateReadWriteFile(kRendererID, file);
EXPECT_TRUE(p->CanReadFile(kRendererID, file));
@@ -411,13 +417,10 @@
EXPECT_TRUE(p->CanWriteFileSystemFile(kRendererID, url));
EXPECT_TRUE(p->CanCreateFileSystemFile(kRendererID, url));
EXPECT_TRUE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ EXPECT_TRUE(p->CanCopyIntoFileSystemFile(kRendererID, url));
+ EXPECT_TRUE(p->CanDeleteFileSystemFile(kRendererID, url));
p->RevokeAllPermissionsForFile(kRendererID, file);
- EXPECT_FALSE(p->CanReadFile(kRendererID, file));
- EXPECT_FALSE(p->CanCreateReadWriteFile(kRendererID, file));
- EXPECT_FALSE(p->CanReadFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanWriteFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ CheckHasNoFileSystemFilePermission(p, file, url);
// Test revoke permissions on renderer ID removal.
p->GrantCreateReadWriteFile(kRendererID, file);
@@ -427,22 +430,14 @@
EXPECT_TRUE(p->CanWriteFileSystemFile(kRendererID, url));
EXPECT_TRUE(p->CanCreateFileSystemFile(kRendererID, url));
EXPECT_TRUE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ EXPECT_TRUE(p->CanCopyIntoFileSystemFile(kRendererID, url));
+ EXPECT_TRUE(p->CanDeleteFileSystemFile(kRendererID, url));
p->Remove(kRendererID);
- EXPECT_FALSE(p->CanReadFile(kRendererID, file));
- EXPECT_FALSE(p->CanCreateReadWriteFile(kRendererID, file));
- EXPECT_FALSE(p->CanReadFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanWriteFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ CheckHasNoFileSystemFilePermission(p, file, url);
// Test having no permissions upon re-adding same renderer ID.
p->Add(kRendererID);
- EXPECT_FALSE(p->CanReadFile(kRendererID, file));
- EXPECT_FALSE(p->CanCreateReadWriteFile(kRendererID, file));
- EXPECT_FALSE(p->CanReadFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanWriteFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateFileSystemFile(kRendererID, url));
- EXPECT_FALSE(p->CanCreateReadWriteFileSystemFile(kRendererID, url));
+ CheckHasNoFileSystemFilePermission(p, file, url);
// Cleanup.
p->Remove(kRendererID);
« content/browser/child_process_security_policy_impl.cc ('K') | « content/browser/child_process_security_policy_impl.cc ('k') | content/browser/fileapi/fileapi_message_filter.cc » ('j') | content/browser/fileapi/fileapi_message_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698