Adding thirdParty property to RequestMatcher

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.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_attribute.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 34 matching lines @@
 
 WebRequestConditionAttribute::~WebRequestConditionAttribute() {}
 
 // static
 bool WebRequestConditionAttribute::IsKnownType(
     const std::string& instance_type) {
   return
       WebRequestConditionAttributeResourceType::IsMatchingType(instance_type) ||
       WebRequestConditionAttributeContentType::IsMatchingType(instance_type) ||
       WebRequestConditionAttributeResponseHeaders::IsMatchingType(
-          instance_type);
+          instance_type) ||
+      WebRequestConditionAttributeThirdParty::IsMatchingType(instance_type);
 }
 
 // static
 scoped_ptr<WebRequestConditionAttribute>
 WebRequestConditionAttribute::Create(
     const std::string& name,
     const base::Value* value,
     std::string* error) {
   CHECK(value != NULL && error != NULL);
   if (WebRequestConditionAttributeResourceType::IsMatchingType(name)) {
     return WebRequestConditionAttributeResourceType::Create(name, value, error);
   } else if (WebRequestConditionAttributeContentType::IsMatchingType(name)) {
     return WebRequestConditionAttributeContentType::Create(name, value, error);
   } else if (WebRequestConditionAttributeResponseHeaders::IsMatchingType(
       name)) {
     return WebRequestConditionAttributeResponseHeaders::Create(
         name, value, error);
+  } else if (WebRequestConditionAttributeThirdParty::IsMatchingType(name)) {
+    return WebRequestConditionAttributeThirdParty::Create(name, value, error);
   }
 
   *error = ExtensionErrorUtils::FormatErrorMessage(kUnknownConditionAttribute,
                                                    name);
   return scoped_ptr<WebRequestConditionAttribute>(NULL);
 }
 
 //
 // WebRequestConditionAttributeResourceType
 //
@@ skipping 474 matching lines @@
   }
 
   return (positive_ ? passed : !passed);
 }
 
 WebRequestConditionAttribute::Type
 WebRequestConditionAttributeResponseHeaders::GetType() const {
   return CONDITION_RESPONSE_HEADERS;
 }
 
+//
+// WebRequestConditionAttributeThirdParty
+//
+
+WebRequestConditionAttributeThirdParty::
+WebRequestConditionAttributeThirdParty(bool match_third_party)
+    : match_third_party_(match_third_party) {}
+
+WebRequestConditionAttributeThirdParty::
+~WebRequestConditionAttributeThirdParty() {}
+
+// static
+bool WebRequestConditionAttributeThirdParty::IsMatchingType(
+    const std::string& instance_type) {
+  return instance_type == keys::kThirdPartyKey;
+}
+
+// static
+scoped_ptr<WebRequestConditionAttribute>
+WebRequestConditionAttributeThirdParty::Create(
+    const std::string& name,
+    const base::Value* value,
+    std::string* error) {
+  DCHECK(IsMatchingType(name));
+
+  bool third_party = false;  // Dummy value, gets overwritten.
+  if (!value->GetAsBoolean(&third_party)) {
+    *error = ExtensionErrorUtils::FormatErrorMessage(kInvalidValue,
+                                                     keys::kThirdPartyKey);
+    return scoped_ptr<WebRequestConditionAttribute>(NULL);
+  }
+
+  return scoped_ptr<WebRequestConditionAttribute>(
+      new WebRequestConditionAttributeThirdParty(third_party));
+}
+
+int WebRequestConditionAttributeThirdParty::GetStages() const {
+  return ON_BEFORE_REQUEST | ON_BEFORE_SEND_HEADERS | ON_SEND_HEADERS |
+      ON_HEADERS_RECEIVED | ON_AUTH_REQUIRED | ON_BEFORE_REDIRECT |
+      ON_RESPONSE_STARTED | ON_COMPLETED | ON_ERROR;
+}
+
+bool WebRequestConditionAttributeThirdParty::IsFulfilled(
+    const WebRequestRule::RequestData& request_data) const {
+  if (!(request_data.stage & GetStages()))
+    return false;
+
+  DCHECK(request_data.request->first_party_for_cookies().is_valid());

[jochen (gone - plz use gerrit), 2012/09/26 19:50:19]

first_party_for_cookies() is not necessarily valid

[vabr (Chromium), 2012/10/04 11:20:41]

OK, I no longer check it and pass it directly to
RegistryControlledDomainService::SameDomainOrHost.

+  const GURL first_party_origin =
+      request_data.request->first_party_for_cookies().GetOrigin();

[jochen (gone - plz use gerrit), 2012/09/26 19:50:19]

why are you looking at the origin only?

[vabr (Chromium), 2012/10/04 11:20:41]

Looking no more, using RegistryControlledDomainService::SameDomainOrHost.

+
+  const bool is_first_party =
+      first_party_origin == request_data.request->url().GetOrigin();

[jochen (gone - plz use gerrit), 2012/09/26 19:50:19]

You should use
RegistryControlledDomainService::SameDomainOrHost(request_data.request->url(),
request_data.request->first_party_for_cookies()) instead

[vabr (Chromium), 2012/10/04 11:20:41]

Done.

+  return match_third_party_ ? !is_first_party : is_first_party;
+}
+
+WebRequestConditionAttribute::Type
+WebRequestConditionAttributeThirdParty::GetType() const {
+  return CONDITION_THIRD_PARTY;
+}
+
 }  // namespace extensions