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

Unified Diff: content/browser/child_process_security_policy_impl.cc

Issue 46303005: Fix chrome upload with content uri (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 7 years, 1 month 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
« no previous file with comments | « base/test/test_file_util_android.cc ('k') | net/base/file_stream_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_security_policy_impl.cc
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index b0ac66d478f51cd7acc5ed9066cf0d42f2de3bf8..85ec83a4e31d6599e4b5b13eae8153d1c5fc8f3b 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -135,6 +135,22 @@ class ChildProcessSecurityPolicyImpl::SecurityState {
return (it->second & permissions) == permissions;
}
+#if defined(OS_ANDROID)
+ // Determine if the certain permissions have been granted to a content URI.
+ bool HasPermissionsForContentUri(const base::FilePath& file,
+ int permissions) {
+ DCHECK(!file.empty());
+ DCHECK(file.IsContentUri());
+ if (!permissions)
+ return false;
+ base::FilePath file_path = file.StripTrailingSeparators();
+ FileMap::const_iterator it = file_permissions_.find(file_path);
+ if (it != file_permissions_.end())
+ return (it->second & permissions) == permissions;
+ return false;
+ }
+#endif
+
void GrantBindings(int bindings) {
enabled_bindings_ |= bindings;
}
@@ -171,6 +187,10 @@ class ChildProcessSecurityPolicyImpl::SecurityState {
// Determine if the certain permissions have been granted to a file.
bool HasPermissionsForFile(const base::FilePath& file, int permissions) {
+#if defined(OS_ANDROID)
+ if (file.IsContentUri())
+ return HasPermissionsForContentUri(file, permissions);
+#endif
if (!permissions || file.empty() || !file.IsAbsolute())
return false;
base::FilePath current_path = file.StripTrailingSeparators();
« no previous file with comments | « base/test/test_file_util_android.cc ('k') | net/base/file_stream_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698