Declarative Web Request: firstPartyForCookiesUrl

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc

 // Copyright (c) 2012 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/extensions/api/declarative_webrequest/webrequest_condition.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
@@ skipping 22 matching lines @@
 const char kConditionCannotBeFulfilled[] = "A condition can never be "
     "fulfilled because its attributes cannot all be tested at the "
     "same time in the request life-cycle.";
 }  // namespace
 
 namespace extensions {
 
 namespace keys = declarative_webrequest_constants;
 
 //
+// DeclarativeWebRequestData
+//
+
+DeclarativeWebRequestData::DeclarativeWebRequestData(net::URLRequest* request,
+                                                     RequestStage stage)
+    : request(request), stage(stage), original_response_headers(NULL) {}
+
+DeclarativeWebRequestData::DeclarativeWebRequestData(
+    net::URLRequest* request,
+    RequestStage stage,
+    const net::HttpResponseHeaders* original_response_headers)
+    : request(request),
+      stage(stage),
+      original_response_headers(original_response_headers) {}
+
+DeclarativeWebRequestData::~DeclarativeWebRequestData() {}
+
+//
 // WebRequestCondition
 //
 
 WebRequestCondition::WebRequestCondition(
     scoped_refptr<URLMatcherConditionSet> url_matcher_conditions,
+    scoped_refptr<URLMatcherConditionSet> first_party_url_matcher_conditions,
     const WebRequestConditionAttributes& condition_attributes)
     : url_matcher_conditions_(url_matcher_conditions),
+      first_party_url_matcher_conditions_(first_party_url_matcher_conditions),
       condition_attributes_(condition_attributes),
       applicable_request_stages_(~0) {
   for (WebRequestConditionAttributes::const_iterator i =
        condition_attributes_.begin(); i != condition_attributes_.end(); ++i) {
     applicable_request_stages_ &= (*i)->GetStages();
   }
 }
 
 WebRequestCondition::~WebRequestCondition() {}
 
 bool WebRequestCondition::IsFulfilled(
-    const std::set<URLMatcherConditionSet::ID>& url_matches,
     const DeclarativeWebRequestData& request_data) const {
   if (!(request_data.stage & applicable_request_stages_)) {
     // A condition that cannot be evaluated is considered as violated.
     return false;
   }
 
-  // Check a UrlFilter attribute if present.
-  if (url_matcher_conditions_.get() &&
-      !ContainsKey(url_matches, url_matcher_conditions_->id()))
+  // Check URL attributes if present.
+  if ((url_matcher_conditions_.get() &&
+       !ContainsKey(request_data.url_match_ids,
+                    url_matcher_conditions_->id())) ||

[Jeffrey Yasskin, 2013/01/24 00:39:17]

nit: I would generally split ||'ed conditions like this into two separate if()
statements, each of which returns false, since it makes each one easier to read.
That's totally a matter of taste though.

[vabr (Chromium), 2013/01/24 18:24:08]

Done. I agree, it's more readable, and since the body of the if statement is
very short, I am willing to risk code duplication. :)

+      (first_party_url_matcher_conditions_.get() &&
+       !ContainsKey(request_data.first_party_url_match_ids,
+                    first_party_url_matcher_conditions_->id())))
     return false;
 
   // All condition attributes must be fulfilled for a fulfilled condition.
   for (WebRequestConditionAttributes::const_iterator i =
-       condition_attributes_.begin(); i != condition_attributes_.end(); ++i) {
+           condition_attributes_.begin();
+       i != condition_attributes_.end(); ++i) {
     if (!(*i)->IsFulfilled(request_data))
       return false;
   }
   return true;
 }
 
