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

Unified Diff: content/browser/service_worker/service_worker_provider_host.h

Issue 2009453002: service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refactor errorMessage Created 4 years, 6 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_provider_host.h
diff --git a/content/browser/service_worker/service_worker_provider_host.h b/content/browser/service_worker/service_worker_provider_host.h
index 0372b11dded2c624f8e78d0a17c2be358d9d0911..294193f3fcd549f42dd92d2a0dda14babbce69d5 100644
--- a/content/browser/service_worker/service_worker_provider_host.h
+++ b/content/browser/service_worker/service_worker_provider_host.h
@@ -61,6 +61,8 @@ class CONTENT_EXPORT ServiceWorkerProviderHost
static std::unique_ptr<ServiceWorkerProviderHost> PreCreateNavigationHost(
base::WeakPtr<ServiceWorkerContextCore> context);
+ enum class FrameSecurityLevel { UNINITIALIZED, INSECURE, SECURE };
+
// When this provider host is for a Service Worker context, |route_id| is
// MSG_ROUTING_NONE. When this provider host is for a Document,
// |route_id| is the frame ID of the Document. When this provider host is for
@@ -72,6 +74,7 @@ class CONTENT_EXPORT ServiceWorkerProviderHost
int route_id,
int provider_id,
ServiceWorkerProviderType provider_type,
+ FrameSecurityLevel parent_frame_security_level,
base::WeakPtr<ServiceWorkerContextCore> context,
ServiceWorkerDispatcherHost* dispatcher_host);
virtual ~ServiceWorkerProviderHost();
@@ -82,6 +85,26 @@ class CONTENT_EXPORT ServiceWorkerProviderHost
int frame_id() const;
int route_id() const { return route_id_; }
+ bool is_parent_frame_secure() const {
+ return parent_frame_security_level_ == FrameSecurityLevel::SECURE;
+ }
+ void set_parent_frame_secure(bool is_parent_frame_secure) {
+ CHECK_EQ(parent_frame_security_level_, FrameSecurityLevel::UNINITIALIZED);
+ parent_frame_security_level_ = is_parent_frame_secure
+ ? FrameSecurityLevel::SECURE
+ : FrameSecurityLevel::INSECURE;
+ }
+
+ // Returns whether this provider host is secure enough to have a service
+ // worker controller.
+ // Analogous to Blink's Document::isSecureContext. Because of how service
+ // worker intercepts main resource requests, this check must be done
+ // browser-side once the URL is known (see comments in
+ // ServiceWorkerNetworkProvider::CreateForNavigation). This function uses
+ // |document_url_| and |is_parent_frame_secure_| to determine context
+ // security, so they must be set properly before calling this function.
+ bool IsContextSecureForServiceWorker() const;
+
bool IsHostToRunningServiceWorker() {
return running_hosted_version_.get() != NULL;
}
@@ -259,6 +282,7 @@ class CONTENT_EXPORT ServiceWorkerProviderHost
UpdateForceBypassCache);
FRIEND_TEST_ALL_PREFIXES(ServiceWorkerContextRequestHandlerTest,
ServiceWorkerDataRequestAnnotation);
+ FRIEND_TEST_ALL_PREFIXES(ServiceWorkerProviderHostTest, ContextSecurity);
struct OneShotGetReadyCallback {
GetRegistrationForReadyCallback callback;
@@ -307,6 +331,7 @@ class CONTENT_EXPORT ServiceWorkerProviderHost
int render_thread_id_;
int provider_id_;
ServiceWorkerProviderType provider_type_;
+ FrameSecurityLevel parent_frame_security_level_;
GURL document_url_;
GURL topmost_frame_url_;

Powered by Google App Engine
This is Rietveld 408576698