Plumb file system permission into WebviewGuest.

chrome/browser/guest_view/web_view/web_view_guest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
 
 #include "base/debug/stack_trace.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/api/webview/webview_api.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/extension_renderer_state.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/guest_view/guest_view_constants.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
 #include "chrome/browser/guest_view/web_view/web_view_constants.h"
@@ skipping 40 matching lines @@
 
 #if defined(ENABLE_PLUGINS)
 #include "chrome/browser/guest_view/web_view/plugin_permission_helper.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #endif
 
 using base::UserMetricsAction;
-using content::RenderFrameHost;
 using content::WebContents;
 
 namespace {
 
 std::string WindowOpenDispositionToString(
   WindowOpenDisposition window_open_disposition) {
   switch (window_open_disposition) {
     case IGNORE_ACTION:
       return "ignore";
     case SAVE_TO_DISK:
@@ skipping 44 matching lines @@
     case WEB_VIEW_PERMISSION_TYPE_JAVASCRIPT_DIALOG:
       return webview::kPermissionTypeDialog;
     case WEB_VIEW_PERMISSION_TYPE_LOAD_PLUGIN:
       return webview::kPermissionTypeLoadPlugin;
     case WEB_VIEW_PERMISSION_TYPE_MEDIA:
       return webview::kPermissionTypeMedia;
     case WEB_VIEW_PERMISSION_TYPE_NEW_WINDOW:
       return webview::kPermissionTypeNewWindow;
     case WEB_VIEW_PERMISSION_TYPE_POINTER_LOCK:
       return webview::kPermissionTypePointerLock;
+    case WEB_VIEW_PERMISSION_TYPE_FILESYSTEM:

[fsamuel, 2014/05/30 15:13:21]

Order alphabetically.

[Xi Han, 2014/05/30 18:15:56]

Done.

+      return webview::kPermissionTypeFileSystem;
     default:
       NOTREACHED();
       return std::string();
   }
 }
 
 void RemoveWebViewEventListenersOnIOThread(
     void* profile,
     const std::string& extension_id,
     int embedder_process_id,
@@ skipping 103 matching lines @@
             UserMetricsAction("WebView.PermissionAllow.Media"));
         break;
       case WEB_VIEW_PERMISSION_TYPE_NEW_WINDOW:
         content::RecordAction(
             UserMetricsAction("BrowserPlugin.PermissionAllow.NewWindow"));
         break;
       case WEB_VIEW_PERMISSION_TYPE_POINTER_LOCK:
         content::RecordAction(
             UserMetricsAction("WebView.PermissionAllow.PointerLock"));
         break;
+      case WEB_VIEW_PERMISSION_TYPE_FILESYSTEM:

[fsamuel, 2014/05/30 15:13:21]

Order alphabetically

[Xi Han, 2014/05/30 18:15:56]

Done.

+        content::RecordAction(
+            UserMetricsAction("WebView.PermissionAllow.FileSystem"));
       default:
         break;
     }
   } else {
     switch (info.permission_type) {
       case WEB_VIEW_PERMISSION_TYPE_DOWNLOAD:
         content::RecordAction(
             UserMetricsAction("WebView.PermissionDeny.Download"));
         break;
       case WEB_VIEW_PERMISSION_TYPE_GEOLOCATION:
@@ skipping 12 matching lines @@
             UserMetricsAction("WebView.PermissionDeny.Media"));
         break;
       case WEB_VIEW_PERMISSION_TYPE_NEW_WINDOW:
         content::RecordAction(
             UserMetricsAction("BrowserPlugin.PermissionDeny.NewWindow"));
         break;
       case WEB_VIEW_PERMISSION_TYPE_POINTER_LOCK:
         content::RecordAction(
             UserMetricsAction("WebView.PermissionDeny.PointerLock"));
         break;
+      case WEB_VIEW_PERMISSION_TYPE_FILESYSTEM:

[fsamuel, 2014/05/30 15:13:21]

Order alphabetically. 

[Xi Han, 2014/05/30 18:15:56]

Done.

+        content::RecordAction(
+            UserMetricsAction("WebView.PermissionDeny.FileSystem"));
+        break;
       default:
         break;
     }
   }
 }
 
 // static
 scoped_ptr<base::ListValue> WebViewGuest::MenuModelToValue(
     const ui::SimpleMenuModel& menu_model) {
   scoped_ptr<base::ListValue> items(new base::ListValue());
@@ skipping 307 matching lines @@
   guest_web_contents()->GetController().GoToOffset(relative_index);
 }
 
 void WebViewGuest::Reload() {
   // TODO(fsamuel): Don't check for repost because we don't want to show
   // Chromium's repost warning. We might want to implement a separate API
   // for registering a callback if a repost is about to happen.
   guest_web_contents()->GetController().Reload(false);
 }
 
