DevTools: Show redirects from navigator.sendBeacon()

third_party/WebKit/Source/core/loader/PingLoader.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 202 matching lines @@
   void timeout(TimerBase*);
 
   void didFailLoading(LocalFrame*);
 
   WeakMember<LocalFrame> m_frame;
   std::unique_ptr<WebURLLoader> m_loader;
   Timer<PingLoaderImpl> m_timeout;
   String m_url;
   unsigned long m_identifier;
   SelfKeepAlive<PingLoaderImpl> m_keepAlive;
+  AtomicString m_initiator;
 
   bool m_isBeacon;
 
   RefPtr<SecurityOrigin> m_origin;
   CORSEnabled m_corsMode;
 };
 
 PingLoaderImpl::PingLoaderImpl(LocalFrame* frame,
                                ResourceRequest& request,
                                const AtomicString& initiator,
                                StoredCredentials credentialsAllowed,
                                bool isBeacon)
     : m_frame(frame),
       m_timeout(this, &PingLoaderImpl::timeout),
       m_url(request.url()),
       m_identifier(createUniqueIdentifier()),
       m_keepAlive(this),
+      m_initiator(initiator),
       m_isBeacon(isBeacon),
       m_origin(frame->document()->getSecurityOrigin()),
       m_corsMode(IsCORSEnabled) {
   const AtomicString contentType = request.httpContentType();
   if (!contentType.isNull() &&
       FetchUtils::isSimpleHeader(AtomicString("content-type"), contentType))
     m_corsMode = NotCORSEnabled;
 
   frame->loader().client()->didDispatchPingLoader(request.url());
 
@@ skipping 33 matching lines @@
     m_loader->cancel();
     m_loader = nullptr;
   }
   m_timeout.stop();
   m_keepAlive.clear();
 }
 
 bool PingLoaderImpl::willFollowRedirect(
     WebURLRequest& passedNewRequest,
     const WebURLResponse& passedRedirectResponse) {
-  if (!m_isBeacon)
-    return true;
+  if (m_isBeacon && m_corsMode == IsCORSEnabled) {
+    DCHECK(passedNewRequest.allowStoredCredentials());
 
-  if (m_corsMode == NotCORSEnabled)
-    return true;
+    ResourceRequest& newRequest(passedNewRequest.toMutableResourceRequest());
+    const ResourceResponse& redirectResponse(
+        passedRedirectResponse.toResourceResponse());
 
-  DCHECK(passedNewRequest.allowStoredCredentials());
+    DCHECK(!newRequest.isNull());
+    DCHECK(!redirectResponse.isNull());
 
-  ResourceRequest& newRequest(passedNewRequest.toMutableResourceRequest());
-  const ResourceResponse& redirectResponse(
-      passedRedirectResponse.toResourceResponse());
+    String errorDescription;
+    ResourceLoaderOptions options;
+    // TODO(tyoshino): Save updated data in options.securityOrigin and pass it
+    // on the next time.
+    if (!CrossOriginAccessControl::handleRedirect(
+            m_origin, newRequest, redirectResponse, AllowStoredCredentials,
+            options, errorDescription)) {
+      if (m_frame) {
+        if (m_frame->document()) {
+          m_frame->document()->addConsoleMessage(ConsoleMessage::create(
+              JSMessageSource, ErrorMessageLevel, errorDescription));
+        }
+      }
+      // Cancel the load and self destruct.
+      dispose();
 
-  DCHECK(!newRequest.isNull());
-  DCHECK(!redirectResponse.isNull());
-
-  String errorDescription;
-  ResourceLoaderOptions options;
-  // TODO(tyoshino): Save updated data in options.securityOrigin and pass it
-  // on the next time.
-  if (!CrossOriginAccessControl::handleRedirect(
-          m_origin, newRequest, redirectResponse, AllowStoredCredentials,
-          options, errorDescription)) {
-    if (m_frame) {
-      if (m_frame->document()) {
-        m_frame->document()->addConsoleMessage(ConsoleMessage::create(
-            JSMessageSource, ErrorMessageLevel, errorDescription));
-      }
+      return false;
     }
-    // Cancel the load and self destruct.
-    dispose();
-
-    return false;
   }
   // FIXME: http://crbug.com/427429 is needed to correctly propagate updates of
   // Origin: following this successful redirect.
 
+  if (m_frame && m_frame->document()) {

[allada, 2016/12/20 02:35:54]

nit: I am not sure about code style for this area, but it is not consistent with
the section on line 312. I will defer to tyoshino@ for guidance.

[ahmetemirercin, 2016/12/20 07:09:07]

It seems line 312 is result of this refactoring but could be shortened.

https://chromium.googlesource.com/chromium/src/+/89aaa753cac97aa76612a34dcff6...

+    FetchInitiatorInfo initiatorInfo;
+    initiatorInfo.name = m_initiator;
+    FetchContext& fetchContext = m_frame->document()->fetcher()->context();
+    fetchContext.dispatchWillSendRequest(
+        m_identifier, passedNewRequest.toMutableResourceRequest(),
+        passedRedirectResponse.toResourceResponse(), initiatorInfo);
+  }
+
   return true;
 }
 
 void PingLoaderImpl::didReceiveResponse(const WebURLResponse& response) {
   if (m_frame) {
     TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                  InspectorResourceFinishEvent::data(m_identifier, 0, true));
     const ResourceResponse& resourceResponse = response.toResourceResponse();
     InspectorInstrumentation::didReceiveResourceResponse(
         m_frame, m_identifier, 0, resourceResponse, 0);
@@ skipping 213 matching lines @@
 bool PingLoader::sendBeacon(LocalFrame* frame,
                             int allowance,
                             const KURL& beaconURL,
                             Blob* data,
                             int& payloadLength) {
   BeaconBlob beacon(data);
   return sendBeaconCommon(frame, allowance, beaconURL, beacon, payloadLength);
 }
 
 }  // namespace blink