CREDENTIAL: Extend FormData opacity to created Request objects

Source/modules/fetch/Body.cpp

Index: Source/modules/fetch/Body.cpp
diff --git a/Source/modules/fetch/Body.cpp b/Source/modules/fetch/Body.cpp
index bb8c6f0576bb5ec63161f8adc19317fb60b14e7e..e371ab21f16e2e1f850212fbd344533d60e11420 100644
--- a/Source/modules/fetch/Body.cpp
+++ b/Source/modules/fetch/Body.cpp
@@ -116,6 +116,9 @@ ScriptPromise Body::arrayBuffer(ScriptState* scriptState)
     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));
@@ -131,6 +134,9 @@ ScriptPromise Body::blob(ScriptState* scriptState)
     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));
@@ -147,6 +153,9 @@ ScriptPromise Body::json(ScriptState* scriptState)
     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));
@@ -162,6 +171,9 @@ ScriptPromise Body::text(ScriptState* scriptState)
     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));
@@ -186,7 +198,10 @@ bool Body::hasPendingActivity() const
     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();
 }