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

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: Dominic's comments + adjusting to the recent move of UploadElement out of UploadData. 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"
51 #include "net/base/upload_data.h"
52 #include "net/base/upload_element.h"
49 #include "net/http/http_response_headers.h" 53 #include "net/http/http_response_headers.h"
50 #include "net/url_request/url_request.h" 54 #include "net/url_request/url_request.h"
51 #include "ui/base/l10n/l10n_util.h" 55 #include "ui/base/l10n/l10n_util.h"
52 56
57 using base::DictionaryValue;
58 using base::ListValue;
59 using base::StringValue;
60 using chrome::VersionInfo;
53 using content::BrowserMessageFilter; 61 using content::BrowserMessageFilter;
54 using content::BrowserThread; 62 using content::BrowserThread;
55 using content::ResourceRequestInfo; 63 using content::ResourceRequestInfo;
56 using extensions::Extension; 64 using extensions::Extension;
65 using extensions::Feature;
57 66
58 using extensions::web_navigation_api_helpers::GetFrameId; 67 using extensions::web_navigation_api_helpers::GetFrameId;
59 68
60 namespace helpers = extension_web_request_api_helpers; 69 namespace helpers = extension_web_request_api_helpers;
61 namespace keys = extension_web_request_api_constants; 70 namespace keys = extension_web_request_api_constants;
62 71
63 namespace { 72 namespace {
64 73
65 // List of all the webRequest events. 74 // List of all the webRequest events.
66 static const char* const kWebRequestEvents[] = { 75 const char* const kWebRequestEvents[] = {
67 keys::kOnBeforeRedirect, 76 keys::kOnBeforeRedirect,
68 keys::kOnBeforeRequest, 77 keys::kOnBeforeRequest,
69 keys::kOnBeforeSendHeaders, 78 keys::kOnBeforeSendHeaders,
70 keys::kOnCompleted, 79 keys::kOnCompleted,
71 keys::kOnErrorOccurred, 80 keys::kOnErrorOccurred,
72 keys::kOnSendHeaders, 81 keys::kOnSendHeaders,
73 keys::kOnAuthRequired, 82 keys::kOnAuthRequired,
74 keys::kOnResponseStarted, 83 keys::kOnResponseStarted,
75 keys::kOnHeadersReceived, 84 keys::kOnHeadersReceived,
76 }; 85 };
77 86
78 #define ARRAYEND(array) (array + arraysize(array)) 87 #define ARRAYEND(array) (array + arraysize(array))
79 88
89 // Access to request body (crbug.com/91191/) is currently only enabled in dev
90 // and canary channels. This function caches the release channel info from
91 // chrome::VersionInfo. Don't use this outside IO thread.
92 bool IsWebRequestBodyDataAccessEnabled() {
93 return Feature::GetCurrentChannel() <= VersionInfo::CHANNEL_DEV;
94 }
95
80 bool IsWebRequestEvent(const std::string& event_name) { 96 bool IsWebRequestEvent(const std::string& event_name) {
81 return std::find(kWebRequestEvents, ARRAYEND(kWebRequestEvents), 97 return std::find(kWebRequestEvents, ARRAYEND(kWebRequestEvents),
82 event_name) != ARRAYEND(kWebRequestEvents); 98 event_name) != ARRAYEND(kWebRequestEvents);
83 } 99 }
84 100
85 // Returns whether |request| has been triggered by an extension in 101 // Returns whether |request| has been triggered by an extension in
86 // |extension_info_map|. 102 // |extension_info_map|.
87 bool IsRequestFromExtension(const net::URLRequest* request, 103 bool IsRequestFromExtension(const net::URLRequest* request,
88 const ExtensionInfoMap* extension_info_map) { 104 const ExtensionInfoMap* extension_info_map) {
89 // |extension_info_map| is NULL for system-level requests. 105 // |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())); 166 base::Uint64ToString(request->identifier()));
151 out->SetString(keys::kUrlKey, request->url().spec()); 167 out->SetString(keys::kUrlKey, request->url().spec());
152 out->SetString(keys::kMethodKey, request->method()); 168 out->SetString(keys::kMethodKey, request->method());
153 out->SetInteger(keys::kFrameIdKey, frame_id_for_extension); 169 out->SetInteger(keys::kFrameIdKey, frame_id_for_extension);
154 out->SetInteger(keys::kParentFrameIdKey, parent_frame_id_for_extension); 170 out->SetInteger(keys::kParentFrameIdKey, parent_frame_id_for_extension);
155 out->SetInteger(keys::kTabIdKey, tab_id); 171 out->SetInteger(keys::kTabIdKey, tab_id);
156 out->SetString(keys::kTypeKey, helpers::ResourceTypeToString(resource_type)); 172 out->SetString(keys::kTypeKey, helpers::ResourceTypeToString(resource_type));
157 out->SetDouble(keys::kTimeStampKey, base::Time::Now().ToDoubleT() * 1000); 173 out->SetDouble(keys::kTimeStampKey, base::Time::Now().ToDoubleT() * 1000);
158 } 174 }
159 175
176 // Extracts the body from |request| and writes the data into |out|.
177 void ExtractRequestInfoBody(const net::URLRequest* request,
178 DictionaryValue* out) {
179 if (request->method() != "POST" && request->method() != "PUT")
180 return; // Need to exit without "out->Set(keys::kRequestBodyKey, ...);" .
181
182 DictionaryValue* requestBody = new DictionaryValue();
183 out->Set(keys::kRequestBodyKey, requestBody);
184
185 // Get the data presenters, ordered by being interesting.
186 extensions::ChunkedErrorPresenter chunked_error_presenter(request);
187 extensions::RawDataPresenter raw_data_presenter;
188 extensions::ParsedDataPresenter parsed_data_presenter(request);
189 extensions::UploadDataPresenter* const presenters[] = {
190 &chunked_error_presenter, // First -- any errors?
191 &parsed_data_presenter, // Second -- any parseable forms?
192 &raw_data_presenter // Third -- any data at all?
193 };
194 // Keys for the results of the corresponding presenters.
195 static const char* const kKeys[] = {
196 keys::kRequestBodyErrorKey,
197 keys::kRequestBodyFormDataKey,
198 keys::kRequestBodyRawKey
199 };
200
201 const std::vector<net::UploadElement>* elements =
202 request->get_upload()->elements();
203 bool some_succeeded = false;
204 for (size_t i = 0; !some_succeeded && i < arraysize(presenters); ++i) {
205 std::vector<net::UploadElement>::const_iterator element;
206 for (element = elements->begin(); element != elements->end(); ++element)
207 presenters[i]->FeedNext(*element);
208 if (presenters[i]->Succeeded()) {
209 requestBody->Set(kKeys[i], presenters[i]->Result().release());
210 some_succeeded = true;
211 }
212 }
213 if (!some_succeeded)
214 requestBody->SetString(keys::kRequestBodyErrorKey, "Unknown error.");
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 552
493 int extra_info_spec = 0; 553 int extra_info_spec = 0;
494 std::vector<const EventListener*> listeners = 554 std::vector<const EventListener*> listeners =
495 GetMatchingListeners(profile, extension_info_map, keys::kOnBeforeRequest, 555 GetMatchingListeners(profile, extension_info_map, keys::kOnBeforeRequest,
496 request, &extra_info_spec); 556 request, &extra_info_spec);
497 if (!listeners.empty() && 557 if (!listeners.empty() &&
498 !GetAndSetSignaled(request->identifier(), kOnBeforeRequest)) { 558 !GetAndSetSignaled(request->identifier(), kOnBeforeRequest)) {
499 ListValue args; 559 ListValue args;
500 DictionaryValue* dict = new DictionaryValue(); 560 DictionaryValue* dict = new DictionaryValue();
501 ExtractRequestInfo(request, dict); 561 ExtractRequestInfo(request, dict);
562 if (extra_info_spec & ExtraInfoSpec::REQUEST_BODY)
563 ExtractRequestInfoBody(request, dict);
502 args.Append(dict); 564 args.Append(dict);
503 565
504 initialize_blocked_requests |= 566 initialize_blocked_requests |=
505 DispatchEvent(profile, request, listeners, args); 567 DispatchEvent(profile, request, listeners, args);
506 } 568 }
507 569
508 if (!initialize_blocked_requests) 570 if (!initialize_blocked_requests)
509 return net::OK; // Nobody saw a reason for modifying the request. 571 return net::OK; // Nobody saw a reason for modifying the request.
510 572
511 blocked_requests_[request->identifier()].event = kOnBeforeRequest; 573 blocked_requests_[request->identifier()].event = kOnBeforeRequest;
(...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1841 } else if ((*it)->name().find("AdBlock") != std::string::npos) { 1903 } else if ((*it)->name().find("AdBlock") != std::string::npos) {
1842 adblock = true; 1904 adblock = true;
1843 } else { 1905 } else {
1844 other = true; 1906 other = true;
1845 } 1907 }
1846 } 1908 }
1847 } 1909 }
1848 1910
1849 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other)); 1911 host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other));
1850 } 1912 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698