Declarative Web Request: firstPartyForCookiesUrl

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.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 <set>
+#include <vector>
 
 #include "base/message_loop.h"
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "chrome/common/extensions/matcher/url_matcher_constants.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace keys = declarative_webrequest_constants;
 namespace keys2 = url_matcher_constants;
 
 TEST(WebRequestConditionTest, CreateCondition) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
+  URLMatcher first_party_matcher;
 
   std::string error;
   scoped_ptr<WebRequestCondition> result;
 
+  std::vector<URLMatcherConditionFactory*> factories;
+  factories.push_back(matcher.condition_factory());
+  factories.push_back(first_party_matcher.condition_factory());
 
   // Test wrong condition name passed.
   error.clear();
   result = WebRequestCondition::Create(
-      matcher.condition_factory(),
+      factories,
       *base::test::ParseJson(
           "{ \"invalid\": \"foobar\", \n"
           "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
           "}"),
       &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 
   // Test wrong datatype in host_suffix.
   error.clear();
   result = WebRequestCondition::Create(
-      matcher.condition_factory(),
+      factories,
       *base::test::ParseJson(
           "{ \n"
           "  \"url\": [], \n"
           "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
           "}"),
       &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 
   // Test success (can we support multiple criteria?)
   error.clear();
   result = WebRequestCondition::Create(
-      matcher.condition_factory(),
+      factories,
       *base::test::ParseJson(
           "{ \n"
           "  \"resourceType\": [\"main_frame\"], \n"
           "  \"url\": { \"hostSuffix\": \"example.com\" }, \n"
+          "  \"firstPartyForCookiesUrl\": { \"hostPrefix\": \"fpfc\"}, \n"
           "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
           "}"),
       &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
 
   URLMatcherConditionSet::Vector url_matcher_condition_set;
-  result->GetURLMatcherConditionSets(&url_matcher_condition_set);
+  result->GetURLMatcherConditionSets(&url_matcher_condition_set, 0);

[battre, 2013/01/21 17:32:08]

check return value? also after line 81?
also check size of url_matcher_condition_set

[vabr (Chromium), 2013/01/21 18:39:29]

Done.

   matcher.AddConditionSets(url_matcher_condition_set);
-  std::set<URLMatcherConditionSet::ID> url_match_ids;
+  url_matcher_condition_set.clear();
+  result->GetURLMatcherConditionSets(&url_matcher_condition_set, 1);
+  first_party_matcher.AddConditionSets(url_matcher_condition_set);
 
   net::TestURLRequestContext context;
   GURL http_url("http://www.example.com");
+  GURL first_party_url("http://fpfc.example.com");
   net::TestURLRequest match_request(http_url, NULL, &context);
-  url_match_ids = matcher.MatchURL(http_url);
-  EXPECT_EQ(1u, url_match_ids.size());
+  std::set<URLMatcherConditionSet::ID> url_match_ids = matcher.MatchURL(
+                                                           http_url);

[battre, 2013/01/21 17:32:08]

nit: in my opinion a strange indentation

[vabr (Chromium), 2013/01/21 18:39:29]

Done. I was playing with the automatic indentation tool. :)

+  std::set<URLMatcherConditionSet::ID> first_party_url_match_ids =
+      first_party_matcher.MatchURL(first_party_url);
+  url_match_ids.insert(first_party_url_match_ids.begin(),
+                       first_party_url_match_ids.end());
+  EXPECT_EQ(2u, url_match_ids.size());
   content::ResourceRequestInfo::AllocateForTesting(&match_request,
       ResourceType::MAIN_FRAME, NULL, -1, -1);
   EXPECT_TRUE(result->IsFulfilled(
       url_match_ids,
       DeclarativeWebRequestData(&match_request, ON_BEFORE_REQUEST)));
 
   GURL https_url("https://www.example.com");
   net::TestURLRequest wrong_resource_type(https_url, NULL, &context);
   url_match_ids = matcher.MatchURL(https_url);
+  url_match_ids.insert(first_party_url_match_ids.begin(),
+                       first_party_url_match_ids.end());
   // Make sure IsFulfilled does not fail because of URL matching.
-  EXPECT_EQ(1u, url_match_ids.size());
+  EXPECT_EQ(2u, url_match_ids.size());
   content::ResourceRequestInfo::AllocateForTesting(&wrong_resource_type,
       ResourceType::SUB_FRAME, NULL, -1, -1);
   EXPECT_FALSE(result->IsFulfilled(
       url_match_ids,
       DeclarativeWebRequestData(&wrong_resource_type, ON_BEFORE_REQUEST)));
 }
 
 // Conditions without UrlFilter attributes need to be independent of URL
 // matching results. We test here that:
 //   1. A non-empty condition without UrlFilter attributes is fulfilled iff its
 //      attributes are fulfilled.
 //   2. An empty condition (in particular, without UrlFilter attributes) is
 //      always fulfilled.
 TEST(WebRequestConditionTest, NoUrlAttributes) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
   std::string error;
 
+  std::vector<URLMatcherConditionFactory*> factories;
+  factories.push_back(matcher.condition_factory());
+  // The second factory is usually from a different matcher, but in this test
+  // we don't care, since we never use it.
+  factories.push_back(matcher.condition_factory());
+
   // The empty condition.
   error.clear();
   scoped_ptr<WebRequestCondition> condition_empty = WebRequestCondition::Create(
-      matcher.condition_factory(),
+      factories,
       *base::test::ParseJson(
           "{ \n"
           "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
           "}"),
       &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(condition_empty.get());
 
   // A condition without a UrlFilter attribute, which is always true.
   error.clear();
   scoped_ptr<WebRequestCondition> condition_no_url_true =
       WebRequestCondition::Create(
-          matcher.condition_factory(),
+          factories,
           *base::test::ParseJson(
               "{ \n"
               "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
               // There is no "1st party for cookies" URL in the requests below,
               // therefore all requests are considered first party for cookies.
               "  \"thirdPartyForCookies\": false, \n"
               "}"),
           &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(condition_no_url_true.get());
 
   // A condition without a UrlFilter attribute, which is always false.
   error.clear();
   scoped_ptr<WebRequestCondition> condition_no_url_false =
       WebRequestCondition::Create(
-          matcher.condition_factory(),
+          factories,
           *base::test::ParseJson(
               "{ \n"
               "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
               "  \"thirdPartyForCookies\": true, \n"
               "}"),
           &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(condition_no_url_false.get());
 
   net::TestURLRequestContext context;
@@ skipping 16 matching lines @@
   EXPECT_TRUE(condition_empty->IsFulfilled(
       dummy_match_set,
       DeclarativeWebRequestData(&https_request, ON_BEFORE_REQUEST)));
 }
 
 TEST(WebRequestConditionTest, CreateConditionSet) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
+  std::vector<URLMatcherConditionFactory*> factories;
+  factories.push_back(matcher.condition_factory());
+  // The second factory is usually from a different matcher, but in this test
+  // we don't care, since we never use it.
+  factories.push_back(matcher.condition_factory());
+
   WebRequestConditionSet::AnyVector conditions;
   conditions.push_back(linked_ptr<base::Value>(base::test::ParseJson(
       "{ \n"
       "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
       "  \"url\": { \n"
       "    \"hostSuffix\": \"example.com\", \n"
       "    \"schemes\": [\"http\"], \n"
       "  }, \n"
       "}").release()));
   conditions.push_back(linked_ptr<base::Value>(base::test::ParseJson(
       "{ \n"
       "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
       "  \"url\": { \n"
       "    \"hostSuffix\": \"example.com\", \n"
       "    \"hostPrefix\": \"www\", \n"
       "    \"schemes\": [\"https\"], \n"
       "  }, \n"
       "}").release()));
 
   // Test insertion
   std::string error;
   scoped_ptr<WebRequestConditionSet> result =
-      WebRequestConditionSet::Create(matcher.condition_factory(),
-                                     conditions, &error);
+      WebRequestConditionSet::Create(factories, conditions, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
   EXPECT_EQ(2u, result->conditions().size());
 
   // Tell the URLMatcher about our shiny new patterns.
   URLMatcherConditionSet::Vector url_matcher_condition_set;
-  result->GetURLMatcherConditionSets(&url_matcher_condition_set);
+  result->GetURLMatcherConditionSets(&url_matcher_condition_set, 0);
   matcher.AddConditionSets(url_matcher_condition_set);
 
   std::set<URLMatcherConditionSet::ID> url_match_ids;
 
   // Test that the result is correct and matches http://www.example.com and
   // https://www.example.com
   GURL http_url("http://www.example.com");
   net::TestURLRequestContext context;
   net::TestURLRequest http_request(http_url, NULL, &context);
   url_match_ids = matcher.MatchURL(http_url);
@@ skipping 21 matching lines @@
       -1,
       url_match_ids,
       DeclarativeWebRequestData(&https_foo_request, ON_BEFORE_REQUEST)));
 }
 
 TEST(WebRequestConditionTest, TestPortFilter) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
+  std::vector<URLMatcherConditionFactory*> factories;
+  factories.push_back(matcher.condition_factory());
+  // The second factory is usually from a different matcher, but in this test
+  // we don't care, since we never use it.
+  factories.push_back(matcher.condition_factory());
+
   WebRequestConditionSet::AnyVector conditions;
   conditions.push_back(linked_ptr<base::Value>(base::test::ParseJson(
       "{ \n"
       "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
       "  \"url\": { \n"
       "    \"ports\": [80, [1000, 1010]], \n"  // Allow 80;1000-1010.
       "    \"hostSuffix\": \"example.com\", \n"
       "  }, \n"
       "}").release()));
 
   // Test insertion
   std::string error;
   scoped_ptr<WebRequestConditionSet> result =
-      WebRequestConditionSet::Create(matcher.condition_factory(),
-                                     conditions, &error);
+      WebRequestConditionSet::Create(factories, conditions, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(result.get());
   EXPECT_EQ(1u, result->conditions().size());
 
   // Tell the URLMatcher about our shiny new patterns.
   URLMatcherConditionSet::Vector url_matcher_condition_set;
-  result->GetURLMatcherConditionSets(&url_matcher_condition_set);
+  result->GetURLMatcherConditionSets(&url_matcher_condition_set, 0);
   matcher.AddConditionSets(url_matcher_condition_set);
 
   std::set<URLMatcherConditionSet::ID> url_match_ids;
 
   // Test various URLs.
   GURL http_url("http://www.example.com");
   net::TestURLRequestContext context;
   net::TestURLRequest http_request(http_url, NULL, &context);
   url_match_ids = matcher.MatchURL(http_url);
   ASSERT_EQ(1u, url_match_ids.size());
@@ skipping 18 matching lines @@
 // the response header. The Create() method should fail and complain that it is
 // impossible that both conditions are fulfilled at the same time.
 TEST(WebRequestConditionTest, ConditionsWithConflictingStages) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
   URLMatcher matcher;
 
   std::string error;
   scoped_ptr<WebRequestCondition> result;
 
-  DictionaryValue condition_value;
-  condition_value.SetString(keys::kInstanceTypeKey, keys::kRequestMatcherType);
-
+  std::vector<URLMatcherConditionFactory*> factories;
+  factories.push_back(matcher.condition_factory());
+  // The second factory is usually from a different matcher, but in this test
+  // we don't care, since we never use it.
+  factories.push_back(matcher.condition_factory());
 
   // Test error on incompatible application stages for involved attributes.
   error.clear();
   result = WebRequestCondition::Create(
-      matcher.condition_factory(),
+      factories,
       *base::test::ParseJson(
           "{ \n"
           "  \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n"
           // Pass a JS array with one empty object to each of the header
           // filters.
           "  \"requestHeaders\": [{}], \n"
           "  \"responseHeaders\": [{}], \n"
           "}"),
       &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 }
 
 }  // namespace extensions