+void WebViewGuest::RequestFileSystemPermission(
+    const GURL& url,
+    const base::Callback<void(bool)>& callback) {
+  base::DictionaryValue request_info;
+  request_info.Set(guestview::kUrl, base::Value::CreateStringValue(url.spec()));
+  RequestPermission(
+      WEB_VIEW_PERMISSION_TYPE_FILESYSTEM,
+      request_info,
+      base::Bind(&WebViewGuest::OnWebViewFileSystemPermissionResponse,
+                 base::Unretained(this),
+                 callback),
+      false /* allowed_by_default */);
+}
+
+void WebViewGuest::OnWebViewFileSystemPermissionResponse(
+    const base::Callback<void(bool)>& callback,
+    bool allow,
+    const std::string& user_input) {
+  callback.Run(!allow || !attached());
+}
+
 void WebViewGuest::RequestGeolocationPermission(
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
     const base::Callback<void(bool)>& callback) {
   base::DictionaryValue request_info;
   request_info.Set(guestview::kUrl,
                    base::Value::CreateStringValue(requesting_frame.spec()));
   request_info.Set(guestview::kUserGesture,
                    base::Value::CreateBooleanValue(user_gesture));
@@ skipping 151 matching lines @@
       removal_mask,
       content::StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL,
       GURL(),
       content::StoragePartition::OriginMatcherFunction(),
       remove_since,
       base::Time::Now(),
       callback);
   return true;
 }
 
+// static
+void WebViewGuest::FileSystemAccessedAsync(int render_process_id,
+                                           int render_frame_id,
+                                           int request_id,
+                                           const GURL& url,
+                                           bool blocked_by_policy) {

[fsamuel, 2014/05/30 15:13:21]

This should be passing into allowed_by_default

[Xi Han, 2014/05/30 18:15:56]

Done.

+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

[fsamuel, 2014/05/30 15:13:21]

Drop this.

[Xi Han, 2014/05/30 18:15:56]

Done.

+  WebViewGuest* guest = GetWebViewGuest(render_process_id, render_frame_id);
+  DCHECK(guest);
+  guest->RequestFileSystemPermission(
+      url,
+      base::Bind(&WebViewGuest::FileSystemAccessedAsyncInternal,
+                 render_process_id,
+                 render_frame_id,
+                 request_id,
+                 url));
+}
+
+// static
+void WebViewGuest::FileSystemAccessedAsyncInternal(int render_process_id,

[fsamuel, 2014/05/30 15:13:21]

WebViewGuest::FileSystemAccessedAsyncResponse

[Xi Han, 2014/05/30 18:15:56]

Done.

+                                                   int render_frame_id,
+                                                   int request_id,
+                                                   const GURL& url,
+                                                   bool blocked_by_policy) {

[fsamuel, 2014/05/30 15:13:21]

This should be passed into allowed_by_default.

[Xi Han, 2014/05/30 18:15:56]

Not this one, but the one in
WebViewGuest::FileSystemAccessedSyncDelayReply（...）. Thanks for pointing it out
anyway.

+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

[fsamuel, 2014/05/30 15:13:21]

Drop this.

[Xi Han, 2014/05/30 18:15:56]

Done.

+  TabSpecificContentSettings::FileSystemAccessed(
+      render_process_id, render_frame_id, url, blocked_by_policy);
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+  render_frame_host->Send(
+      new ChromeViewMsg_RequestFileSystemAccessAsyncResponse(
+          render_frame_id, request_id, !blocked_by_policy));
+}
+
+// static
+WebViewGuest* WebViewGuest::GetWebViewGuest(int render_process_id,

[fsamuel, 2014/05/30 15:13:21]

Call it from WebViewGuest::FromFrame, and make it public. Move it near
FromWebContents and From

[Xi Han, 2014/05/30 18:15:56]

Done.

+                                            int render_frame_id) {
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);

[fsamuel, 2014/05/30 15:13:21]

if (!render_frame_host)
  return NULL;

