From 14994ae2a79bf3e66c891c4d74c78cd1d522ef64 Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Sat, 11 Aug 2007 23:14:33 +0000 Subject: Initial trivial (temp) implementation of nsgtk SSL cert window. Currently segfaults if you accept, however. svn path=/trunk/netsurf/; revision=3507 --- gtk/gtk_gui.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++----- gtk/res/netsurf.glade | 8 +++---- 2 files changed, 60 insertions(+), 9 deletions(-) (limited to 'gtk') diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 9939d5756..a8e683897 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -77,6 +77,12 @@ GtkWindow *wndTooltip; GtkLabel *labelTooltip; GtkDialog *wndOpenFile; +static void nsgtk_create_ssl_verify_window(struct browser_window *bw, + struct content *c, const struct ssl_cert_info *certs, + unsigned long num); +static void nsgtk_ssl_accept(GtkButton *w, gpointer data); +static void nsgtk_ssl_reject(GtkButton *w, gpointer data); + /** * Locate a shared resource file by searching known places in order. * @@ -450,14 +456,59 @@ void hotlist_visited(struct content *content) void gui_cert_verify(struct browser_window *bw, struct content *c, const struct ssl_cert_info *certs, unsigned long num) { + nsgtk_create_ssl_verify_window(bw, c, certs, num); +} - /* TODO: we should open a window showing what the certificate - * problem is and offer the user the choice to reject it. Until - * we do this, we just always accept them. - * */ +static void nsgtk_create_ssl_verify_window(struct browser_window *bw, + struct content *c, const struct ssl_cert_info *certs, + unsigned long num) +{ + GladeXML *x = glade_xml_new(glade_file_location, NULL, NULL); + GtkWindow *wnd = GTK_WINDOW(glade_xml_get_widget(x, "wndSSLProblem")); + GtkButton *accept, *reject; + void **session = calloc(sizeof(void *), 4); + + session[0] = bw; + session[1] = c; + session[2] = x; + session[3] = wnd; + + accept = GTK_BUTTON(glade_xml_get_widget(x, "sslaccept")); + reject = GTK_BUTTON(glade_xml_get_widget(x, "sslreject")); + + g_signal_connect(G_OBJECT(accept), "clicked", + G_CALLBACK(nsgtk_ssl_accept), (gpointer)session); + g_signal_connect(G_OBJECT(reject), "clicked", + G_CALLBACK(nsgtk_ssl_reject), (gpointer)session); + + gtk_widget_show(GTK_WIDGET(wnd)); +} +static void nsgtk_ssl_accept(GtkButton *w, gpointer data) +{ + void **session = data; + struct browser_window *bw = session[0]; + struct content *c = session[1]; + GladeXML *x = session[2]; + GtkWindow *wnd = session[3]; + urldb_set_cert_permissions(c->url, true); - browser_window_go(bw, c->url, 0, true); + browser_window_go(bw, c->url, 0, true); + + gtk_widget_destroy(GTK_WIDGET(wnd)); + g_object_unref(G_OBJECT(x)); + free(session); +} + +static void nsgtk_ssl_reject(GtkButton *w, gpointer data) +{ + void **session = data; + GladeXML *x = session[2]; + GtkWindow *wnd = session[3]; + + gtk_widget_destroy(GTK_WIDGET(wnd)); + g_object_unref(G_OBJECT(x)); + free(session); } utf8_convert_ret utf8_to_local_encoding(const char *string, size_t len, diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade index 082d0aa4f..2e967d020 100644 --- a/gtk/res/netsurf.glade +++ b/gtk/res/netsurf.glade @@ -1474,7 +1474,7 @@ SSL certificate problem GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE - False + True True False True @@ -1498,7 +1498,7 @@ GTK_BUTTONBOX_END - + True True True @@ -1573,7 +1573,7 @@ - + True True True @@ -1755,7 +1755,7 @@ 0 0 0 - + (not implemented) -- cgit v1.2.3