[Android WebView] Only send extra headers for the main page

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

 // Copyright (c) 2012 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 "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_login_delegate.h"
+#include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/common/url_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "components/auto_login_parser/auto_login_parser.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 #include "content/public/browser/resource_request_info.h"
@@ skipping 197 matching lines @@
     ScopedVector<content::ResourceThrottle>* throttles) {
   // If io_client is NULL, then the browser side objects have already been
   // destroyed, so do not do anything to the request. Conversely if the
   // request relates to a not-yet-created popup window, then the client will
   // be non-NULL but PopupPendingAssociation() will be set.
   scoped_ptr<AwContentsIoThreadClient> io_client =
       AwContentsIoThreadClient::FromID(child_id, route_id);
   if (!io_client)
     return;
 
+  AddExtraHeadersIfNeeded(request, resource_context);
+
   throttles->push_back(new IoThreadClientThrottle(
       child_id, route_id, request));
 
   bool allow_intercepting =
       // We allow intercepting navigations within subframes, but only if the
       // scheme other than http or https. This is because the embedder
       // can't distinguish main frame and subframe callbacks (which could lead
       // to broken content if the embedder decides to not ignore the main frame
       // navigation, but ignores the subframe navigation).
       // The reason this is supported at all is that certain JavaScript-based
       // frameworks use iframe navigation as a form of communication with the
       // embedder.
       (resource_type == ResourceType::MAIN_FRAME ||
        (resource_type == ResourceType::SUB_FRAME &&
         !request->url().SchemeIs(content::kHttpScheme) &&
         !request->url().SchemeIs(content::kHttpsScheme)));
   if (allow_intercepting) {
     throttles->push_back(InterceptNavigationDelegate::CreateThrottleFor(
         request));
   }
 }
 
+void AwResourceDispatcherHostDelegate::OnRequestRedirected(
+    const GURL& redirect_url,
+    net::URLRequest* request,
+    content::ResourceContext* resource_context,
+    content::ResourceResponse* response) {
+  AddExtraHeadersIfNeeded(request, resource_context);
+}
+
+
 void AwResourceDispatcherHostDelegate::DownloadStarting(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     int child_id,
     int route_id,
     int request_id,
     bool is_content_initiated,
     bool must_download,
     ScopedVector<content::ResourceThrottle>* throttles) {
   GURL url(request->url());
@@ skipping 145 matching lines @@
   PendingThrottleMap::iterator it = pending_throttles_.find(
       ChildRouteIDPair(new_child_id, new_route_id));
 
   if (it != pending_throttles_.end()) {
     IoThreadClientThrottle* throttle = it->second;
     throttle->OnIoThreadClientReady(new_child_id, new_route_id);
     pending_throttles_.erase(it);
   }
 }
 
+void AwResourceDispatcherHostDelegate::AddExtraHeadersIfNeeded(
+    net::URLRequest* request,
+    content::ResourceContext* resource_context) {
+  const content::ResourceRequestInfo* request_info =
+      content::ResourceRequestInfo::ForRequest(request);
+  if (!request_info) return;
+  if (request_info->GetResourceType() != ResourceType::MAIN_FRAME) return;
+
+  const bool is_load_url = request_info->GetPageTransition() &
+      content::PAGE_TRANSITION_FROM_API;
+  const bool is_go_back_forward = request_info->GetPageTransition() &
+      content::PAGE_TRANSITION_FORWARD_BACK;
+  const bool is_reload = content::PageTransitionCoreTypeIs(
+      request_info->GetPageTransition(), content::PAGE_TRANSITION_RELOAD);
+  if (is_load_url || is_go_back_forward || is_reload) {
+    AwResourceContext* awrc = static_cast<AwResourceContext*>(resource_context);
+    std::string extra_headers = awrc->GetExtraHeaders(request->url());
+    if (!extra_headers.empty()) {
+      net::HttpRequestHeaders headers;
+      headers.AddHeadersFromString(extra_headers);
+      for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext(); ) {
+        request->SetExtraRequestHeaderByName(it.name(), it.value(), true);

[benm (inactive), 2013/12/09 17:49:11]

What's the behaviour in Classic vs. Chromium WebView if we try to overwrite a
header that's already set, and is it consistent? IIRC Classic would overwrite
with the headers provided by loadUrl.

[mnaganov (inactive), 2013/12/10 11:03:31]

That's a good catch! In fact, the old WebView seems to never override existing
headers, so using 'true' here is incorrect. Changed to 'false'.

+      }
+    }
+  }
+}
+
 }  // namespace android_webview