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

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_api.cc

Issue 10694055: Add read-only access to POST data for webRequest's onBeforeRequest (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Corrected the multipart parser + parsedForm->formData Created 8 years, 4 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
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/web_request/web_request_api.h" 5 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/time.h" 14 #include "base/time.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/chrome_content_browser_client.h" 18 #include "chrome/browser/chrome_content_browser_client.h"
19 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h " 19 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h "
20 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h" 20 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h"
21 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helper s.h" 21 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helper s.h"
22 #include "chrome/browser/extensions/api/web_request/upload_data_presenter.h"
22 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h" 23 #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h"
23 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" 24 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
24 #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h" 25 #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h"
25 #include "chrome/browser/extensions/event_router.h" 26 #include "chrome/browser/extensions/event_router.h"
26 #include "chrome/browser/extensions/extension_info_map.h" 27 #include "chrome/browser/extensions/extension_info_map.h"
27 #include "chrome/browser/extensions/extension_prefs.h" 28 #include "chrome/browser/extensions/extension_prefs.h"
28 #include "chrome/browser/extensions/extension_service.h" 29 #include "chrome/browser/extensions/extension_service.h"
29 #include "chrome/browser/extensions/extension_tab_id_map.h" 30 #include "chrome/browser/extensions/extension_tab_id_map.h"
30 #include "chrome/browser/profiles/profile.h" 31 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/browser/profiles/profile_manager.h" 32 #include "chrome/browser/profiles/profile_manager.h"
32 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 33 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
33 #include "chrome/browser/renderer_host/web_cache_manager.h" 34 #include "chrome/browser/renderer_host/web_cache_manager.h"
34 #include "chrome/common/extensions/event_filtering_info.h" 35 #include "chrome/common/extensions/event_filtering_info.h"
35 #include "chrome/common/extensions/extension.h" 36 #include "chrome/common/extensions/extension.h"
36 #include "chrome/common/extensions/extension_constants.h" 37 #include "chrome/common/extensions/extension_constants.h"
37 #include "chrome/common/extensions/extension_error_utils.h" 38 #include "chrome/common/extensions/extension_error_utils.h"
38 #include "chrome/common/extensions/extension_messages.h" 39 #include "chrome/common/extensions/extension_messages.h"
40 #include "chrome/common/extensions/features/feature.h"
39 #include "chrome/common/extensions/url_pattern.h" 41 #include "chrome/common/extensions/url_pattern.h"
40 #include "chrome/common/url_constants.h" 42 #include "chrome/common/url_constants.h"
41 #include "content/public/browser/browser_message_filter.h" 43 #include "content/public/browser/browser_message_filter.h"
42 #include "content/public/browser/browser_thread.h" 44 #include "content/public/browser/browser_thread.h"
43 #include "content/public/browser/render_process_host.h" 45 #include "content/public/browser/render_process_host.h"
44 #include "content/public/browser/resource_request_info.h" 46 #include "content/public/browser/resource_request_info.h"
45 #include "googleurl/src/gurl.h" 47 #include "googleurl/src/gurl.h"
46 #include "grit/generated_resources.h" 48 #include "grit/generated_resources.h"
47 #include "net/base/auth.h" 49 #include "net/base/auth.h"
48 #include "net/base/net_errors.h" 50 #include "net/base/net_errors.h"
49 #include "net/http/http_response_headers.h" 51 #include "net/http/http_response_headers.h"
50 #include "net/url_request/url_request.h" 52 #include "net/url_request/url_request.h"
51 #include "ui/base/l10n/l10n_util.h" 53 #include "ui/base/l10n/l10n_util.h"
52 54
55 using base::DictionaryValue;
56 using base::ListValue;
57 using base::StringValue;
58 using chrome::VersionInfo;
53 using content::BrowserMessageFilter; 59 using content::BrowserMessageFilter;
54 using content::BrowserThread; 60 using content::BrowserThread;
55 using content::ResourceRequestInfo; 61 using content::ResourceRequestInfo;
56 using extensions::Extension; 62 using extensions::Extension;
63 using extensions::Feature;
57 64
58 using extensions::web_navigation_api_helpers::GetFrameId; 65 using extensions::web_navigation_api_helpers::GetFrameId;
59 66
60 namespace helpers = extension_web_request_api_helpers; 67 namespace helpers = extension_web_request_api_helpers;
61 namespace keys = extension_web_request_api_constants; 68 namespace keys = extension_web_request_api_constants;
62 69
63 namespace { 70 namespace {
64 71
65 // List of all the webRequest events. 72 // List of all the webRequest events.
66 static const char* const kWebRequestEvents[] = { 73 const char* const kWebRequestEvents[] = {
67 keys::kOnBeforeRedirect, 74 keys::kOnBeforeRedirect,
68 keys::kOnBeforeRequest, 75 keys::kOnBeforeRequest,
69 keys::kOnBeforeSendHeaders, 76 keys::kOnBeforeSendHeaders,
70 keys::kOnCompleted, 77 keys::kOnCompleted,
71 keys::kOnErrorOccurred, 78 keys::kOnErrorOccurred,
72 keys::kOnSendHeaders, 79 keys::kOnSendHeaders,
73 keys::kOnAuthRequired, 80 keys::kOnAuthRequired,
74 keys::kOnResponseStarted, 81 keys::kOnResponseStarted,
75 keys::kOnHeadersReceived, 82 keys::kOnHeadersReceived,
76 }; 83 };
77 84
78 #define ARRAYEND(array) (array + arraysize(array)) 85 #define ARRAYEND(array) (array + arraysize(array))
79 86
87 // Access to request body (crbug.com/91191/) is currently only enabled in dev
88 // and canary channels. This function caches the release channel info from
89 // chrome::VersionInfo. Don't use this outside IO thread.
90 bool IsWebRequestBodyDataAccessEnabled() {
91 return Feature::GetCurrentChannel() <= VersionInfo::CHANNEL_DEV;
92 }
93
80 bool IsWebRequestEvent(const std::string& event_name) { 94 bool IsWebRequestEvent(const std::string& event_name) {
81 return std::find(kWebRequestEvents, ARRAYEND(kWebRequestEvents), 95 return std::find(kWebRequestEvents, ARRAYEND(kWebRequestEvents),
82 event_name) != ARRAYEND(kWebRequestEvents); 96 event_name) != ARRAYEND(kWebRequestEvents);
83 } 97 }
84 98
85 // Returns whether |request| has been triggered by an extension in 99 // Returns whether |request| has been triggered by an extension in
86 // |extension_info_map|. 100 // |extension_info_map|.
87 bool IsRequestFromExtension(const net::URLRequest* request, 101 bool IsRequestFromExtension(const net::URLRequest* request,
88 const ExtensionInfoMap* extension_info_map) { 102 const ExtensionInfoMap* extension_info_map) {
89 // |extension_info_map| is NULL for system-level requests. 103 // |extension_info_map| is NULL for system-level requests.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 base::Uint64ToString(request->identifier())); 164 base::Uint64ToString(request->identifier()));
151 out->SetString(keys::kUrlKey, request->url().spec()); 165 out->SetString(keys::kUrlKey, request->url().spec());
152 out->SetString(keys::kMethodKey, request->method()); 166 out->SetString(keys::kMethodKey, request->method());
153 out->SetInteger(keys::kFrameIdKey, frame_id_for_extension); 167 out->SetInteger(keys::kFrameIdKey, frame_id_for_extension);
154 out->SetInteger(keys::kParentFrameIdKey, parent_frame_id_for_extension); 168 out->SetInteger(keys::kParentFrameIdKey, parent_frame_id_for_extension);
155 out->SetInteger(keys::kTabIdKey, tab_id); 169 out->SetInteger(keys::kTabIdKey, tab_id);
156 out->SetString(keys::kTypeKey, helpers::ResourceTypeToString(resource_type)); 170 out->SetString(keys::kTypeKey, helpers::ResourceTypeToString(resource_type));
157 out->SetDouble(keys::kTimeStampKey, base::Time::Now().ToDoubleT() * 1000); 171 out->SetDouble(keys::kTimeStampKey, base::Time::Now().ToDoubleT() * 1000);
158 } 172 }
159 173
174 // Extracts the body from |request| and writes the data into |out|.
175 void ExtractRequestInfoBody(const net::URLRequest* request,
176 DictionaryValue* out) {
177 if (request->method() != "POST" && request->method() != "PUT")
178 return; // Need to exit without "out->Set(keys::kRequestBodyKey, ...);" .
179
180 DictionaryValue* requestBody = new DictionaryValue();
181 out->Set(keys::kRequestBodyKey, requestBody);
182
183 // Get the data presenters, ordered by being interesting.
184 extensions::ChunkedErrorPresenter chunked_error_presenter(request);
185 extensions::RawDataPresenter raw_data_presenter;
186 extensions::ParsedDataPresenter parsed_data_presenter(request);
187 extensions::UploadDataPresenter* const presenters[] = {
188 &chunked_error_presenter, // First -- any errors?
189 &parsed_data_presenter, // Second -- any parseable forms?
190 &raw_data_presenter // Third -- any data at all?
191 };
192 // Keys for the results of the corresponding presenters.
193 static const char* const kKeys[] = {
194 keys::kRequestBodyErrorKey,
195 keys::kRequestBodyFormDataKey,
196 keys::kRequestBodyRawKey
197 };
198
199 const std::vector<net::UploadData::Element>* elements =
200 request->get_upload()->elements();
201 bool some_succeeded = false;
202 for (size_t i = 0; !some_succeeded && i < arraysize(presenters); ++i) {
203 std::vector<net::UploadData::Element>::const_iterator element;
204 for (element = elements->begin(); element != elements->end(); ++element) {
205 presenters[i]->FeedNext(*element);
206 }
battre 2012/08/16 19:18:03 nit: no {}
vabr (Chromium) 2012/08/17 18:29:57 Done.
207 if (presenters[i]->Succeeded()) {
battre 2012/08/16 19:18:03 This looks wrong to me. Most presenters call Abort
vabr (Chromium) 2012/08/17 18:29:57 This is by design, all the elements together repre
battre 2012/08/20 12:09:38 Nevermind, you are right. I misunderstood the loop
208 requestBody->Set(kKeys[i], presenters[i]->Result().release());
209 some_succeeded = true;
210 }
211 }
212 if (!some_succeeded) {
213 requestBody->SetString(keys::kRequestBodyErrorKey, "Unknown error.");
214 }
battre 2012/08/16 19:18:03 nit: no {}
vabr (Chromium) 2012/08/17 18:29:57 Done.
215 }
216
160 // Converts a HttpHeaders dictionary to a |name|, |value| pair. Returns 217 // Converts a HttpHeaders dictionary to a |name|, |value| pair. Returns
161 // true if successful. 218 // true if successful.
162 bool FromHeaderDictionary(const DictionaryValue* header_value, 219 bool FromHeaderDictionary(const DictionaryValue* header_value,
163 std::string* name, 220 std::string* name,
164 std::string* value) { 221 std::string* value) {
165 if (!header_value->GetString(keys::kHeaderNameKey, name)) 222 if (!header_value->GetString(keys::kHeaderNameKey, name))
166 return false; 223 return false;
167 224
168 // We require either a "value" or a "binaryValue" entry. 225 // We require either a "value" or a "binaryValue" entry.
169 if (!(header_value->HasKey(keys::kHeaderValueKey) ^ 226 if (!(header_value->HasKey(keys::kHeaderValueKey) ^
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 return false; 459 return false;
403 460
404 if (str == "requestHeaders") 461 if (str == "requestHeaders")
405 *extra_info_spec |= REQUEST_HEADERS; 462 *extra_info_spec |= REQUEST_HEADERS;
406 else if (str == "responseHeaders") 463 else if (str == "responseHeaders")
407 *extra_info_spec |= RESPONSE_HEADERS; 464 *extra_info_spec |= RESPONSE_HEADERS;
408 else if (str == "blocking") 465 else if (str == "blocking")
409 *extra_info_spec |= BLOCKING; 466 *extra_info_spec |= BLOCKING;
410 else if (str == "asyncBlocking") 467 else if (str == "asyncBlocking")
411 *extra_info_spec |= ASYNC_BLOCKING; 468 *extra_info_spec |= ASYNC_BLOCKING;
469 else if (str == "requestBody")
470 *extra_info_spec |=
471 IsWebRequestBodyDataAccessEnabled() ? REQUEST_BODY : 0;
412 else 472 else
413 return false; 473 return false;
414 474
415 // BLOCKING and ASYNC_BLOCKING are mutually exclusive. 475 // BLOCKING and ASYNC_BLOCKING are mutually exclusive.
416 if ((*extra_info_spec & BLOCKING) && (*extra_info_spec & ASYNC_BLOCKING)) 476 if ((*extra_info_spec & BLOCKING) && (*extra_info_spec & ASYNC_BLOCKING))
417 return false; 477 return false;
418 } 478 }
419 return true; 479 return true;
420 } 480 }
421 481
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 551
492 int extra_info_spec = 0; 552 int extra_info_spec = 0;
493 std::vector<const EventListener*> listeners = 553 std::vector<const EventListener*> listeners =
494 GetMatchingListeners(profile, extension_info_map, keys::kOnBeforeRequest, 554 GetMatchingListeners(profile, extension_info_map, keys::kOnBeforeRequest,
495 request, &extra_info_spec); 555 request, &extra_info_spec);
496 if (!listeners.empty() && 556 if (!listeners.empty() &&
497 !GetAndSetSignaled(request->identifier(), kOnBeforeRequest)) { 557 !GetAndSetSignaled(request->identifier(), kOnBeforeRequest)) {
498 ListValue args; 558 ListValue args;
499 DictionaryValue* dict = new DictionaryValue(); 559 DictionaryValue* dict = new DictionaryValue();
500 ExtractRequestInfo(request, dict); 560 ExtractRequestInfo(request, dict);
561 if (extra_info_spec & ExtraInfoSpec::REQUEST_BODY)
562 ExtractRequestInfoBody(request, dict);
501 args.Append(dict); 563 args.Append(dict);
502 564
503 initialize_blocked_requests |= 565 initialize_blocked_requests |=
504 DispatchEvent(profile, request, listeners, args); 566 DispatchEvent(profile, request, listeners, args);
505 } 567 }
506 568
507 if (!initialize_blocked_requests) 569 if (!initialize_blocked_requests)
508 return net::OK; // Nobody saw a reason for modifying the request. 570 return net::OK; // Nobody saw a reason for modifying the request.
509 571
510 blocked_requests_[request->identifier()].event = kOnBeforeRequest; 572 blocked_requests_[request->identifier()].event = kOnBeforeRequest;
(...skipping 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1832 } else if ((*it)->name().find("AdBlock") != std::string::npos) { 1894 } else if ((*it)->name().find("AdBlock") != std::string::npos) {
1833 adblock = true; 1895 adblock = true;
1834 } else { 1896 } else {
1835 other = true; 1897 other = true;
1836 } 1898 }
1837 } 1899 }
1838 } 1900 }
1839 1901
1840 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); 1902 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other));
1841 } 1903 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698