OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ssl/ssl_manager.h" | 5 #include "content/browser/ssl/ssl_manager.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 NavigationEntryImpl* navigation_entry = controller_->GetLastCommittedEntry(); | 160 NavigationEntryImpl* navigation_entry = controller_->GetLastCommittedEntry(); |
161 policy()->DidRunContentWithCertErrors(navigation_entry, security_origin); | 161 policy()->DidRunContentWithCertErrors(navigation_entry, security_origin); |
162 UpdateEntry(navigation_entry); | 162 UpdateEntry(navigation_entry); |
163 } | 163 } |
164 | 164 |
165 void SSLManager::DidStartResourceResponse( | 165 void SSLManager::DidStartResourceResponse( |
166 const ResourceRequestDetails& details) { | 166 const ResourceRequestDetails& details) { |
167 // Notify our policy that we started a resource request. Ideally, the | 167 // Notify our policy that we started a resource request. Ideally, the |
168 // policy should have the ability to cancel the request, but we can't do | 168 // policy should have the ability to cancel the request, but we can't do |
169 // that yet. | 169 // that yet. |
170 policy()->OnRequestStarted(details.url, details.ssl_cert_id, | 170 policy()->OnRequestStarted(details.url, details.has_certificate, |
171 details.ssl_cert_status); | 171 details.ssl_cert_status); |
172 } | 172 } |
173 | 173 |
174 void SSLManager::DidReceiveResourceRedirect( | 174 void SSLManager::DidReceiveResourceRedirect( |
175 const ResourceRedirectDetails& details) { | 175 const ResourceRedirectDetails& details) { |
176 // TODO(abarth): Make sure our redirect behavior is correct. If we ever see a | 176 // TODO(abarth): Make sure our redirect behavior is correct. If we ever see a |
177 // non-HTTPS resource in the redirect chain, we want to trigger | 177 // non-HTTPS resource in the redirect chain, we want to trigger |
178 // insecure content, even if the redirect chain goes back to | 178 // insecure content, even if the redirect chain goes back to |
179 // HTTPS. This is because the network attacker can redirect the | 179 // HTTPS. This is because the network attacker can redirect the |
180 // HTTP request to https://attacker.com/payload.js. | 180 // HTTP request to https://attacker.com/payload.js. |
(...skipping 13 matching lines...) Expand all Loading... |
194 NotifyDidChangeVisibleSSLState(); | 194 NotifyDidChangeVisibleSSLState(); |
195 } | 195 } |
196 | 196 |
197 void SSLManager::NotifyDidChangeVisibleSSLState() { | 197 void SSLManager::NotifyDidChangeVisibleSSLState() { |
198 WebContentsImpl* contents = | 198 WebContentsImpl* contents = |
199 static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents()); | 199 static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents()); |
200 contents->DidChangeVisibleSSLState(); | 200 contents->DidChangeVisibleSSLState(); |
201 } | 201 } |
202 | 202 |
203 } // namespace content | 203 } // namespace content |
OLD | NEW |