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

Side by Side Diff: headless/public/util/generic_url_request_job.cc

Issue 2695923010: Add Network.setSendRequestIdHeader and use it in headless (Closed)
Patch Set: Fix the layout test Created 3 years, 9 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "headless/public/util/generic_url_request_job.h" 5 #include "headless/public/util/generic_url_request_job.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <algorithm> 8 #include <algorithm>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "headless/public/util/url_request_dispatcher.h" 11 #include "headless/public/util/url_request_dispatcher.h"
12 #include "net/base/io_buffer.h" 12 #include "net/base/io_buffer.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 14 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
15 #include "net/cookies/cookie_store.h" 15 #include "net/cookies/cookie_store.h"
16 #include "net/http/http_response_headers.h" 16 #include "net/http/http_response_headers.h"
17 #include "net/url_request/url_request_context.h" 17 #include "net/url_request/url_request_context.h"
18 18
19 namespace headless { 19 namespace headless {
20 namespace { 20 namespace {
21 21
22 // True if the request method is "safe" (per section 4.2.1 of RFC 7231). 22 // True if the request method is "safe" (per section 4.2.1 of RFC 7231).
23 bool IsMethodSafe(const std::string& method) { 23 bool IsMethodSafe(const std::string& method) {
24 return method == "GET" || method == "HEAD" || method == "OPTIONS" || 24 return method == "GET" || method == "HEAD" || method == "OPTIONS" ||
25 method == "TRACE"; 25 method == "TRACE";
26 } 26 }
27 27
28 // Keep in sync with X_DevTools_Request_Id defined in HTTPNames.json5.
29 const char kDevtoolsRequestId[] = "X-DevTools-Request-Id";
30
28 } // namespace 31 } // namespace
29 32
30 GenericURLRequestJob::GenericURLRequestJob( 33 GenericURLRequestJob::GenericURLRequestJob(
31 net::URLRequest* request, 34 net::URLRequest* request,
32 net::NetworkDelegate* network_delegate, 35 net::NetworkDelegate* network_delegate,
33 URLRequestDispatcher* url_request_dispatcher, 36 URLRequestDispatcher* url_request_dispatcher,
34 std::unique_ptr<URLFetcher> url_fetcher, 37 std::unique_ptr<URLFetcher> url_fetcher,
35 Delegate* delegate) 38 Delegate* delegate)
36 : ManagedDispatchURLRequestJob(request, 39 : ManagedDispatchURLRequestJob(request,
37 network_delegate, 40 network_delegate,
38 url_request_dispatcher), 41 url_request_dispatcher),
39 url_fetcher_(std::move(url_fetcher)), 42 url_fetcher_(std::move(url_fetcher)),
40 delegate_(delegate), 43 delegate_(delegate),
41 weak_factory_(this) {} 44 weak_factory_(this) {}
42 45
43 GenericURLRequestJob::~GenericURLRequestJob() = default; 46 GenericURLRequestJob::~GenericURLRequestJob() = default;
44 47
45 void GenericURLRequestJob::SetExtraRequestHeaders( 48 void GenericURLRequestJob::SetExtraRequestHeaders(
46 const net::HttpRequestHeaders& headers) { 49 const net::HttpRequestHeaders& headers) {
47 extra_request_headers_ = headers; 50 extra_request_headers_ = headers;
51
52 if (extra_request_headers_.GetHeader(kDevtoolsRequestId,
53 &devtools_request_id_)) {
54 extra_request_headers_.RemoveHeader(kDevtoolsRequestId);
55 }
48 } 56 }
49 57
50 void GenericURLRequestJob::Start() { 58 void GenericURLRequestJob::Start() {
51 auto callback = [this](RewriteResult result, const GURL& url, 59 auto callback = [this](RewriteResult result, const GURL& url,
52 const std::string& method) { 60 const std::string& method) {
53 switch (result) { 61 switch (result) {
54 case RewriteResult::kAllow: 62 case RewriteResult::kAllow:
55 // Note that we use the rewritten url for selecting cookies. 63 // Note that we use the rewritten url for selecting cookies.
56 // Also, rewriting does not affect the request initiator. 64 // Also, rewriting does not affect the request initiator.
57 PrepareCookies(url, method, url::Origin(url)); 65 PrepareCookies(url, method, url::Origin(url));
58 break; 66 break;
59 case RewriteResult::kDeny: 67 case RewriteResult::kDeny:
60 DispatchStartError(net::ERR_FILE_NOT_FOUND); 68 DispatchStartError(net::ERR_FILE_NOT_FOUND);
61 break; 69 break;
62 case RewriteResult::kFailure: 70 case RewriteResult::kFailure:
63 DispatchStartError(net::ERR_UNEXPECTED); 71 DispatchStartError(net::ERR_UNEXPECTED);
64 break; 72 break;
65 default: 73 default:
66 DCHECK(false); 74 DCHECK(false);
67 } 75 }
68 }; 76 };
69 77
70 if (!delegate_->BlockOrRewriteRequest(request_->url(), request_->method(), 78 if (!delegate_->BlockOrRewriteRequest(request_->url(), devtools_request_id_,
79 request_->method(),
71 request_->referrer(), callback)) { 80 request_->referrer(), callback)) {
72 PrepareCookies(request_->url(), request_->method(), 81 PrepareCookies(request_->url(), request_->method(),
73 url::Origin(request_->first_party_for_cookies())); 82 url::Origin(request_->first_party_for_cookies()));
74 } 83 }
75 } 84 }
76 85
77 void GenericURLRequestJob::PrepareCookies(const GURL& rewritten_url, 86 void GenericURLRequestJob::PrepareCookies(const GURL& rewritten_url,
78 const std::string& method, 87 const std::string& method,
79 const url::Origin& site_for_cookies) { 88 const url::Origin& site_for_cookies) {
80 net::CookieStore* cookie_store = request_->context()->cookie_store(); 89 net::CookieStore* cookie_store = request_->context()->cookie_store();
(...skipping 30 matching lines...) Expand all
111 // Pass cookies, the referrer and any extra headers into the fetch request. 120 // Pass cookies, the referrer and any extra headers into the fetch request.
112 extra_request_headers_.SetHeader( 121 extra_request_headers_.SetHeader(
113 net::HttpRequestHeaders::kCookie, 122 net::HttpRequestHeaders::kCookie,
114 net::CookieStore::BuildCookieLine(cookie_list)); 123 net::CookieStore::BuildCookieLine(cookie_list));
115 124
116 extra_request_headers_.SetHeader(net::HttpRequestHeaders::kReferer, 125 extra_request_headers_.SetHeader(net::HttpRequestHeaders::kReferer,
117 request_->referrer()); 126 request_->referrer());
118 127
119 // The resource may have been supplied in the request. 128 // The resource may have been supplied in the request.
120 const HttpResponse* matched_resource = delegate_->MaybeMatchResource( 129 const HttpResponse* matched_resource = delegate_->MaybeMatchResource(
121 rewritten_url, method, extra_request_headers_); 130 rewritten_url, devtools_request_id_, method, extra_request_headers_);
122 131
123 if (matched_resource) { 132 if (matched_resource) {
124 OnFetchCompleteExtractHeaders( 133 OnFetchCompleteExtractHeaders(
125 matched_resource->final_url, matched_resource->http_response_code, 134 matched_resource->final_url, matched_resource->http_response_code,
126 matched_resource->response_data, matched_resource->response_data_size); 135 matched_resource->response_data, matched_resource->response_data_size);
127 } else { 136 } else {
128 url_fetcher_->StartFetch(rewritten_url, method, extra_request_headers_, 137 url_fetcher_->StartFetch(rewritten_url, method, extra_request_headers_,
129 this); 138 this);
130 } 139 }
131 } 140 }
(...skipping 12 matching lines...) Expand all
144 http_response_code_ = http_response_code; 153 http_response_code_ = http_response_code;
145 response_headers_ = response_headers; 154 response_headers_ = response_headers;
146 body_ = body; 155 body_ = body;
147 body_size_ = body_size; 156 body_size_ = body_size;
148 157
149 DispatchHeadersComplete(); 158 DispatchHeadersComplete();
150 159
151 std::string mime_type; 160 std::string mime_type;
152 GetMimeType(&mime_type); 161 GetMimeType(&mime_type);
153 162
154 delegate_->OnResourceLoadComplete(final_url, mime_type, http_response_code); 163 delegate_->OnResourceLoadComplete(final_url, devtools_request_id_, mime_type,
164 http_response_code);
155 } 165 }
156 166
157 int GenericURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size) { 167 int GenericURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size) {
158 // TODO(skyostil): Implement ranged fetches. 168 // TODO(skyostil): Implement ranged fetches.
159 // TODO(alexclarke): Add coverage for all the cases below. 169 // TODO(alexclarke): Add coverage for all the cases below.
160 size_t bytes_available = body_size_ - read_offset_; 170 size_t bytes_available = body_size_ - read_offset_;
161 size_t bytes_to_copy = 171 size_t bytes_to_copy =
162 std::min(static_cast<size_t>(buf_size), bytes_available); 172 std::min(static_cast<size_t>(buf_size), bytes_available);
163 if (bytes_to_copy) { 173 if (bytes_to_copy) {
164 std::memcpy(buf->data(), &body_[read_offset_], bytes_to_copy); 174 std::memcpy(buf->data(), &body_[read_offset_], bytes_to_copy);
(...skipping 21 matching lines...) Expand all
186 return false; 196 return false;
187 return response_headers_->GetCharset(charset); 197 return response_headers_->GetCharset(charset);
188 } 198 }
189 199
190 void GenericURLRequestJob::GetLoadTimingInfo( 200 void GenericURLRequestJob::GetLoadTimingInfo(
191 net::LoadTimingInfo* load_timing_info) const { 201 net::LoadTimingInfo* load_timing_info) const {
192 // TODO(alexclarke): Investigate setting the other members too where possible. 202 // TODO(alexclarke): Investigate setting the other members too where possible.
193 load_timing_info->receive_headers_end = response_time_; 203 load_timing_info->receive_headers_end = response_time_;
194 } 204 }
195 205
206 bool GenericURLRequestJob::Delegate::BlockOrRewriteRequest(
207 const GURL& url,
208 const std::string& devtools_id,
209 const std::string& method,
210 const std::string& referrer,
211 RewriteCallback callback) {
212 return BlockOrRewriteRequest(url, method, referrer, callback);
213 }
214
215 bool GenericURLRequestJob::Delegate::BlockOrRewriteRequest(
216 const GURL& url,
217 const std::string& method,
218 const std::string& referrer,
219 RewriteCallback callback) {
220 return false;
221 }
222
223 const GenericURLRequestJob::HttpResponse*
224 GenericURLRequestJob::Delegate::MaybeMatchResource(
225 const GURL& url,
226 const std::string& devtools_id,
227 const std::string& method,
228 const net::HttpRequestHeaders& request_headers) {
229 return MaybeMatchResource(url, method, request_headers);
230 }
231
232 const GenericURLRequestJob::HttpResponse*
233 GenericURLRequestJob::Delegate::MaybeMatchResource(
234 const GURL& url,
235 const std::string& method,
236 const net::HttpRequestHeaders& request_headers) {
237 return nullptr;
238 }
239
240 void GenericURLRequestJob::Delegate::OnResourceLoadComplete(
241 const GURL& final_url,
242 const std::string& devtools_id,
243 const std::string& mime_type,
244 int http_response_code) {
245 OnResourceLoadComplete(final_url, mime_type, http_response_code);
246 }
247
196 } // namespace headless 248 } // namespace headless
OLDNEW
« no previous file with comments | « headless/public/util/generic_url_request_job.h ('k') | headless/public/util/protocol_handler_request_id_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698