Changeset 185795 in webkit

Timestamp:

Jun 20, 2015, 9:06:23 AM (11 years ago)

Author:

Michael Catanzaro

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-20  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        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  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -2942 +2942 @@
 
     auto transaction = m_pageLoadState.transaction();
-
-    if (frame->isMainFrame()) {
-        bool hasInsecureCertificateChain = m_treatsSHA1CertificatesAsInsecure && certificateInfo.containsNonRootSHA1SignedCertificate();
-        m_pageLoadState.didCommitLoad(transaction, hasInsecureCertificateChain);
-    }
+    bool markPageInsecure = m_treatsSHA1CertificatesAsInsecure && certificateInfo.containsNonRootSHA1SignedCertificate();
+    if (frame->isMainFrame())
+        m_pageLoadState.didCommitLoad(transaction, markPageInsecure);
+    else if (markPageInsecure)
+        m_pageLoadState.didDisplayOrRunInsecureContent(transaction);
 
 #if USE(APPKIT)