Chromium Code Reviews

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: addressing tsepez's comments Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
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 d93aa71746a460df31baa61234c68cd2a00fb5d9..8c3b0f31ea60ef36baf090b4a23704807b093fda 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();

Powered by Google App Engine