OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/service_worker/service_worker_dispatcher_host.h" | 5 #include "content/browser/service_worker/service_worker_dispatcher_host.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/profiler/scoped_tracker.h" | 8 #include "base/profiler/scoped_tracker.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| 11 #include "chrome/common/origin_util.h" |
11 #include "content/browser/message_port_message_filter.h" | 12 #include "content/browser/message_port_message_filter.h" |
12 #include "content/browser/message_port_service.h" | 13 #include "content/browser/message_port_service.h" |
13 #include "content/browser/service_worker/embedded_worker_registry.h" | 14 #include "content/browser/service_worker/embedded_worker_registry.h" |
14 #include "content/browser/service_worker/service_worker_context_core.h" | 15 #include "content/browser/service_worker/service_worker_context_core.h" |
15 #include "content/browser/service_worker/service_worker_context_wrapper.h" | 16 #include "content/browser/service_worker/service_worker_context_wrapper.h" |
16 #include "content/browser/service_worker/service_worker_handle.h" | 17 #include "content/browser/service_worker/service_worker_handle.h" |
17 #include "content/browser/service_worker/service_worker_registration.h" | 18 #include "content/browser/service_worker/service_worker_registration.h" |
18 #include "content/browser/service_worker/service_worker_registration_handle.h" | 19 #include "content/browser/service_worker/service_worker_registration_handle.h" |
19 #include "content/browser/service_worker/service_worker_utils.h" | 20 #include "content/browser/service_worker/service_worker_utils.h" |
20 #include "content/common/service_worker/embedded_worker_messages.h" | 21 #include "content/common/service_worker/embedded_worker_messages.h" |
(...skipping 26 matching lines...) Expand all Loading... |
47 | 48 |
48 bool AllOriginsMatch(const GURL& url_a, const GURL& url_b, const GURL& url_c) { | 49 bool AllOriginsMatch(const GURL& url_a, const GURL& url_b, const GURL& url_c) { |
49 return url_a.GetOrigin() == url_b.GetOrigin() && | 50 return url_a.GetOrigin() == url_b.GetOrigin() && |
50 url_a.GetOrigin() == url_c.GetOrigin(); | 51 url_a.GetOrigin() == url_c.GetOrigin(); |
51 } | 52 } |
52 | 53 |
53 // TODO(dominicc): When crbug.com/362214 is fixed use that to be | 54 // TODO(dominicc): When crbug.com/362214 is fixed use that to be |
54 // consistent with Blink's | 55 // consistent with Blink's |
55 // SecurityOrigin::canAccessFeatureRequiringSecureOrigin. | 56 // SecurityOrigin::canAccessFeatureRequiringSecureOrigin. |
56 bool OriginCanAccessServiceWorkers(const GURL& url) { | 57 bool OriginCanAccessServiceWorkers(const GURL& url) { |
57 return url.SchemeIsHTTPOrHTTPS() && | 58 return url.SchemeIsHTTPOrHTTPS() && IsOriginSecure(url); |
58 (url.SchemeIsSecure() || net::IsLocalhost(url.host())); | |
59 } | 59 } |
60 | 60 |
61 bool CanRegisterServiceWorker(const GURL& document_url, | 61 bool CanRegisterServiceWorker(const GURL& document_url, |
62 const GURL& pattern, | 62 const GURL& pattern, |
63 const GURL& script_url) { | 63 const GURL& script_url) { |
64 DCHECK(document_url.is_valid()); | 64 DCHECK(document_url.is_valid()); |
65 DCHECK(pattern.is_valid()); | 65 DCHECK(pattern.is_valid()); |
66 DCHECK(script_url.is_valid()); | 66 DCHECK(script_url.is_valid()); |
67 return AllOriginsMatch(document_url, pattern, script_url) && | 67 return AllOriginsMatch(document_url, pattern, script_url) && |
68 OriginCanAccessServiceWorkers(document_url) && | 68 OriginCanAccessServiceWorkers(document_url) && |
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1035 ServiceWorkerHandle* handle = handles_.Lookup(handle_id); | 1035 ServiceWorkerHandle* handle = handles_.Lookup(handle_id); |
1036 if (!handle) { | 1036 if (!handle) { |
1037 BadMessageReceived(); | 1037 BadMessageReceived(); |
1038 return; | 1038 return; |
1039 } | 1039 } |
1040 handle->version()->StopWorker( | 1040 handle->version()->StopWorker( |
1041 base::Bind(&ServiceWorkerUtils::NoOpStatusCallback)); | 1041 base::Bind(&ServiceWorkerUtils::NoOpStatusCallback)); |
1042 } | 1042 } |
1043 | 1043 |
1044 } // namespace content | 1044 } // namespace content |
OLD | NEW |