Reporting: Properly support endpoints with includeSubdomains.

net/reporting/reporting_cache.h

 // Copyright 2017 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 NET_REPORTING_REPORTING_CACHE_H_
 #define NET_REPORTING_REPORTING_CACHE_H_
 
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 89 matching lines @@
 
   // Gets all of the clients in the cache, regardless of origin or group.
   //
   // (Clears any existing data in |*clients_out|.)
   void GetClients(std::vector<const ReportingClient*>* clients_out) const;
 
   // Gets all of the clients configured for a particular origin in a particular
   // group. The returned pointers are only guaranteed to be valid if no calls
   // have been made to |SetClient| or |RemoveEndpoint| in between.
   //
+  // If no origin match is found, the cache will return clients from the most
+  // specific superdomain which contains any clients with includeSubdomains set.
+  // For example, given the origin https://foo.bar.baz.com/, the cache would
+  // prioritize returning each potential match below over the ones below it:
+  //
+  // 1. https://foo.bar.baz.com/ (exact origin match)
+  // 2. https://foo.bar.baz.com:444/ (technically, a superdomain)
+  // 3. https://bar.baz.com/, https://bar.baz.com:444/, etc. (superdomain)
+  // 4. https://baz.com/, https://baz.com:444/, etc. (superdomain)
+  // etc.
+  //
   // (Clears any existing data in |*clients_out|.)
   void GetClientsForOriginAndGroup(
       const url::Origin& origin,
       const std::string& group,
       std::vector<const ReportingClient*>* clients_out) const;
 
   // Removes a set of clients.
   //
   // May invalidate ReportingClient pointers returned by |GetClients| or
   // |GetClientsForOriginAndGroup|.
@@ skipping 21 matching lines @@
 
   bool IsReportPendingForTesting(const ReportingReport* report) const {
     return base::ContainsKey(pending_reports_, report);
   }
 
   bool IsReportDoomedForTesting(const ReportingReport* report) const {
     return base::ContainsKey(doomed_reports_, report);
   }
 
  private:
+  void MaybeAddWildcardClient(const ReportingClient* client);
+
+  void MaybeRemoveWildcardClient(const ReportingClient* client);
+
+  void GetWildcardClientsForDomainAndGroup(
+      const std::string& domain,
+      const std::string& group,
+      std::vector<const ReportingClient*>* clients_out) const;
+
   ReportingContext* context_;
 
   // Owns all clients, keyed by origin, then endpoint URL.
   // (These would be unordered_map, but neither url::Origin nor GURL has a hash
   // function implemented.)
   std::map<url::Origin, std::map<GURL, std::unique_ptr<ReportingClient>>>
       clients_;
 
+  // References but does not own all clients with includeSubdomains set, keyed
+  // by domain name.
+  std::unordered_map<std::string, std::unordered_set<const ReportingClient*>>
+      wildcard_clients_;
+
   // Owns all reports, keyed by const raw pointer for easier lookup.
   std::unordered_map<const ReportingReport*, std::unique_ptr<ReportingReport>>
       reports_;
 
   // Reports that have been marked pending (in use elsewhere and should not be
   // deleted until no longer pending).
   std::unordered_set<const ReportingReport*> pending_reports_;
 
   // Reports that have been marked doomed (would have been deleted, but were
   // pending when the deletion was requested).
   std::unordered_set<const ReportingReport*> doomed_reports_;
 
   DISALLOW_COPY_AND_ASSIGN(ReportingCache);
 };
 
 }  // namespace net
 
 #endif  // NET_REPORTING_REPORTING_CACHE_H_