[Xi Han, 2014/05/30 18:15:56]

Done.

+  WebContents* web_contents =
+      WebContents::FromRenderFrameHost(render_frame_host);
+  return WebViewGuest::FromWebContents(web_contents);
+}
+
+// static
+void WebViewGuest::FileSystemAccessedSyncDelayReply(int render_process_id,

[fsamuel, 2014/05/30 15:13:21]

WebViewGuest::FileSystemAccessedSync

[Xi Han, 2014/05/30 18:15:56]

Done.

+                                                    int render_frame_id,
+                                                    const GURL& url,
+                                                    IPC::Message* reply_msg,
+                                                    bool blocked_by_policy) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

[fsamuel, 2014/05/30 15:13:21]

Drop this. Everything in WebViewGuest is assumed UI unless specified otherwise.

[Xi Han, 2014/05/30 18:15:56]

Done.

+  WebViewGuest* guest = GetWebViewGuest(render_process_id, render_frame_id);
+  DCHECK(guest);
+  guest->RequestFileSystemPermission(
+      url,
+      base::Bind(&WebViewGuest::FileSystemAccessedSyncDelayReplyInternal,
+                 render_process_id,
+                 render_frame_id,
+                 url,
+                 reply_msg));
+}
+
+// static
+void WebViewGuest::FileSystemAccessedSyncDelayReplyInternal(

[fsamuel, 2014/05/30 15:13:21]

WebViewGuest::FileSystemAccessedSyncResponse

[Xi Han, 2014/05/30 18:15:56]

Done.

+    int render_process_id,
+    int render_frame_id,
+    const GURL& url,
+    IPC::Message* reply_msg,
+    bool blocked_by_policy) {

[fsamuel, 2014/05/30 15:13:21]

This is not blocked_by_policy. This is allowed.

[Xi Han, 2014/05/30 18:15:56]

Done.

+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

[fsamuel, 2014/05/30 15:13:21]

Drop this. Everything in WebViewGuest is assumed UI thread unless specified
otherwise.

[Xi Han, 2014/05/30 18:15:56]

Done.

[Xi Han, 2014/05/30 18:15:56]

Done.

+  TabSpecificContentSettings::FileSystemAccessed(
+      render_process_id, render_frame_id, url, blocked_by_policy);
+  ChromeViewHostMsg_RequestFileSystemAccessSync::WriteReplyParams(
+      reply_msg, !blocked_by_policy);

[fsamuel, 2014/05/30 15:13:21]

Do you have the logic reversed here?

+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+  render_frame_host->Send(reply_msg);
+}
+
 WebViewGuest::~WebViewGuest() {
 }
 
 void WebViewGuest::DidCommitProvisionalLoadForFrame(
     int64 frame_id,
     const base::string16& frame_unique_name,
     bool is_main_frame,
     const GURL& url,
     content::PageTransition transition_type,
     content::RenderViewHost* render_view_host) {
@@ skipping 55 matching lines @@
     content::RenderViewHost* render_view_host) {
   if (frame_id == main_frame_id_)
     InjectChromeVoxIfNeeded(render_view_host);
 }
 
 void WebViewGuest::DidStopLoading(content::RenderViewHost* render_view_host) {
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   DispatchEvent(new GuestViewBase::Event(webview::kEventLoadStop, args.Pass()));
 }
 
-bool WebViewGuest::OnMessageReceived(const IPC::Message& message,
-                                     RenderFrameHost* render_frame_host) {
+bool WebViewGuest::OnMessageReceived(

[fsamuel, 2014/05/30 15:13:21]

Revert this part. This seems unnecessary.

[Xi Han, 2014/05/30 18:15:56]

This is necessary to add "content::" before RenderFrameHost, because in
WebviewGuest.cc I uses RenderFrameHost within my changes, so I include
"render_frame_host.h" and remove its forward declaration. 

+    const IPC::Message& message,
+    content::RenderFrameHost* render_frame_host) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebViewGuest, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_UpdateFrameName, OnUpdateFrameName)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void WebViewGuest::WebContentsDestroyed() {
   // Clean up custom context menu items for this guest.
@@ skipping 527 matching lines @@
     bool allow,
     const std::string& user_input) {
   WebViewGuest* guest =
       WebViewGuest::From(embedder_render_process_id(), new_window_instance_id);
   if (!guest)
     return;
 
   if (!allow)
     guest->Destroy();
 }