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

Unified Diff: content/browser/service_worker/service_worker_url_request_job.cc

Issue 877623002: [ServiceWorker] Fills SSLInfo of the response from a SW with the SSLInfo of the SW script. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_url_request_job.cc
diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc
index ecac952807c5e12ea09151ff96629d61d62c9215..4c6c59dd632cb1f04a08d18752eeb635c2beb5fd 100644
--- a/content/browser/service_worker/service_worker_url_request_job.cc
+++ b/content/browser/service_worker/service_worker_url_request_job.cc
@@ -112,7 +112,9 @@ bool ServiceWorkerURLRequestJob::GetMimeType(std::string* mime_type) const {
void ServiceWorkerURLRequestJob::GetResponseInfo(net::HttpResponseInfo* info) {
if (!http_info())
return;
+ const base::Time request_time = info->request_time;
*info = *http_info();
+ info->request_time = request_time;
info->response_time = response_time_;
}
@@ -538,6 +540,16 @@ void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
fetch_end_time_ = base::TimeTicks::Now();
load_timing_info_.send_end = fetch_end_time_;
+ // Creates a new HttpResponseInfo using the the ServiceWorker script's
+ // HttpResponseInfo to show HTTPS padlock.
+ // TODO(horo): When we support mixed-content (HTTP) no-cors requests from a
+ // ServiceWorker, we have to check the security level of the responses.
+ DCHECK(!http_response_info_);
+ const net::HttpResponseInfo* main_script_http_info =
+ provider_host_->active_version()->GetMainScriptHttpResponseInfo();
+ DCHECK(main_script_http_info);
+ http_response_info_.reset(new net::HttpResponseInfo(*main_script_http_info));
+
// Set up a request for reading the stream.
if (response.stream_url.is_valid()) {
DCHECK(response.blob_uuid.empty());
@@ -610,8 +622,11 @@ void ServiceWorkerURLRequestJob::CreateResponseHeader(
}
void ServiceWorkerURLRequestJob::CommitResponseHeader() {
- http_response_info_.reset(new net::HttpResponseInfo());
+ if (!http_response_info_)
+ http_response_info_.reset(new net::HttpResponseInfo());
http_response_info_->headers.swap(http_response_headers_);
+ http_response_info_->vary_data = net::HttpVaryData();
+ http_response_info_->metadata = nullptr;
NotifyHeadersComplete();
}

Powered by Google App Engine
This is Rietveld 408576698