CREDENTIAL: Rework the integration with Fetch (1/2)

third_party/WebKit/Source/modules/fetch/FetchRequestData.h

 // 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.
 
 #ifndef FetchRequestData_h
 #define FetchRequestData_h
 
 #include "platform/heap/Handle.h"
+#include "platform/network/EncodedFormData.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/Referrer.h"
 #include "platform/weborigin/ReferrerPolicy.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRequest.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class BodyStreamBuffer;
 class ExecutionContext;
 class FetchHeaderList;
+class PasswordCredential;
 class SecurityOrigin;
 class WebServiceWorkerRequest;
 
 class FetchRequestData final : public GarbageCollectedFinalized<FetchRequestData> {
     WTF_MAKE_NONCOPYABLE(FetchRequestData);
 public:
     enum Tainting { BasicTainting, CORSTainting, OpaqueTainting };
 
     static FetchRequestData* create();
     static FetchRequestData* create(ExecutionContext*, const WebServiceWorkerRequest&);
@@ skipping 15 matching lines @@
     bool sameOriginDataURLFlag() { return m_sameOriginDataURLFlag; }
     void setSameOriginDataURLFlag(bool flag) { m_sameOriginDataURLFlag = flag; }
     const Referrer& referrer() const { return m_referrer; }
     void setReferrer(const Referrer& r) { m_referrer = r; }
     const AtomicString& referrerString() const { return m_referrer.referrer; }
     void setReferrerString(const AtomicString& s) { m_referrer.referrer = s; }
     ReferrerPolicy getReferrerPolicy() const { return m_referrer.referrerPolicy; }
     void setReferrerPolicy(ReferrerPolicy p) { m_referrer.referrerPolicy = p; }
     void setMode(WebURLRequest::FetchRequestMode mode) { m_mode = mode; }
     WebURLRequest::FetchRequestMode mode() const { return m_mode; }
     void setCredentials(WebURLRequest::FetchCredentialsMode credentials) { m_credentials = credentials; }

[horo, 2016/04/06 03:39:48]

|m_attachedCredential| must be cleared when |credentials| is not
FetchCredentialsModePassword.

Otherwise this test fails.

promise_test(_ => {
    var r1 = new Request('./resources/echo-post.php', { credentials: c, method:
'POST' });
    return fetch(new Request(r1, { credentials: 'same-origin' }))
        .then(resp => resp.text())
        .then(t => assert_equals(t, ""));
}, "Override credentials");

[Mike West, 2016/04/06 05:43:13]

Good call. Added this test, and cleared the attached credentials.

     WebURLRequest::FetchCredentialsMode credentials() const { return m_credentials; }
     void setRedirect(WebURLRequest::FetchRedirectMode redirect) { m_redirect = redirect; }
     WebURLRequest::FetchRedirectMode redirect() const { return m_redirect; }
     void setResponseTainting(Tainting tainting) { m_responseTainting = tainting; }
     Tainting responseTainting() const { return m_responseTainting; }
     FetchHeaderList* headerList() const { return m_headerList.get(); }
     void setHeaderList(FetchHeaderList* headerList) { m_headerList = headerList; }
     BodyStreamBuffer* buffer() const { return m_buffer; }
     // Call Request::refreshBody() after calling setBuffer().
     void setBuffer(BodyStreamBuffer* buffer) { m_buffer = buffer; }
     String mimeType() const { return m_mimeType; }
     void setMIMEType(const String& type) { m_mimeType = type; }
     String integrity() const { return m_integrity; }
     void setIntegrity(const String& integrity) { m_integrity = integrity; }
+    PassRefPtr<EncodedFormData> attachedCredential() const { return m_attachedCredential; }
+    void setAttachedCredential(PassRefPtr<EncodedFormData> attachedCredential) { m_attachedCredential = attachedCredential; }
 
     // We use these strings instead of "no-referrer" and "client" in the spec.
     static AtomicString noReferrerString() { return AtomicString(); }
     static AtomicString clientReferrerString() { return AtomicString("about:client"); }
 
     DECLARE_TRACE();
 
 private:
     FetchRequestData();
 
@@ skipping 16 matching lines @@
     // FIXME: Support m_synchronousFlag;
     WebURLRequest::FetchRequestMode m_mode;
     WebURLRequest::FetchCredentialsMode m_credentials;
     WebURLRequest::FetchRedirectMode m_redirect;
     // FIXME: Support m_useURLCredentialsFlag;
     // FIXME: Support m_redirectCount;
     Tainting m_responseTainting;
     Member<BodyStreamBuffer> m_buffer;
     String m_mimeType;
     String m_integrity;
+    RefPtr<EncodedFormData> m_attachedCredential;
 };
 
 } // namespace blink
 
 #endif // FetchRequestData_h