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

Side by Side Diff: content/browser/loader/intercepting_resource_handler.cc

Issue 2327463002: Relax ad-hoc assumptions on InterceptingResourceHandler (Closed)
Patch Set: fix Created 4 years, 2 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 "content/browser/loader/intercepting_resource_handler.h" 5 #include "content/browser/loader/intercepting_resource_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "content/public/common/resource_response.h" 9 #include "content/public/common/resource_response.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 InterceptingResourceHandler::InterceptingResourceHandler( 14 InterceptingResourceHandler::InterceptingResourceHandler(
15 std::unique_ptr<ResourceHandler> next_handler, 15 std::unique_ptr<ResourceHandler> next_handler,
16 net::URLRequest* request) 16 net::URLRequest* request)
17 : LayeredResourceHandler(request, std::move(next_handler)), 17 : LayeredResourceHandler(request, std::move(next_handler)) {
18 state_(State::STARTING), 18 next_handler_->SetController(this);
19 first_read_buffer_size_(0) {} 19 }
20 20
21 InterceptingResourceHandler::~InterceptingResourceHandler() {} 21 InterceptingResourceHandler::~InterceptingResourceHandler() {}
22 22
23 void InterceptingResourceHandler::SetController(
24 ResourceController* controller) {
25 if (state_ == State::PASS_THROUGH)
26 return LayeredResourceHandler::SetController(controller);
27 ResourceHandler::SetController(controller);
28 }
29
23 bool InterceptingResourceHandler::OnResponseStarted(ResourceResponse* response, 30 bool InterceptingResourceHandler::OnResponseStarted(ResourceResponse* response,
24 bool* defer) { 31 bool* defer) {
25 // If there's no need to switch handlers, just start acting as a blind 32 // If there's no need to switch handlers, just start acting as a blind
26 // pass-through ResourceHandler. 33 // pass-through ResourceHandler.
27 if (!new_handler_) { 34 if (!new_handler_) {
28 state_ = State::DONE; 35 state_ = State::PASS_THROUGH;
29 first_read_buffer_ = nullptr; 36 next_handler_->SetController(controller());
30 return next_handler_->OnResponseStarted(response, defer); 37 return next_handler_->OnResponseStarted(response, defer);
31 } 38 }
32 39
40 DCHECK_EQ(state_, State::STARTING);
33 // Otherwise, switch handlers. First, inform the original ResourceHandler 41 // Otherwise, switch handlers. First, inform the original ResourceHandler
34 // that this will be handled entirely by the new ResourceHandler. 42 // that this will be handled entirely by the new ResourceHandler.
35 // TODO(clamy): We will probably need to check the return values of these for
36 // PlzNavigate.
37 bool defer_ignored = false; 43 bool defer_ignored = false;
38 next_handler_->OnResponseStarted(response, &defer_ignored); 44 if (!next_handler_->OnResponseStarted(response, &defer_ignored))
45 return false;
39 46
40 // Although deferring OnResponseStarted is legal, the only downstream handler 47 // Although deferring OnResponseStarted is legal, the only downstream handler
41 // which does so is CrossSiteResourceHandler. Cross-site transitions should 48 // which does so is CrossSiteResourceHandler. Cross-site transitions should
42 // not trigger when switching handlers. 49 // not trigger when switching handlers.
43 DCHECK(!defer_ignored); 50 DCHECK(!defer_ignored);
44 51
45 // Make a copy of the data in the first read buffer. Despite not having been 52 // TODO(yhirano): Retaining ownership from a raw pointer is bad.
46 // informed of any data being stored in first_read_buffer_, the 53 response_ = response;
47 // MimeSniffingResourceHandler has read the data, it's just holding it back. 54 state_ = State::SENDING_PAYLOAD_TO_OLD_HANDLER;
48 // This data should be passed to the alternate ResourceHandler and not to to 55 return DoLoop(defer);
49 // the current ResourceHandler.
50 // TODO(clamy): see if doing the copy should be moved to the
51 // MimeSniffingResourceHandler.
52 if (first_read_buffer_) {
53 first_read_buffer_copy_ = new net::IOBuffer(first_read_buffer_size_);
54 memcpy(first_read_buffer_copy_->data(), first_read_buffer_->data(),
55 first_read_buffer_size_);
56 }
57
58 // Send the payload to the old handler.
59 SendPayloadToOldHandler();
60 first_read_buffer_ = nullptr;
61
62 // The original ResourceHandler is now no longer needed, so replace it with
63 // the new one, before sending the response to the new one.
64 next_handler_ = std::move(new_handler_);
65
66 state_ =
67 first_read_buffer_copy_ ? State::WAITING_FOR_BUFFER_COPY : State::DONE;
68
69 return next_handler_->OnResponseStarted(response, defer);
70 } 56 }
71 57
72 bool InterceptingResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf, 58 bool InterceptingResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
73 int* buf_size, 59 int* buf_size,
74 int min_size) { 60 int min_size) {
75 if (state_ == State::DONE) 61 if (state_ == State::PASS_THROUGH)
76 return next_handler_->OnWillRead(buf, buf_size, min_size); 62 return next_handler_->OnWillRead(buf, buf_size, min_size);
77 63
78 DCHECK_EQ(State::STARTING, state_); 64 DCHECK_EQ(State::STARTING, state_);
79 DCHECK_EQ(-1, min_size); 65 DCHECK_EQ(-1, min_size);
80 66
81 if (!next_handler_->OnWillRead(buf, buf_size, min_size)) 67 if (!next_handler_->OnWillRead(buf, buf_size, min_size))
82 return false; 68 return false;
83 69
84 first_read_buffer_ = *buf; 70 first_read_buffer_ = *buf;
85 first_read_buffer_size_ = *buf_size; 71 first_read_buffer_size_ = *buf_size;
72 first_read_buffer_double_ = new net::IOBuffer(static_cast<size_t>(*buf_size));
73 *buf = first_read_buffer_double_;
86 return true; 74 return true;
87 } 75 }
88 76
89 bool InterceptingResourceHandler::OnReadCompleted(int bytes_read, bool* defer) { 77 bool InterceptingResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
90 DCHECK(bytes_read >= 0); 78 DCHECK_GE(bytes_read, 0);
91 if (state_ == State::DONE) 79 if (state_ == State::PASS_THROUGH) {
80 if (first_read_buffer_double_) {
81 // |first_read_buffer_double_| was allocated and the user wrote data to
82 // the buffer, but switching has not been done after all.
83 memcpy(first_read_buffer_->data(), first_read_buffer_double_->data(),
84 bytes_read);
85 first_read_buffer_ = nullptr;
86 first_read_buffer_double_ = nullptr;
87 }
92 return next_handler_->OnReadCompleted(bytes_read, defer); 88 return next_handler_->OnReadCompleted(bytes_read, defer);
93 89 }
94 DCHECK_EQ(State::WAITING_FOR_BUFFER_COPY, state_); 90
95 state_ = State::DONE; 91 DCHECK_EQ(State::WAITING_FOR_ON_READ_COMPLETED, state_);
96 92 first_read_buffer_bytes_read_ = bytes_read;
97 // Copy the data from the first read to the new ResourceHandler. 93 state_ = State::SENDING_BUFFER_TO_NEW_HANDLER;
98 scoped_refptr<net::IOBuffer> buf; 94 return DoLoop(defer);
99 int buf_len = 0; 95 }
100 if (!next_handler_->OnWillRead(&buf, &buf_len, bytes_read)) 96
101 return false; 97 void InterceptingResourceHandler::OnResponseCompleted(
102 98 const net::URLRequestStatus& status,
103 CHECK(buf_len >= bytes_read); 99 bool* defer) {
104 CHECK_GE(first_read_buffer_size_, static_cast<size_t>(bytes_read)); 100 if (state_ == State::PASS_THROUGH) {
105 memcpy(buf->data(), first_read_buffer_copy_->data(), bytes_read); 101 LayeredResourceHandler::OnResponseCompleted(status, defer);
106 102 return;
107 first_read_buffer_copy_ = nullptr; 103 }
108 104 if (!new_handler_) {
109 // TODO(clamy): Add a unit test to check that the deferral value is properly 105 // Therer is only one ResourceHandler in this InterceptingResourceHandler.
110 // passed to the caller. 106 state_ = State::PASS_THROUGH;
111 return next_handler_->OnReadCompleted(bytes_read, defer); 107 first_read_buffer_double_ = nullptr;
108 next_handler_->SetController(controller());
109 next_handler_->OnResponseCompleted(status, defer);
110 return;
111 }
112
113 // There are two ResourceHandlers in this InterceptingResourceHandler.
114 // |next_handler_| is the old handler and |new_handler_| is the new handler.
115 // As written in the class comment, this class assumes that the old handler
116 // will not set |*defer| in OnResponseCompleted.
117 next_handler_->SetController(controller());
118 next_handler_->OnResponseCompleted(status, defer);
119 DCHECK(!*defer);
120
121 state_ = State::PASS_THROUGH;
122 first_read_buffer_double_ = nullptr;
123 new_handler_->SetController(controller());
124 next_handler_ = std::move(new_handler_);
125 next_handler_->OnResponseCompleted(status, defer);
126 }
127
128 void InterceptingResourceHandler::Cancel() {
129 DCHECK_NE(State::PASS_THROUGH, state_);
130 controller()->Cancel();
131 }
132
133 void InterceptingResourceHandler::CancelAndIgnore() {
134 DCHECK_NE(State::PASS_THROUGH, state_);
135 controller()->CancelAndIgnore();
136 }
137
138 void InterceptingResourceHandler::CancelWithError(int error_code) {
139 DCHECK_NE(State::PASS_THROUGH, state_);
140 controller()->CancelWithError(error_code);
141 }
142
143 void InterceptingResourceHandler::Resume() {
144 DCHECK_NE(State::PASS_THROUGH, state_);
145 if (state_ == State::STARTING ||
146 state_ == State::WAITING_FOR_ON_READ_COMPLETED) {
147 // Uninteresting Resume: just delegate to the original resource controller.
148 controller()->Resume();
149 return;
150 }
151 bool defer = false;
152 if (!DoLoop(&defer)) {
153 controller()->Cancel();
154 return;
155 }
156
157 if (!defer)
158 controller()->Resume();
112 } 159 }
113 160
114 void InterceptingResourceHandler::UseNewHandler( 161 void InterceptingResourceHandler::UseNewHandler(
115 std::unique_ptr<ResourceHandler> new_handler, 162 std::unique_ptr<ResourceHandler> new_handler,
116 const std::string& payload_for_old_handler) { 163 const std::string& payload_for_old_handler) {
117 new_handler_ = std::move(new_handler); 164 new_handler_ = std::move(new_handler);
118 new_handler_->SetController(controller()); 165 new_handler_->SetController(this);
119 payload_for_old_handler_ = payload_for_old_handler; 166 payload_for_old_handler_ = payload_for_old_handler;
120 } 167 }
121 168
122 void InterceptingResourceHandler::SendPayloadToOldHandler() { 169 bool InterceptingResourceHandler::DoLoop(bool* defer) {
123 bool defer_ignored = false; 170 bool result = true;
171 do {
172 switch (state_) {
173 case State::STARTING:
174 case State::WAITING_FOR_ON_READ_COMPLETED:
175 case State::PASS_THROUGH:
176 NOTREACHED();
177 break;
178 case State::NOTIFYING_ON_RESPONSE_STARTED_TO_NEW_HANDLER:
179 if (first_read_buffer_double_) {
180 // OnWillRead has been called, so copying the data from
181 // |first_read_buffer_double_| to |first_read_buffer_| will be needed
182 // when OnReadCompleted is called.
183 state_ = State::WAITING_FOR_ON_READ_COMPLETED;
184 } else {
185 // OnWillRead has not been called, so no special handling will be
186 // needed from now on.
187 state_ = State::PASS_THROUGH;
188 next_handler_->SetController(controller());
189 }
190 break;
191 case State::SENDING_PAYLOAD_TO_OLD_HANDLER:
192 result = SendPayloadToOldHandler(defer);
193 break;
194 case State::SENDING_BUFFER_TO_NEW_HANDLER:
195 result = SendFirstReadBufferToNewHandler(defer);
196 break;
197 }
198 } while (result && !*defer &&
199 state_ != State::WAITING_FOR_ON_READ_COMPLETED &&
200 state_ != State::PASS_THROUGH);
201 return result;
202 }
203
204 bool InterceptingResourceHandler::SendPayloadToOldHandler(bool* defer) {
205 DCHECK_EQ(State::SENDING_PAYLOAD_TO_OLD_HANDLER, state_);
206 while (payload_bytes_written_ < payload_for_old_handler_.size()) {
207 scoped_refptr<net::IOBuffer> buffer;
208 int size = 0;
209 if (first_read_buffer_) {
210 // |first_read_buffer_| is a buffer gotten from |next_handler_| via
211 // OnWillRead. Use the buffer.
212 buffer = first_read_buffer_;
213 size = first_read_buffer_size_;
214
215 first_read_buffer_ = nullptr;
216 first_read_buffer_size_ = 0;
217 } else {
218 if (!next_handler_->OnWillRead(&buffer, &size, -1))
219 return false;
220 }
221
222 size = std::min(size, static_cast<int>(payload_for_old_handler_.size() -
223 payload_bytes_written_));
224 memcpy(buffer->data(),
225 payload_for_old_handler_.data() + payload_bytes_written_, size);
226 if (!next_handler_->OnReadCompleted(size, defer))
227 return false;
228 payload_bytes_written_ += size;
229 if (*defer)
230 return true;
231 }
232
233 net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
124 if (payload_for_old_handler_.empty()) { 234 if (payload_for_old_handler_.empty()) {
125 // If there is no payload, just finalize the request on the old handler. 235 // If there is no payload, just finalize the request on the old handler.
126 net::URLRequestStatus status(net::URLRequestStatus::CANCELED, 236 status = net::URLRequestStatus::FromError(net::ERR_ABORTED);
127 net::ERR_ABORTED); 237 }
128 next_handler_->OnResponseCompleted(status, &defer_ignored); 238 next_handler_->OnResponseCompleted(status, defer);
129 DCHECK(!defer_ignored); 239 DCHECK(!*defer);
130 return; 240
131 } 241 next_handler_ = std::move(new_handler_);
132 242 state_ = State::NOTIFYING_ON_RESPONSE_STARTED_TO_NEW_HANDLER;
133 // Ensure the old ResourceHandler has a buffer that can store the payload. 243 return next_handler_->OnResponseStarted(response_.get(), defer);
134 scoped_refptr<net::IOBuffer> buf; 244 }
135 int size = 0; 245
136 if (first_read_buffer_) { 246 bool InterceptingResourceHandler::SendFirstReadBufferToNewHandler(bool* defer) {
137 // The first read buffer can be reused. The data inside it has been copied 247 DCHECK_EQ(state_, State::SENDING_BUFFER_TO_NEW_HANDLER);
138 // before calling this function, so it can safely be overriden. 248
139 buf = first_read_buffer_; 249 while (first_read_buffer_bytes_written_ < first_read_buffer_bytes_read_) {
140 size = first_read_buffer_size_; 250 scoped_refptr<net::IOBuffer> buf;
141 } 251 int size = 0;
142 252 if (!next_handler_->OnWillRead(&buf, &size, -1))
143 // If there is no first read buffer, ask the old ResourceHandler to create a 253 return false;
144 // buffer that can contain payload. 254 size = std::min(size, static_cast<int>(first_read_buffer_bytes_read_ -
145 if (!buf) 255 first_read_buffer_bytes_written_));
146 next_handler_->OnWillRead(&buf, &size, -1); 256 memcpy(buf->data(),
147 257 first_read_buffer_double_->data() + first_read_buffer_bytes_written_,
148 DCHECK(buf); 258 size);
149 CHECK_GE(size, static_cast<int>(payload_for_old_handler_.length())); 259 if (!next_handler_->OnReadCompleted(size, defer))
150 memcpy(buf->data(), payload_for_old_handler_.c_str(), 260 return false;
151 payload_for_old_handler_.length()); 261 first_read_buffer_bytes_written_ += size;
152 next_handler_->OnReadCompleted(payload_for_old_handler_.length(), 262 if (*defer)
153 &defer_ignored); 263 return true;
154 payload_for_old_handler_ = std::string(); 264 }
155 DCHECK(!defer_ignored); 265
156 266 state_ = State::PASS_THROUGH;
157 // Finalize the request. 267 first_read_buffer_double_ = nullptr;
158 net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0); 268 next_handler_->SetController(controller());
159 next_handler_->OnResponseCompleted(status, &defer_ignored); 269 return true;
160 DCHECK(!defer_ignored);
161 } 270 }
162 271
163 } // namespace content 272 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698