Service Worker: Cache.put() consumes request/response bodies

Source/modules/serviceworkers/Cache.cpp

 // 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 "config.h"
 #include "modules/serviceworkers/Cache.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 201 matching lines @@
 }
 
 ScriptPromise Cache::deleteFunction(ScriptState* scriptState, const String& requestString, const CacheQueryOptions& options, ExceptionState& exceptionState)
 {
     Request* request = Request::create(scriptState->executionContext(), requestString, exceptionState);
     if (exceptionState.hadException())
         return ScriptPromise();
     return deleteImpl(scriptState, request, options);
 }
 
-ScriptPromise Cache::put(ScriptState* scriptState, Request* request, Response* response)
+ScriptPromise Cache::put(ScriptState* scriptState, Request* request, Response* response, ExceptionState& exceptionState)
 {
+    if (request->hasBody() && request->bodyUsed()) {
+        exceptionState.throwTypeError("The Request's body has already been used.");
+        return ScriptPromise();
+    }
+
+    if (response->bodyUsed()) {
+        exceptionState.throwTypeError("The Response's body has already been used.");
+        return ScriptPromise();
+    }
+
+    if (request->hasBody())
+        request->setBodyUsed();
+    response->setBodyUsed();

[bkelly, 2014/11/07 20:35:19]

While it will be a somewhat rare case, it is possible to have a response without
a body.  So I think you want:

  if (response->hasBody())
    response->setBodyUsed();

+
     return putImpl(scriptState, request, response);
 }
 
 ScriptPromise Cache::put(ScriptState* scriptState, const String& requestString, Response* response, ExceptionState& exceptionState)
 {
     Request* request = Request::create(scriptState->executionContext(), requestString, exceptionState);
     if (exceptionState.hadException())
         return ScriptPromise();
+
+    if (response->bodyUsed()) {
+        exceptionState.throwTypeError("The Response's body has already been used.");
+        return ScriptPromise();
+    }
+    response->setBodyUsed();

[bkelly, 2014/11/07 20:35:19]

Likewise, check hasBody() here as well.

+
     return putImpl(scriptState, request, response);
 }
 
 ScriptPromise Cache::keys(ScriptState* scriptState)
 {
     return keysImpl(scriptState);
 }
 
 ScriptPromise Cache::keys(ScriptState* scriptState, Request* request, const CacheQueryOptions& options)
 {
@@ skipping 105 matching lines @@
     WebServiceWorkerRequest webRequest;
     request->populateWebServiceWorkerRequest(webRequest);
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     const ScriptPromise promise = resolver->promise();
     m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQueryParams(options));
     return promise;
 }
 
 } // namespace blink