CREDENTIAL: Extend FormData opacity to created Request objects

Source/modules/fetch/Body.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/fetch/Body.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 98 matching lines @@
 
     // When the main thread sends a V8::TerminateExecution() signal to a worker
     // thread, any V8 API on the worker thread starts returning an empty
     // handle. This can happen in Body::readAsync. To avoid the situation, we
     // first check the ExecutionContext and return immediately if it's already
     // gone (which means that the V8::TerminateExecution() signal has been sent
     // to this worker thread).
     if (!scriptState->executionContext())
         return ScriptPromise();
 
+    if (m_opaque)
+        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "The body is opaque."));
+
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsArrayBuffer(), new BodyArrayBufferConsumer(resolver));
     return promise;
 }
 
 ScriptPromise Body::blob(ScriptState* scriptState)
 {
     if (bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
+    if (m_opaque)

[philipj_slow, 2015/09/02 12:12:48]

The monkey patching says that this step should happen first, before everything
required by the Fetch spec. Not sure if it's possible to observe the difference,
though.

[Mike West, 2015/09/02 13:17:42]

That's fair. We should do this before the `bodyUsed()` check. You'll get a
TypeError either way, but I guess you should get this message first. :)

+        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "The body is opaque."));
+
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsBlobHandle(mimeType()), new BodyBlobConsumer(resolver));
     return promise;
 
 }
 
 ScriptPromise Body::json(ScriptState* scriptState)
 {
     if (bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
+    if (m_opaque)
+        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "The body is opaque."));
+
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsString(), new BodyJsonConsumer(resolver));
     return promise;
 }
 
 ScriptPromise Body::text(ScriptState* scriptState)
 {
     if (bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
+    if (m_opaque)
+        return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "The body is opaque."));
+
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsString(), new BodyTextConsumer(resolver));
     return promise;
 }
 
 ReadableByteStream* Body::body()
 {
     UseCounter::count(executionContext(), UseCounter::FetchBodyStream);
     return bodyBuffer()->stream();
 }
 
 bool Body::bodyUsed()
 {
     return m_bodyPassed || body()->isLocked();
 }
 
 bool Body::hasPendingActivity() const
 {
     if (executionContext()->activeDOMObjectsAreStopped())
         return false;
     return bodyBuffer()->hasPendingActivity();
 }
 
-Body::Body(ExecutionContext* context) : ActiveDOMObject(context), m_bodyPassed(false)
+Body::Body(ExecutionContext* context)
+    : ActiveDOMObject(context)
+    , m_bodyPassed(false)
+    , m_opaque(false)
 {
     suspendIfNeeded();
 }
 
 } // namespace blink