+void WebRequestCondition::GetURLMatcherConditionSets(
+    URLMatcherConditionSet::Vector* condition_sets) const {
+  if (url_matcher_conditions_)
+    condition_sets->push_back(url_matcher_conditions_);
+  if (first_party_url_matcher_conditions_)
+    condition_sets->push_back(first_party_url_matcher_conditions_);
+}
+
 // static
 scoped_ptr<WebRequestCondition> WebRequestCondition::Create(
     URLMatcherConditionFactory* url_matcher_condition_factory,
     const base::Value& condition,
     std::string* error) {
   const base::DictionaryValue* condition_dict = NULL;
   if (!condition.GetAsDictionary(&condition_dict)) {
     *error = kExpectedDictionary;
     return scoped_ptr<WebRequestCondition>(NULL);
   }
 
   // Verify that we are dealing with a Condition whose type we understand.
   std::string instance_type;
   if (!condition_dict->GetString(keys::kInstanceTypeKey, &instance_type)) {
     *error = kConditionWithoutInstanceType;
     return scoped_ptr<WebRequestCondition>(NULL);
   }
   if (instance_type != keys::kRequestMatcherType) {
     *error = kExpectedOtherConditionType;
     return scoped_ptr<WebRequestCondition>(NULL);
   }
 
   WebRequestConditionAttributes attributes;
   scoped_refptr<URLMatcherConditionSet> url_matcher_condition_set;
+  scoped_refptr<URLMatcherConditionSet> first_party_url_matcher_condition_set;
 
   for (base::DictionaryValue::Iterator iter(*condition_dict);
        iter.HasNext(); iter.Advance()) {
     const std::string& condition_attribute_name = iter.key();
     const Value& condition_attribute_value = iter.value();
+    const bool name_is_url = condition_attribute_name == keys::kUrlKey;
     if (condition_attribute_name == keys::kInstanceTypeKey) {
       // Skip this.
-    } else if (condition_attribute_name == keys::kUrlKey) {
+    } else if (name_is_url ||
+               condition_attribute_name == keys::kFirstPartyForCookiesUrlKey) {
       const base::DictionaryValue* dict = NULL;
       if (!condition_attribute_value.GetAsDictionary(&dict)) {
         *error = base::StringPrintf(kInvalidTypeOfParamter,
                                     condition_attribute_name.c_str());
       } else {
-        url_matcher_condition_set =
-            URLMatcherFactory::CreateFromURLFilterDictionary(
-                url_matcher_condition_factory, dict, ++g_next_id, error);
+        if (!name_is_url) {

[Jeffrey Yasskin, 2013/01/24 00:39:17]

To avoid double-negatives (the else block happens if !!name_is_url), I'd reverse
the if and else blocks here.

[vabr (Chromium), 2013/01/24 18:24:08]

Done.

+          first_party_url_matcher_condition_set =
+              URLMatcherFactory::CreateFromURLFilterDictionary(
+                  url_matcher_condition_factory, dict, ++g_next_id, error);
+        } else {
+          url_matcher_condition_set =
+              URLMatcherFactory::CreateFromURLFilterDictionary(
+                  url_matcher_condition_factory, dict, ++g_next_id, error);
+        }
       }
     } else if (WebRequestConditionAttribute::IsKnownType(
         condition_attribute_name)) {
       scoped_ptr<WebRequestConditionAttribute> attribute =
           WebRequestConditionAttribute::Create(
               condition_attribute_name,
               &condition_attribute_value,
               error);
       if (attribute.get())
         attributes.push_back(make_linked_ptr(attribute.release()));
     } else {
       *error = base::StringPrintf(kUnknownConditionAttribute,
                                   condition_attribute_name.c_str());
     }
     if (!error->empty())
       return scoped_ptr<WebRequestCondition>(NULL);
   }
 
   scoped_ptr<WebRequestCondition> result(
-      new WebRequestCondition(url_matcher_condition_set, attributes));
+      new WebRequestCondition(url_matcher_condition_set,
+                              first_party_url_matcher_condition_set,
+                              attributes));
 
   if (!result->stages()) {
     *error = kConditionCannotBeFulfilled;
     return scoped_ptr<WebRequestCondition>(NULL);
   }
 
   return result.Pass();
 }
 
 }  // namespace extensions