Restrict extensionview to chrome-extension://

extensions/browser/guest_view/extension_view/extension_view_guest.cc

Index: extensions/browser/guest_view/extension_view/extension_view_guest.cc
diff --git a/extensions/browser/guest_view/extension_view/extension_view_guest.cc b/extensions/browser/guest_view/extension_view/extension_view_guest.cc
index 952ec1331cfb1a9eacee3e86989253bd3f22326a..4ab3cd9fc09dd8bfa8856108d165b8d20daf9762 100644
--- a/extensions/browser/guest_view/extension_view/extension_view_guest.cc
+++ b/extensions/browser/guest_view/extension_view/extension_view_guest.cc
@@ -5,6 +5,7 @@
 #include "extensions/browser/guest_view/extension_view/extension_view_guest.h"
 
 #include "base/metrics/user_metrics.h"
+#include "components/crx_file/id_util.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/result_codes.h"
 #include "extensions/browser/api/extensions_api_client.h"
@@ -40,11 +41,18 @@ extensions::GuestViewBase* ExtensionViewGuest::Create(
 
 void ExtensionViewGuest::NavigateGuest(const std::string& src,
                                        bool force_navigation) {
-  if (src.empty())
+  GURL url = extension_url_.Resolve(src);
+
+  // If the URL is not valid, about:blank, or the same origin as the extension,
+  // then navigate to about:blank.
+  bool urlNotAllowed = (url != GURL(url::kAboutBlankURL)) &&

[Fady Samuel, 2015/02/17 23:20:36]

nit: url_not_allowed

[apacible, 2015/02/18 00:04:11]

Done.

+      (url.GetOrigin() != extension_url_.GetOrigin());
+  if (!url.is_valid() || urlNotAllowed) {
+    NavigateGuest(url::kAboutBlankURL, true /* force_navigation */);
     return;
+  }
 
-  GURL url(src);
-  if (!url.is_valid() && !force_navigation && (url == view_page_))
+  if (!force_navigation && (view_page_ == url))
     return;
 
   web_contents()->GetRenderProcessHost()->FilterURL(false, &url);
@@ -63,20 +71,26 @@ bool ExtensionViewGuest::CanRunInDetachedState() const {
 void ExtensionViewGuest::CreateWebContents(
     const base::DictionaryValue& create_params,
     const WebContentsCreatedCallback& callback) {
-  std::string str;
-  if (!create_params.GetString(extensionview::kAttributeSrc, &str)) {
+  // Gets the extension ID.
+  create_params.GetString(extensionview::kAttributeExtension, &extension_id_);
+
+  if (!crx_file::id_util::IdIsValid(extension_id_)) {
     callback.Run(nullptr);
     return;
   }
 
-  GURL source(str);
-  if (!source.is_valid()) {
+  // Gets the extension URL.
+  extension_url_ =
+      extensions::Extension::GetBaseURLFromExtensionId(extension_id_);
+
+  if (!extension_url_.is_valid()) {
     callback.Run(nullptr);
     return;
   }
 
   content::SiteInstance* view_site_instance =
-      content::SiteInstance::CreateForURL(browser_context(), source);
+      content::SiteInstance::CreateForURL(browser_context(),
+                                          extension_url_);
 
   WebContents::CreateParams params(browser_context(), view_site_instance);
   params.guest_delegate = this;
@@ -107,6 +121,19 @@ int ExtensionViewGuest::GetTaskPrefix() const {
 }
 
 // content::WebContentsObserver implementation.
+void ExtensionViewGuest::DidCommitProvisionalLoadForFrame(
+    content::RenderFrameHost* render_frame_host,
+    const GURL& url,
+    ui::PageTransition transition_type) {
+  if (!render_frame_host->GetParent())
+    view_page_ = url;
+
+  scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
+  args->SetString(guestview::kUrl, url.spec());
+  DispatchEventToView(
+      new GuestViewBase::Event(extensionview::kEventLoadCommit, args.Pass()));
+}
+
 bool ExtensionViewGuest::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExtensionViewGuest, message)