ExtensionNavigationThrottle: Enforce the same rules on redirect as we

extensions/browser/extension_navigation_throttle.cc

 // Copyright 2016 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 "extensions/browser/extension_navigation_throttle.h"
 
 #include "components/guest_view/browser/guest_view_base.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 14 matching lines @@
 
 namespace extensions {
 
 ExtensionNavigationThrottle::ExtensionNavigationThrottle(
     content::NavigationHandle* navigation_handle)
     : content::NavigationThrottle(navigation_handle) {}
 
 ExtensionNavigationThrottle::~ExtensionNavigationThrottle() {}
 
 content::NavigationThrottle::ThrottleCheckResult
-ExtensionNavigationThrottle::WillStartRequest() {
+ExtensionNavigationThrottle::WillStartOrRedirectRequest() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   content::WebContents* web_contents = navigation_handle()->GetWebContents();
   ExtensionRegistry* registry =
       ExtensionRegistry::Get(web_contents->GetBrowserContext());
 
   // Is this navigation targeting an extension resource?
   const GURL& url = navigation_handle()->GetURL();
   bool url_has_extension_scheme = url.SchemeIs(kExtensionScheme);
   url::Origin target_origin(url);
   const Extension* target_extension = nullptr;
@@ skipping 100 matching lines @@
 
     // |url| must be in the manifest's "web_accessible_resources" section.
     if (!WebAccessibleResourcesInfo::IsResourceWebAccessible(target_extension,
                                                              url.path()))
       return content::NavigationThrottle::BLOCK_REQUEST;
   }
 
   return content::NavigationThrottle::PROCEED;
 }
 
+content::NavigationThrottle::ThrottleCheckResult
+ExtensionNavigationThrottle::WillStartRequest() {
+  return WillStartOrRedirectRequest();
+}
+
+content::NavigationThrottle::ThrottleCheckResult
+ExtensionNavigationThrottle::WillRedirectRequest() {
+  ThrottleCheckResult result = WillStartOrRedirectRequest();
+  if (result == BLOCK_REQUEST) {
+    // BLOCK_REQUEST is on redirect does not work without PlzNavigate, so

[Devlin, 2017/05/18 15:22:44]

s/is on/on

Should this be a TODO?  And should we be returning BLOCK_REQUEST when
PlzNavigate is enabled?

[ncarter (slow), 2017/05/22 22:55:59]

Added a TODO.

The least risky thing to do, I think, is to explore the switch to non-CANCEL
results once PlzNavigate is fully shipped, which is really soon.

+    // translate these errors into CANCEL.
+    return CANCEL;
+  }
+  return result;
+}
+
 const char* ExtensionNavigationThrottle::GetNameForLogging() {
   return "ExtensionNavigationThrottle";
 }
 
 }  // namespace extensions