Title: [185795] trunk/Source/WebKit2
- Revision
- 185795
- Author
- [email protected]
- Date
- 2015-06-20 09:06:23 -0700 (Sat, 20 Jun 2015)
Log Message
Check for SHA1 certificates ignores subresources
https://bugs.webkit.org/show_bug.cgi?id=146159
Reviewed by Dan Bernstein.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didCommitLoadForFrame): Call
PageLoadState::didDisplayOrRunInsecureContent if a certificate chain contains a non-root
SHA1 certificate when the frame is not the main frame.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185794 => 185795)
--- trunk/Source/WebKit2/ChangeLog 2015-06-20 15:57:03 UTC (rev 185794)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-20 16:06:23 UTC (rev 185795)
@@ -1,3 +1,15 @@
+2015-06-20 Michael Catanzaro <[email protected]>
+
+ Check for SHA1 certificates ignores subresources
+ https://bugs.webkit.org/show_bug.cgi?id=146159
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didCommitLoadForFrame): Call
+ PageLoadState::didDisplayOrRunInsecureContent if a certificate chain contains a non-root
+ SHA1 certificate when the frame is not the main frame.
+
2015-06-20 Dan Bernstein <[email protected]>
Added availability information to a recently-added delegate method.
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (185794 => 185795)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-20 15:57:03 UTC (rev 185794)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-06-20 16:06:23 UTC (rev 185795)
@@ -2941,12 +2941,12 @@
#endif
auto transaction = m_pageLoadState.transaction();
+ bool markPageInsecure = m_treatsSHA1CertificatesAsInsecure && certificateInfo.containsNonRootSHA1SignedCertificate();
+ if (frame->isMainFrame())
+ m_pageLoadState.didCommitLoad(transaction, markPageInsecure);
+ else if (markPageInsecure)
+ m_pageLoadState.didDisplayOrRunInsecureContent(transaction);
- if (frame->isMainFrame()) {
- bool hasInsecureCertificateChain = m_treatsSHA1CertificatesAsInsecure && certificateInfo.containsNonRootSHA1SignedCertificate();
- m_pageLoadState.didCommitLoad(transaction, hasInsecureCertificateChain);
- }
-
#if USE(APPKIT)
// FIXME (bug 59111): didCommitLoadForFrame comes too late when restoring a page from b/f cache, making us disable secure event mode in password fields.
// FIXME: A load going on in one frame shouldn't affect text editing in other frames on the page.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
