Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(488)

Side by Side Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc

Issue 11414230: Declarative Web Request: firstPartyForCookiesUrl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Back to one matcher Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion.h" 5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 22 matching lines...) Expand all
33 const char kConditionCannotBeFulfilled[] = "A condition can never be " 33 const char kConditionCannotBeFulfilled[] = "A condition can never be "
34 "fulfilled because its attributes cannot all be tested at the " 34 "fulfilled because its attributes cannot all be tested at the "
35 "same time in the request life-cycle."; 35 "same time in the request life-cycle.";
36 } // namespace 36 } // namespace
37 37
38 namespace extensions { 38 namespace extensions {
39 39
40 namespace keys = declarative_webrequest_constants; 40 namespace keys = declarative_webrequest_constants;
41 41
42 // 42 //
43 // DeclarativeWebRequestData
44 //
45
46 DeclarativeWebRequestData::DeclarativeWebRequestData(net::URLRequest* request,
47 RequestStage stage)
48 : request(request), stage(stage), original_response_headers(NULL) {}
49
50 DeclarativeWebRequestData::DeclarativeWebRequestData(
51 net::URLRequest* request,
52 RequestStage stage,
53 const net::HttpResponseHeaders* original_response_headers)
54 : request(request),
55 stage(stage),
56 original_response_headers(original_response_headers) {}
57
58 DeclarativeWebRequestData::~DeclarativeWebRequestData() {}
59
60 //
43 // WebRequestCondition 61 // WebRequestCondition
44 // 62 //
45 63
46 WebRequestCondition::WebRequestCondition( 64 WebRequestCondition::WebRequestCondition(
47 scoped_refptr<URLMatcherConditionSet> url_matcher_conditions, 65 scoped_refptr<URLMatcherConditionSet> url_matcher_conditions,
66 scoped_refptr<URLMatcherConditionSet> first_party_url_matcher_conditions,
48 const WebRequestConditionAttributes& condition_attributes) 67 const WebRequestConditionAttributes& condition_attributes)
49 : url_matcher_conditions_(url_matcher_conditions), 68 : url_matcher_conditions_(url_matcher_conditions),
69 first_party_url_matcher_conditions_(first_party_url_matcher_conditions),
50 condition_attributes_(condition_attributes), 70 condition_attributes_(condition_attributes),
51 applicable_request_stages_(~0) { 71 applicable_request_stages_(~0) {
52 for (WebRequestConditionAttributes::const_iterator i = 72 for (WebRequestConditionAttributes::const_iterator i =
53 condition_attributes_.begin(); i != condition_attributes_.end(); ++i) { 73 condition_attributes_.begin(); i != condition_attributes_.end(); ++i) {
54 applicable_request_stages_ &= (*i)->GetStages(); 74 applicable_request_stages_ &= (*i)->GetStages();
55 } 75 }
56 } 76 }
57 77
58 WebRequestCondition::~WebRequestCondition() {} 78 WebRequestCondition::~WebRequestCondition() {}
59 79
60 bool WebRequestCondition::IsFulfilled( 80 bool WebRequestCondition::IsFulfilled(
61 const std::set<URLMatcherConditionSet::ID>& url_matches, 81 const std::set<URLMatcherConditionSet::ID>& /*url_matches*/,
62 const DeclarativeWebRequestData& request_data) const { 82 const DeclarativeWebRequestData& request_data) const {
63 if (!(request_data.stage & applicable_request_stages_)) { 83 if (!(request_data.stage & applicable_request_stages_)) {
64 // A condition that cannot be evaluated is considered as violated. 84 // A condition that cannot be evaluated is considered as violated.
65 return false; 85 return false;
66 } 86 }
67 87
68 // Check a UrlFilter attribute if present. 88 // Check URL attributes if present.
69 if (url_matcher_conditions_.get() && 89 if ((url_matcher_conditions_.get() &&
70 !ContainsKey(url_matches, url_matcher_conditions_->id())) 90 !ContainsKey(request_data.url_match_ids,
91 url_matcher_conditions_->id())) ||
92 (first_party_url_matcher_conditions_.get() &&
93 !ContainsKey(request_data.first_party_url_match_ids,
94 first_party_url_matcher_conditions_->id())))
71 return false; 95 return false;
72 96
73 // All condition attributes must be fulfilled for a fulfilled condition. 97 // All condition attributes must be fulfilled for a fulfilled condition.
74 for (WebRequestConditionAttributes::const_iterator i = 98 for (WebRequestConditionAttributes::const_iterator i =
75 condition_attributes_.begin(); i != condition_attributes_.end(); ++i) { 99 condition_attributes_.begin();
100 i != condition_attributes_.end(); ++i) {
76 if (!(*i)->IsFulfilled(request_data)) 101 if (!(*i)->IsFulfilled(request_data))
77 return false; 102 return false;
78 } 103 }
79 return true; 104 return true;
80 } 105 }
81 106
107 void WebRequestCondition::GetURLMatcherConditionSets(
108 URLMatcherConditionSet::Vector* condition_sets) const {
109 if (url_matcher_conditions_)
110 condition_sets->push_back(url_matcher_conditions_);
111 if (first_party_url_matcher_conditions_)
112 condition_sets->push_back(first_party_url_matcher_conditions_);
113 }
114
82 // static 115 // static
83 scoped_ptr<WebRequestCondition> WebRequestCondition::Create( 116 scoped_ptr<WebRequestCondition> WebRequestCondition::Create(
84 URLMatcherConditionFactory* url_matcher_condition_factory, 117 URLMatcherConditionFactory* url_matcher_condition_factory,
85 const base::Value& condition, 118 const base::Value& condition,
86 std::string* error) { 119 std::string* error) {
87 const base::DictionaryValue* condition_dict = NULL; 120 const base::DictionaryValue* condition_dict = NULL;
88 if (!condition.GetAsDictionary(&condition_dict)) { 121 if (!condition.GetAsDictionary(&condition_dict)) {
89 *error = kExpectedDictionary; 122 *error = kExpectedDictionary;
90 return scoped_ptr<WebRequestCondition>(NULL); 123 return scoped_ptr<WebRequestCondition>(NULL);
91 } 124 }
92 125
93 // Verify that we are dealing with a Condition whose type we understand. 126 // Verify that we are dealing with a Condition whose type we understand.
94 std::string instance_type; 127 std::string instance_type;
95 if (!condition_dict->GetString(keys::kInstanceTypeKey, &instance_type)) { 128 if (!condition_dict->GetString(keys::kInstanceTypeKey, &instance_type)) {
96 *error = kConditionWithoutInstanceType; 129 *error = kConditionWithoutInstanceType;
97 return scoped_ptr<WebRequestCondition>(NULL); 130 return scoped_ptr<WebRequestCondition>(NULL);
98 } 131 }
99 if (instance_type != keys::kRequestMatcherType) { 132 if (instance_type != keys::kRequestMatcherType) {
100 *error = kExpectedOtherConditionType; 133 *error = kExpectedOtherConditionType;
101 return scoped_ptr<WebRequestCondition>(NULL); 134 return scoped_ptr<WebRequestCondition>(NULL);
102 } 135 }
103 136
104 WebRequestConditionAttributes attributes; 137 WebRequestConditionAttributes attributes;
105 scoped_refptr<URLMatcherConditionSet> url_matcher_condition_set; 138 scoped_refptr<URLMatcherConditionSet> url_matcher_condition_set;
139 scoped_refptr<URLMatcherConditionSet> first_party_url_matcher_condition_set;
106 140
107 for (base::DictionaryValue::Iterator iter(*condition_dict); 141 for (base::DictionaryValue::Iterator iter(*condition_dict);
108 iter.HasNext(); iter.Advance()) { 142 iter.HasNext(); iter.Advance()) {
109 const std::string& condition_attribute_name = iter.key(); 143 const std::string& condition_attribute_name = iter.key();
110 const Value& condition_attribute_value = iter.value(); 144 const Value& condition_attribute_value = iter.value();
145 const bool name_is_url = condition_attribute_name == keys::kUrlKey;
111 if (condition_attribute_name == keys::kInstanceTypeKey) { 146 if (condition_attribute_name == keys::kInstanceTypeKey) {
112 // Skip this. 147 // Skip this.
113 } else if (condition_attribute_name == keys::kUrlKey) { 148 } else if (name_is_url ||
149 condition_attribute_name == keys::kFirstPartyForCookiesUrlKey) {
114 const base::DictionaryValue* dict = NULL; 150 const base::DictionaryValue* dict = NULL;
115 if (!condition_attribute_value.GetAsDictionary(&dict)) { 151 if (!condition_attribute_value.GetAsDictionary(&dict)) {
116 *error = base::StringPrintf(kInvalidTypeOfParamter, 152 *error = base::StringPrintf(kInvalidTypeOfParamter,
117 condition_attribute_name.c_str()); 153 condition_attribute_name.c_str());
118 } else { 154 } else {
119 url_matcher_condition_set = 155 if (!name_is_url) {
120 URLMatcherFactory::CreateFromURLFilterDictionary( 156 first_party_url_matcher_condition_set =
121 url_matcher_condition_factory, dict, ++g_next_id, error); 157 URLMatcherFactory::CreateFromURLFilterDictionary(
158 url_matcher_condition_factory, dict, ++g_next_id, error);
159 } else {
160 url_matcher_condition_set =
161 URLMatcherFactory::CreateFromURLFilterDictionary(
162 url_matcher_condition_factory, dict, ++g_next_id, error);
163 }
122 } 164 }
123 } else if (WebRequestConditionAttribute::IsKnownType( 165 } else if (WebRequestConditionAttribute::IsKnownType(
124 condition_attribute_name)) { 166 condition_attribute_name)) {
125 scoped_ptr<WebRequestConditionAttribute> attribute = 167 scoped_ptr<WebRequestConditionAttribute> attribute =
126 WebRequestConditionAttribute::Create( 168 WebRequestConditionAttribute::Create(
127 condition_attribute_name, 169 condition_attribute_name,
128 &condition_attribute_value, 170 &condition_attribute_value,
129 error); 171 error);
130 if (attribute.get()) 172 if (attribute.get())
131 attributes.push_back(make_linked_ptr(attribute.release())); 173 attributes.push_back(make_linked_ptr(attribute.release()));
132 } else { 174 } else {
133 *error = base::StringPrintf(kUnknownConditionAttribute, 175 *error = base::StringPrintf(kUnknownConditionAttribute,
134 condition_attribute_name.c_str()); 176 condition_attribute_name.c_str());
135 } 177 }
136 if (!error->empty()) 178 if (!error->empty())
137 return scoped_ptr<WebRequestCondition>(NULL); 179 return scoped_ptr<WebRequestCondition>(NULL);
138 } 180 }
139 181
140 scoped_ptr<WebRequestCondition> result( 182 scoped_ptr<WebRequestCondition> result(
141 new WebRequestCondition(url_matcher_condition_set, attributes)); 183 new WebRequestCondition(url_matcher_condition_set,
184 first_party_url_matcher_condition_set,
185 attributes));
142 186
143 if (!result->stages()) { 187 if (!result->stages()) {
144 *error = kConditionCannotBeFulfilled; 188 *error = kConditionCannotBeFulfilled;
145 return scoped_ptr<WebRequestCondition>(NULL); 189 return scoped_ptr<WebRequestCondition>(NULL);
146 } 190 }
147 191
148 return result.Pass(); 192 return result.Pass();
149 } 193 }
150 194
151 } // namespace extensions 195 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698