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

Unified Diff: chrome/browser/content_settings/mixed_content_settings.cc

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Moved methods from ContentBrowserClient to WebContentsDelegate; all caps constant names. Created 3 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: chrome/browser/content_settings/mixed_content_settings.cc
diff --git a/chrome/browser/content_settings/mixed_content_settings.cc b/chrome/browser/content_settings/mixed_content_settings.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7d46ac344be9e019e217c3ec30d9aa199391806a
--- /dev/null
+++ b/chrome/browser/content_settings/mixed_content_settings.cc
@@ -0,0 +1,59 @@
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/content_settings/mixed_content_settings.h"
+
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/site_instance.h"
+
+using content::BrowserThread;
+using content::WebContents;
+
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(MixedContentSettings);
+
+MixedContentSettings::MixedContentSettings(WebContents* tab)
+ : content::WebContentsObserver(tab),
+ insecure_content_site_instance_(nullptr),
+ insecure_content_allowed_running_(false) {
+ if (tab->HasOpener()) {
+ // Note: using the opener WebContents to override these settings only works
+ // because Chrome controls them at the tab level instead of at the frame
+ // level as Blink does.
+ MixedContentSettings* opener_settings =
+ MixedContentSettings::FromWebContents(tab->GetOpener());
+ if (opener_settings) {
+ insecure_content_site_instance_ =
+ opener_settings->insecure_content_site_instance_;
+ insecure_content_allowed_running_ =
+ opener_settings->insecure_content_allowed_running_;
+ }
+ }
+}
+
+MixedContentSettings::~MixedContentSettings() {}
+
+void MixedContentSettings::AllowRunningOfInsecureContent() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(!insecure_content_site_instance_ ||
+ insecure_content_site_instance_ == web_contents()->GetSiteInstance());
+ insecure_content_site_instance_ = web_contents()->GetSiteInstance();
+ insecure_content_allowed_running_ = true;
+}
+
+void MixedContentSettings::DidFinishNavigation(
+ content::NavigationHandle* navigation_handle) {
+ if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
+ return;
+
+ // Resets mixed-content settings on a successful navigation of the main frame
+ // to a new site instance.
jam 2017/01/11 16:38:06 I don't understand why site instance is involved h
carlosk 2017/01/11 22:15:02 That's not how the mixed content settings are rese
jam 2017/01/12 01:39:00 Ah, thanks for the explanation. I had assumed it w
carlosk 2017/01/12 17:44:02 That was indeed missing. I added a detailed explan
+ content::SiteInstance* new_site =
+ navigation_handle->GetRenderFrameHost()->GetSiteInstance();
+ if (new_site != insecure_content_site_instance_) {
+ insecure_content_site_instance_ = nullptr;
+ insecure_content_allowed_running_ = false;
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698