Changeset 181531 in webkit

Timestamp:

Mar 16, 2015, 2:38:40 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r181399 - [GTK] Add support for handling TLS errors to MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=142576

Reviewed by Sergio Villar Senin.

It's useful for testing TLS errors handling itself, but also to
allow ignoring TLS errors when testing.

• MiniBrowser/gtk/BrowserWindow.c:

(webViewLoadFailedWithTLSerrors):
(browserWindowConstructed):

Location:

releases/WebKitGTK/webkit-2.8/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/gtk/BrowserWindow.c (modified) (2 diffs)

releases/WebKitGTK/webkit-2.8/Tools/ChangeLog

@@ +1 @@
+2015-03-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add support for handling TLS errors to MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=142576
+
+        Reviewed by Sergio Villar Senin.
+
+        It's useful for testing TLS errors handling itself, but also to
+        allow ignoring TLS errors when testing.
+
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (webViewLoadFailedWithTLSerrors):
+        (browserWindowConstructed):
+
 2015-03-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/BrowserWindow.c

@@ -369 +369 @@
 }
 
+static gboolean webViewLoadFailedWithTLSerrors(WebKitWebView *webView, const char *failingURI, GTlsCertificate *certificate, GTlsCertificateFlags errors, BrowserWindow *window)
+{
+    GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+        GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", "Invalid TLS Certificate");
+    gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "Failed to load %s: Do you want to continue ignoring the TLS errors?", failingURI);
+    int response = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);
+
+    if (response == GTK_RESPONSE_YES) {
+        SoupURI *uri = soup_uri_new(failingURI);
+        webkit_web_context_allow_tls_certificate_for_host(webkit_web_view_get_context(webView), certificate, uri->host);
+        soup_uri_free(uri);
+        webkit_web_view_load_uri(webView, failingURI);
+    }
+
+    return TRUE;
+}
+
 static gboolean webViewDecidePolicy(WebKitWebView *webView, WebKitPolicyDecision *decision, WebKitPolicyDecisionType decisionType, BrowserWindow *window)
 {
@@ -875 +893 @@
     g_signal_connect(window->webView, "create", G_CALLBACK(webViewCreate), window);
     g_signal_connect(window->webView, "load-failed", G_CALLBACK(webViewLoadFailed), window);
+    g_signal_connect(window->webView, "load-failed-with-tls-errors", G_CALLBACK(webViewLoadFailedWithTLSerrors), window);
     g_signal_connect(window->webView, "decide-policy", G_CALLBACK(webViewDecidePolicy), window);
     g_signal_connect(window->webView, "permission-request", G_CALLBACK(webViewDecidePermissionRequest), window);