Ticket #12004: patch

Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp

@@ -82 +82 @@
 #include <Url.h>
 #include <assert.h>
 #include <debugger.h>
+#include <StringList.h>
 
 //#define TRACE_FRAME_LOADER_CLIENT
 #ifdef TRACE_FRAME_LOADER_CLIENT
@@ -100 +101 @@
     , m_messenger()
     , m_loadingErrorPage(false)
     , m_uidna_context(nullptr)
+    , m_certificateList(nullptr)
 {
     CALLED("BWebPage: %p", webPage);
     ASSERT(m_webPage);
@@ -120 +122 @@
     CALLED();
 
     uidna_close(m_uidna_context);
+    delete m_certificateList;
     delete m_webFrame;
         // The frame takes care of deleting us. When that call returns, the
         // frame loader object is gone!
@@ -238 +241 @@
 
 
 bool FrameLoaderClientHaiku::dispatchDidReceiveInvalidCertificate(DocumentLoader*,
-    const CertificateInfo& /*certificate*/, const char* message)
-{
-    String text = "The SSL certificate received from " + 
-        m_webFrame->Frame()->document()->url().string() + " could not be "
-        "authenticated for the following reason: " + message + ".\n\n"
-        "The secure connection to the website may be compromised, make sure "
-        "to not send any sensitive information.";
-
-    // TODO add information about the certificate to the alert
-    // TODO this can be called several times for the same certificate since we
-    // don't store the user choice (we should at least store it for the current
-    // session)
-
-    BAlert* alert = new BAlert("Unsecure SSL certificate", text.utf8().data(),
-        "Continue", "Stop", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-
-    int button = alert->Go();
-
-    return button == 0;
+    const CertificateInfo& certificate, const char* message)
+{
+    
+    if (m_certificateList == NULL || !(m_certificateList->HasString((const_cast<BCertificate&>(certificate.certificate())).Issuer()))) {
+    
+        String text = "The SSL certificate received from " + 
+            m_webFrame->Frame()->document()->url().string() + " could not be "
+            "authenticated for the following reason: " + message + ".\n\n"
+            "The secure connection to the website may be compromised, make sure "
+            "to not send any sensitive information.\n\nIssuer: " + (const_cast<BCertificate&>(certificate.certificate())).Issuer().String()
+            + "\n\nSubject: " + (const_cast<BCertificate&>(certificate.certificate())).Subject().String();
+    
+        // TODO add information about the certificate to the alert
+        // TODO this can be called several times for the same certificate since we
+        // don't store the user choice (we should at least store it for the current
+        // session)
+    
+        BAlert* alert = new BAlert("Unsecure SSL certificate", text.utf8().data(),
+            "Continue", "Stop", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+    
+        printf("Dump of invalid certificate: %s\n", (const_cast<BCertificate&>(certificate.certificate())).String().String()); 
+
+        int button = alert->Go();
+        
+        if (button == 0) {
+            // Store it in the list of known invalid certificates
+            if (m_certificateList == NULL) {
+                m_certificateList = new BStringList();
+            }
+            m_certificateList->Add((const_cast<BCertificate&>(certificate.certificate())).Issuer());
+        }
+
+        return button == 0;
+    }
+    else {
+        return true;
+    }
 }
 
 

Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h

@@ -41 +41 @@
 
 class BWebFrame;
 class BWebPage;
+class BStringList;
 
 namespace WebCore {
 
@@ -233 +234 @@
 
     // IDNA domain encoding and decoding.
     UIDNA* m_uidna_context;
+    
+    // Invalid certificate list
+    BStringList * m_certificateList;
 };
 
 }