summaryrefslogtreecommitdiffstats
path: root/content/browser/ssl
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/ssl')
-rw-r--r--content/browser/ssl/ssl_manager.cc81
-rw-r--r--content/browser/ssl/ssl_manager.h9
-rw-r--r--content/browser/ssl/ssl_policy_backend.cc2
3 files changed, 59 insertions, 33 deletions
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index d41260e..18c64c8 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -4,7 +4,10 @@
#include "content/browser/ssl/ssl_manager.h"
+#include <set>
+
#include "base/bind.h"
+#include "base/supports_user_data.h"
#include "base/utf_string_conversions.h"
#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/loader/resource_request_info_impl.h"
@@ -14,6 +17,7 @@
#include "content/browser/web_contents/navigation_entry_impl.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/ssl_status_serialization.h"
+#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/load_from_memory_cache_details.h"
#include "content/public/browser/navigation_details.h"
@@ -25,6 +29,25 @@
namespace content {
+namespace {
+
+const char kSSLManagerKeyName[] = "content_ssl_manager";
+
+class SSLManagerSet : public base::SupportsUserData::Data {
+ public:
+ SSLManagerSet() {
+ }
+
+ std::set<SSLManager*>& get() { return set_; }
+
+ private:
+ std::set<SSLManager*> set_;
+
+ DISALLOW_COPY_AND_ASSIGN(SSLManagerSet);
+};
+
+} // namespace
+
// static
void SSLManager::OnSSLCertificateError(
const base::WeakPtr<SSLErrorHandler::Delegate>& delegate,
@@ -61,12 +84,15 @@ void SSLManager::OnSSLCertificateError(
}
// static
-void SSLManager::NotifySSLInternalStateChanged(
- NavigationControllerImpl* controller) {
- NotificationService::current()->Notify(
- NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
- Source<BrowserContext>(controller->GetBrowserContext()),
- NotificationService::NoDetails());
+void SSLManager::NotifySSLInternalStateChanged(BrowserContext* context) {
+ SSLManagerSet* managers = static_cast<SSLManagerSet*>(
+ context->GetUserData(kSSLManagerKeyName));
+
+ for (std::set<SSLManager*>::iterator i = managers->get().begin();
+ i != managers->get().end(); ++i) {
+ (*i)->UpdateEntry(NavigationEntryImpl::FromNavigationEntry(
+ (*i)->controller()->GetActiveEntry()));
+ }
}
SSLManager::SSLManager(NavigationControllerImpl* controller)
@@ -85,13 +111,20 @@ SSLManager::SSLManager(NavigationControllerImpl* controller)
registrar_.Add(
this, NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
Source<NavigationController>(controller_));
- registrar_.Add(
- this, NOTIFICATION_SSL_INTERNAL_STATE_CHANGED,
- Source<BrowserContext>(
- controller_->GetBrowserContext()));
+
+ SSLManagerSet* managers = static_cast<SSLManagerSet*>(
+ controller_->GetBrowserContext()->GetUserData(kSSLManagerKeyName));
+ if (!managers) {
+ managers = new SSLManagerSet;
+ controller_->GetBrowserContext()->SetUserData(kSSLManagerKeyName, managers);
+ }
+ managers->get().insert(this);
}
SSLManager::~SSLManager() {
+ SSLManagerSet* managers = static_cast<SSLManagerSet*>(
+ controller_->GetBrowserContext()->GetUserData(kSSLManagerKeyName));
+ managers->get().erase(this);
}
void SSLManager::DidCommitProvisionalLoad(
@@ -128,10 +161,16 @@ void SSLManager::DidCommitProvisionalLoad(
UpdateEntry(entry);
}
+void SSLManager::DidDisplayInsecureContent() {
+ UpdateEntry(
+ NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()));
+}
+
void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
- policy()->DidRunInsecureContent(
- NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()),
- security_origin);
+ NavigationEntryImpl* navigation_entry =
+ NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry());
+ policy()->DidRunInsecureContent(navigation_entry, security_origin);
+ UpdateEntry(navigation_entry);
}
void SSLManager::Observe(int type,
@@ -151,9 +190,6 @@ void SSLManager::Observe(int type,
DidLoadFromMemoryCache(
Details<LoadFromMemoryCacheDetails>(details).ptr());
break;
- case NOTIFICATION_SSL_INTERNAL_STATE_CHANGED:
- DidChangeSSLInternalState();
- break;
default:
NOTREACHED() << "The SSLManager received an unexpected notification.";
}
@@ -198,11 +234,6 @@ void SSLManager::DidReceiveResourceRedirect(ResourceRedirectDetails* details) {
// HTTP request to https://attacker.com/payload.js.
}
-void SSLManager::DidChangeSSLInternalState() {
- UpdateEntry(
- NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()));
-}
-
void SSLManager::UpdateEntry(NavigationEntryImpl* entry) {
// We don't always have a navigation entry to update, for example in the
// case of the Web Inspector.
@@ -213,12 +244,8 @@ void SSLManager::UpdateEntry(NavigationEntryImpl* entry) {
policy()->UpdateEntry(entry, controller_->web_contents());
- if (!entry->GetSSL().Equals(original_ssl_status)) {
- NotificationService::current()->Notify(
- NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
- Source<NavigationController>(controller_),
- NotificationService::NoDetails());
- }
+ if (!entry->GetSSL().Equals(original_ssl_status))
+ controller_->web_contents()->DidChangeVisibleSSLState();
}
} // namespace content
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index 4349a90..8cd1668 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -25,6 +25,7 @@ class SSLInfo;
}
namespace content {
+class BrowserContext;
class NavigationEntryImpl;
class NavigationControllerImpl;
class SSLPolicy;
@@ -58,10 +59,8 @@ class SSLManager : public NotificationObserver {
const net::SSLInfo& ssl_info,
bool fatal);
- // Called when SSL state for a host or tab changes. Broadcasts the
- // SSL_INTERNAL_STATE_CHANGED notification.
- static void NotifySSLInternalStateChanged(
- NavigationControllerImpl* controller);
+ // Called when SSL state for a host or tab changes.
+ static void NotifySSLInternalStateChanged(BrowserContext* context);
// Construct an SSLManager for the specified tab.
// If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
@@ -81,6 +80,7 @@ class SSLManager : public NotificationObserver {
void DidCommitProvisionalLoad(const NotificationDetails& details);
// Insecure content entry point.
+ void DidDisplayInsecureContent();
void DidRunInsecureContent(const std::string& security_origin);
// Entry point for navigation. This function begins the process of updating
@@ -99,7 +99,6 @@ class SSLManager : public NotificationObserver {
void DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details);
void DidStartResourceResponse(ResourceRequestDetails* details);
void DidReceiveResourceRedirect(ResourceRedirectDetails* details);
- void DidChangeSSLInternalState();
// Update the NavigationEntry with our current state.
void UpdateEntry(NavigationEntryImpl* entry);
diff --git a/content/browser/ssl/ssl_policy_backend.cc b/content/browser/ssl/ssl_policy_backend.cc
index c405b79..8aa8bc7 100644
--- a/content/browser/ssl/ssl_policy_backend.cc
+++ b/content/browser/ssl/ssl_policy_backend.cc
@@ -18,7 +18,7 @@ SSLPolicyBackend::SSLPolicyBackend(NavigationControllerImpl* controller)
void SSLPolicyBackend::HostRanInsecureContent(const std::string& host, int id) {
ssl_host_state_->HostRanInsecureContent(host, id);
- SSLManager::NotifySSLInternalStateChanged(controller_);
+ SSLManager::NotifySSLInternalStateChanged(controller_->GetBrowserContext());
}
bool SSLPolicyBackend::DidHostRunInsecureContent(const std::string& host,
generated by cgit v1.1 at 2025-04-01 09:45:51 +0000