Include all server redirects in referrer chain

chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.cc

 // Copyright 2016 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 "chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
@@ skipping 147 matching lines @@
 
 void SafeBrowsingNavigationObserverManager::RecordHostToIpMapping(
     const std::string& host,
     const std::string& ip) {
   auto insert_result = host_to_ip_map_.insert(
       std::make_pair(host, std::vector<ResolvedIPAddress>()));
   if (!insert_result.second) {
     // host_to_ip_map already contains this key.
     // If this IP is already in the vector, we update its timestamp.
     for (auto& vector_entry : insert_result.first->second) {
-      if (vector_entry.ip == host) {
+      if (vector_entry.ip == ip) {
         vector_entry.timestamp = base::Time::Now();
         return;
       }
     }
   }
   // If this is a new IP of this host, and we added to the end of the vector.
   insert_result.first->second.push_back(
       ResolvedIPAddress(base::Time::Now(), ip));
 }
 
@@ skipping 118 matching lines @@
   NavigationEvent nav_event;
   if (rfh) {
     nav_event.source_url = SafeBrowsingNavigationObserverManager::ClearEmptyRef(
         rfh->GetLastCommittedURL());
   }
   nav_event.source_tab_id = SessionTabHelper::IdForTab(source_contents);
   nav_event.source_main_frame_url =
       SafeBrowsingNavigationObserverManager::ClearEmptyRef(
           source_contents->GetLastCommittedURL());
   nav_event.original_request_url = target_url;
-  nav_event.destination_url = target_url;
   nav_event.target_tab_id = SessionTabHelper::IdForTab(target_contents);
   nav_event.frame_id = rfh ? rfh->GetFrameTreeNodeId() : -1;
   auto it = user_gesture_map_.find(source_contents);
   if (it != user_gesture_map_.end() &&
       !SafeBrowsingNavigationObserverManager::IsUserGestureExpired(
           it->second)) {
     nav_event.is_user_initiated = true;
     OnUserGestureConsumed(it->first, it->second);
   } else {
     nav_event.is_user_initiated = false;
@@ skipping 72 matching lines @@
   GURL search_url =
       target_url.is_empty() ? target_main_frame_url : target_url;
   auto it = navigation_map_.find(search_url);
   if (it == navigation_map_.end())
     return nullptr;
 
   // Since navigation events are recorded in chronological order, we traverse
   // the vector in reverse order to get the latest match.
   for (auto rit = it->second.rbegin(); rit != it->second.rend(); ++rit) {
     // If tab id is not valid, we only compare url, otherwise we compare both.
-    if (rit->destination_url == search_url &&
+    if (rit->GetDestinationUrl() == search_url &&
         (target_tab_id == -1 || rit->target_tab_id == target_tab_id)) {
       // If both source_url and source_main_frame_url are empty, and this
       // navigation is not triggered by user, a retargeting navigation probably
       // causes this navigation. In this case, we skip this navigation event and
       // looks for the retargeting navigation event.
       if (rit->source_url.is_empty() && rit->source_main_frame_url.is_empty() &&
           !rit->is_user_initiated) {
         // If there is a server redirection immediately after retargeting, we
         // need to adjust our search url to the original request.
         if (rit->has_server_redirect){
           NavigationEvent* retargeting_nav_event =
               FindNavigationEvent(rit->original_request_url,
                                   GURL(),
                                   rit->target_tab_id);
           if (!retargeting_nav_event)
             return nullptr;
           // Adjust retargeting navigation event's attributes.
           retargeting_nav_event->has_server_redirect = true;
-          retargeting_nav_event->destination_url = search_url;
+          retargeting_nav_event->server_redirect_urls.push_back(
+              std::move(search_url));
           return retargeting_nav_event;
         } else {
           continue;
         }
       } else {
         return &*rit;
       }
     }
   }
   return nullptr;
 }
 
 void SafeBrowsingNavigationObserverManager::AddToReferrerChain(
     ReferrerChain* referrer_chain,
     NavigationEvent* nav_event,
     ReferrerChainEntry::URLType type) {
   std::unique_ptr<ReferrerChainEntry> referrer_chain_entry =
       base::MakeUnique<ReferrerChainEntry>();
-  referrer_chain_entry->set_url(nav_event->destination_url.spec());
+  const GURL destination_url = nav_event->GetDestinationUrl();
+  referrer_chain_entry->set_url(destination_url.spec());
   referrer_chain_entry->set_type(type);
-  auto ip_it = host_to_ip_map_.find(nav_event->destination_url.host());
+  auto ip_it = host_to_ip_map_.find(destination_url.host());
   if (ip_it != host_to_ip_map_.end()) {
     for (ResolvedIPAddress entry : ip_it->second) {
       referrer_chain_entry->add_ip_addresses(entry.ip);
     }
   }
   // Since we only track navigation to landing referrer, we will not log the
   // referrer of the landing referrer page.
   if (type != ReferrerChainEntry::LANDING_REFERRER) {
     referrer_chain_entry->set_referrer_url(nav_event->source_url.spec());
     referrer_chain_entry->set_referrer_main_frame_url(
         nav_event->source_main_frame_url.spec());
   }
   referrer_chain_entry->set_is_retargeting(nav_event->source_tab_id !=
                                           nav_event->target_tab_id);
   referrer_chain_entry->set_navigation_time_msec(
       nav_event->last_updated.ToJavaTime());
+  if (nav_event->has_server_redirect) {
+    referrer_chain_entry->add_server_redirect_chain(
+        nav_event->original_request_url.spec());
+    for (const GURL& redirect: nav_event->server_redirect_urls)
+      referrer_chain_entry->add_server_redirect_chain(redirect.spec());
+  }
   referrer_chain->push_back(std::move(referrer_chain_entry));
 }
 
 void SafeBrowsingNavigationObserverManager::GetRemainingReferrerChain(
     NavigationEvent* last_nav_event_traced,
     int current_user_gesture_count,
     int user_gesture_count_limit,
     ReferrerChain* out_referrer_chain,
     SafeBrowsingNavigationObserverManager::AttributionResult* out_result) {
 
@@ skipping 34 matching lines @@
 
     AddToReferrerChain(out_referrer_chain, last_nav_event_traced,
                        GetURLTypeAndAdjustAttributionResult(
                           current_user_gesture_count ==
                               user_gesture_count_limit,
                           out_result));
   }
 }
 
 }  // namespace safe_browsing