Make sure that AppCache tests subresource URLrequests against NETWORK whitelist

webkit/appcache/appcache_request_handler.cc

 // Copyright (c) 2011 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 "webkit/appcache/appcache_request_handler.h"
 
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_policy.h"
 #include "webkit/appcache/appcache_url_request_job.h"
 
 namespace appcache {
 
 AppCacheRequestHandler::AppCacheRequestHandler(
     AppCacheHost* host, ResourceType::Type resource_type)
     : host_(host), resource_type_(resource_type),
       is_waiting_for_cache_selection_(false), found_group_id_(0),
       found_cache_id_(0), found_network_namespace_(false),
-      cache_entry_not_found_(false) {
+      cache_entry_not_found_(false), maybe_load_resource_executed_(false) {
   DCHECK(host_);
   host_->AddObserver(this);
 }
 
 AppCacheRequestHandler::~AppCacheRequestHandler() {
   if (host_) {
     storage()->CancelDelegateCallbacks(this);
     host_->RemoveObserver(this);
   }
 }
 
 AppCacheStorage* AppCacheRequestHandler::storage() const {
   DCHECK(host_);
   return host_->service()->storage();
 }
 
 void AppCacheRequestHandler::GetExtraResponseInfo(
     int64* cache_id, GURL* manifest_url) {
   if (job_ && job_->is_delivering_appcache_response()) {
     *cache_id = job_->cache_id();
     *manifest_url = job_->manifest_url();
   }
 }
 
 AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadResource(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) {
+  maybe_load_resource_executed_ = true;
   if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
     return NULL;
 
   // This method can get called multiple times over the life
   // of a request. The case we detect here is having scheduled
   // delivery of a "network response" using a job setup on an
   // earlier call thru this method. To send the request thru
   // to the network involves restarting the request altogether,
   // which will call thru to our interception layer again.
   // This time thru, we return NULL so the request hits the wire.
@@ skipping 32 matching lines @@
 }
 
 AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
     const GURL& location) {
   if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
     return NULL;
   if (is_main_resource())
     return NULL;
+  if (!maybe_load_resource_executed_)

[michaeln, 2012/09/06 19:49:05]

Please add a TODO here points at crbug/121325

[vabr (Chromium), 2012/09/07 08:37:27]

Done.

+    return NULL;
   if (request->url().GetOrigin() == location.GetOrigin())
     return NULL;
 
   DCHECK(!job_);  // our jobs never generate redirects
 
   if (found_fallback_entry_.has_response_id()) {
     // 6.9.6, step 4: If this results in a redirect to another origin,
     // get the resource of the fallback entry.
     job_ = new AppCacheURLRequestJob(request, network_delegate, storage());
     DeliverAppCachedResponse(
         found_fallback_entry_, found_cache_id_, found_group_id_,
         found_manifest_url_,  true, found_namespace_entry_url_);
   } else if (!found_network_namespace_) {
     // 6.9.6, step 6: Fail the resource load.
     job_ = new AppCacheURLRequestJob(request, network_delegate, storage());
     DeliverErrorResponse();
   } else {
     // 6.9.6 step 3 and 5: Fetch the resource normally.
   }
 
   return job_;
 }
 
 AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) {
   if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
     return NULL;
   if (!found_fallback_entry_.has_response_id())
     return NULL;

[vabr (Chromium), 2012/09/06 17:34:21]

I did not add any condition "!maybe_load_resource_executed_" here, because this
path is not influencing the issue in http://crbug.com/141114, and I wanted to
keep my changes minimal.

[michaeln, 2012/09/06 19:49:05]

Ok. Since found_fallback_entry_ will not have anything unless we've gone thru
the MaybeLoadResource, this s/b functionally equivalent w/o the check. I was
looking for this check more as a matter of documenting that we can get here w/o
having gone thru that (but its pretty clear given the data member and all that).

 
   if (request->status().status() == net::URLRequestStatus::CANCELED ||
       request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) {
     // 6.9.6, step 4: But not if the user canceled the download.
     return NULL;
   }
 
   // We don't fallback for responses that we delivered.
   if (job_) {
     DCHECK(!job_->is_delivering_network_response());
@@ skipping 224 matching lines @@
   if (!host_->associated_cache() ||
       !host_->associated_cache()->is_complete()) {
     DeliverNetworkResponse();
     return;
   }
 
   ContinueMaybeLoadSubResource();
 }
 
 }  // namespace appcache