/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Colin Leroy and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
-#ifdef USE_OPENSSL
-#include <gtk/gtkwidget.h>
+#ifdef USE_GNUTLS
+#include <gtk/gtk.h>
#include <glib.h>
#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
#include <sys/types.h>
#include <dirent.h>
#include "manage_window.h"
#include "utils.h"
#include "mainwindow.h"
-#include "gtksctree.h"
#include "alertpanel.h"
#include "sslcertwindow.h"
#include "prefs_common.h"
SSL_MANAGER_HOST,
SSL_MANAGER_PORT,
SSL_MANAGER_CERT,
+ SSL_MANAGER_STATUS,
+ SSL_MANAGER_EXPIRY,
+ SSL_MANAGER_FONT_WEIGHT,
N_SSL_MANAGER_COLUMNS
};
GtkWidget *certlist;
GtkWidget *view_btn;
GtkWidget *delete_btn;
- GtkWidget *ok_btn;
+ GtkWidget *close_btn;
} manager;
static void ssl_manager_view_cb (GtkWidget *widget, gpointer data);
static void ssl_manager_delete_cb (GtkWidget *widget, gpointer data);
-static void ssl_manager_ok_cb (GtkWidget *widget, gpointer data);
+static void ssl_manager_close_cb (GtkWidget *widget, gpointer data);
+static gboolean key_pressed (GtkWidget *widget, GdkEventKey *event,
+ gpointer data);
static void ssl_manager_load_certs (void);
static void ssl_manager_double_clicked(GtkTreeView *list_view,
GtkTreePath *path,
ssl_manager_create();
manage_window_set_transient(GTK_WINDOW(manager.window));
- gtk_widget_grab_focus(manager.ok_btn);
+ gtk_widget_grab_focus(manager.close_btn);
ssl_manager_load_certs();
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_POINTER,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_INT,
-1);
}
GtkCellRenderer *renderer;
renderer = gtk_cell_renderer_text_new();
+ g_object_set(renderer, "weight", PANGO_WEIGHT_NORMAL,
+ "weight-set", TRUE, NULL);
+
column = gtk_tree_view_column_new_with_attributes
(_("Server"),
renderer,
"text", SSL_MANAGER_HOST,
+ "weight", SSL_MANAGER_FONT_WEIGHT,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
- renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(_("Port"),
renderer,
"text", SSL_MANAGER_PORT,
NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Status"),
+ renderer,
+ "text", SSL_MANAGER_STATUS,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Expiry"),
+ renderer,
+ "text", SSL_MANAGER_EXPIRY,
+ NULL);
+ gtk_tree_view_column_set_attributes
+ (column, renderer,
+ "text", SSL_MANAGER_EXPIRY,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
}
static GtkWidget *ssl_manager_list_view_create (void)
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+ gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model),
+ 0, GTK_SORT_ASCENDING);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
ssl_manager_create_list_view_columns(GTK_WIDGET(list_view));
return GTK_WIDGET(list_view);
+}
+/*!
+ *\brief Save Gtk object size to prefs dataset
+ */
+static void ssl_manager_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ cm_return_if_fail(allocation != NULL);
+
+ prefs_common.sslmanwin_width = allocation->width;
+ prefs_common.sslmanwin_height = allocation->height;
}
-void ssl_manager_create(void)
+void ssl_manager_create(void)
{
GtkWidget *window;
+ GtkWidget *scroll;
GtkWidget *hbox1;
GtkWidget *vbox1;
GtkWidget *certlist;
GtkWidget *view_btn;
GtkWidget *delete_btn;
- GtkWidget *ok_btn;
+ GtkWidget *close_btn;
+ static GdkGeometry geometry;
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "ssl_manager");
gtk_window_set_title (GTK_WINDOW(window),
- _("Saved SSL Certificates"));
+ _("Saved SSL/TLS certificates"));
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect(G_OBJECT(window), "delete_event",
- G_CALLBACK(ssl_manager_ok_cb), NULL);
+ G_CALLBACK(ssl_manager_close_cb), NULL);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(ssl_manager_size_allocate_cb), NULL);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT (window);
hbox1 = gtk_hbox_new(FALSE, 6);
vbox1 = gtk_vbox_new(FALSE, 0);
delete_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
-
+
g_signal_connect(G_OBJECT(delete_btn), "clicked",
G_CALLBACK(ssl_manager_delete_cb), NULL);
g_signal_connect(G_OBJECT(view_btn), "clicked",
G_CALLBACK(ssl_manager_view_cb), NULL);
- ok_btn = gtk_button_new_from_stock(GTK_STOCK_OK);
- g_signal_connect(G_OBJECT(ok_btn), "clicked",
- G_CALLBACK(ssl_manager_ok_cb), NULL);
+ close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ g_signal_connect(G_OBJECT(close_btn), "clicked",
+ G_CALLBACK(ssl_manager_close_cb), NULL);
certlist = ssl_manager_list_view_create();
-
- gtk_box_pack_start(GTK_BOX(hbox1), certlist, TRUE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(hbox1), vbox1, TRUE, TRUE, 0);
+
+ scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+
+ gtk_container_add(GTK_CONTAINER (scroll), certlist);
+
+ gtk_box_pack_start(GTK_BOX(hbox1), scroll, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox1), vbox1, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox1), view_btn, FALSE, FALSE, 4);
gtk_box_pack_start(GTK_BOX(vbox1), delete_btn, FALSE, FALSE, 4);
- gtk_box_pack_end(GTK_BOX(vbox1), ok_btn, FALSE, FALSE, 4);
-
+ gtk_box_pack_end(GTK_BOX(vbox1), close_btn, FALSE, FALSE, 4);
+
+ if (!geometry.min_height) {
+ geometry.min_width = 700;
+ geometry.min_height = 250;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.sslmanwin_width,
+ prefs_common.sslmanwin_height);
+
gtk_widget_show(certlist);
+ gtk_widget_show(scroll);
gtk_widget_show(hbox1);
gtk_widget_show(vbox1);
- gtk_widget_show(ok_btn);
+ gtk_widget_show(close_btn);
gtk_widget_show(delete_btn);
gtk_widget_show(view_btn);
gtk_container_add(GTK_CONTAINER (window), hbox1);
manager.certlist = certlist;
manager.view_btn = view_btn;
manager.delete_btn = delete_btn;
- manager.ok_btn = ok_btn;
+ manager.close_btn = close_btn;
gtk_widget_show(window);
-
-}
-
-static char *get_server(char *str)
-{
- char *ret = NULL, *tmp = g_strdup(str);
- char *first_pos = NULL, *last_pos = NULL, *previous_pos = NULL;
- int previous_dot_pos;
-
- first_pos = tmp;
- while ((tmp = strstr(tmp,".")) != NULL) {
- *tmp++;
- previous_pos = last_pos;
- last_pos = tmp;
- }
- previous_dot_pos = (previous_pos - first_pos);
- if (previous_dot_pos - 1 > 0)
- ret = g_strndup(first_pos, previous_dot_pos - 1);
- else
- ret = g_strdup(first_pos);
- g_free(first_pos);
- return ret;
-}
-
-static char *get_port(char *str)
-{
- char *ret = NULL, *tmp = g_strdup(str);
- char *previous_pos = NULL, *last_pos = NULL;
-
- while ((tmp = strstr(tmp,".")) != NULL) {
- *tmp++;
- previous_pos = last_pos;
- last_pos = tmp;
- }
- if (last_pos && previous_pos && (int)(last_pos - previous_pos - 1) > 0)
- ret = g_strndup(previous_pos, (int)(last_pos - previous_pos - 1));
- else
- ret = g_strdup("0");
- g_free(tmp);
- return ret;
-
}
static void ssl_manager_list_view_insert_cert(GtkWidget *list_view,
gchar *port,
SSLCertificate *cert)
{
- GtkTreeIter iter;
+ char *sig_status, *exp_date;
+ char buf[100];
+ time_t exp_time_t;
+ struct tm lt;
+ PangoWeight weight = PANGO_WEIGHT_NORMAL;
+ GtkTreeIter iter, *iterptr;
GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(list_view)));
+ g_return_if_fail(cert != NULL);
+
+ exp_time_t = gnutls_x509_crt_get_expiration_time(cert->x509_cert);
+
+ memset(buf, 0, sizeof(buf));
+ if (exp_time_t > 0) {
+ fast_strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&exp_time_t, <));
+ exp_date = (*buf) ? g_strdup(buf):g_strdup("?");
+ } else
+ exp_date = g_strdup("");
+
+ if (exp_time_t < time(NULL))
+ weight = PANGO_WEIGHT_BOLD;
+
+ sig_status = ssl_certificate_check_signer(cert, cert->status);
+
+ if (sig_status == NULL)
+ sig_status = g_strdup_printf(_("Correct%s"),exp_time_t < time(NULL)? _(" (expired)"): "");
+ else {
+ weight = PANGO_WEIGHT_BOLD;
+ if (exp_time_t < time(NULL))
+ sig_status = g_strconcat(sig_status,_(" (expired)"),NULL);
+ }
+
if (row_iter == NULL) {
/* append new */
gtk_list_store_append(list_store, &iter);
- gtk_list_store_set(list_store, &iter,
- SSL_MANAGER_HOST, host,
- SSL_MANAGER_PORT, port,
- SSL_MANAGER_CERT, cert,
- -1);
- } else {
- gtk_list_store_set(list_store, row_iter,
- SSL_MANAGER_HOST, host,
- SSL_MANAGER_PORT, port,
- SSL_MANAGER_CERT, cert,
- -1);
- }
+ iterptr = &iter;
+ } else
+ iterptr = row_iter;
+
+ gtk_list_store_set(list_store, iterptr,
+ SSL_MANAGER_HOST, host,
+ SSL_MANAGER_PORT, port,
+ SSL_MANAGER_CERT, cert,
+ SSL_MANAGER_STATUS, sig_status,
+ SSL_MANAGER_EXPIRY, exp_date,
+ SSL_MANAGER_FONT_WEIGHT, weight,
+ -1);
+
+ g_free(sig_status);
+ g_free(exp_date);
}
static void ssl_manager_load_certs (void)
{
- DIR *dir;
- struct dirent *d;
+ GDir *dir;
+ const gchar *d;
+ GError *error = NULL;
gchar *path;
int row = 0;
GtkListStore *store;
path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
"certs", G_DIR_SEPARATOR_S, NULL);
- if((dir = opendir(path)) == NULL) {
- perror("opendir");
+ if((dir = g_dir_open(path, 0, &error)) == NULL) {
+ debug_print("couldn't open dir '%s': %s (%d)\n", path,
+ error->message, error->code);
+ g_error_free(error);
return;
}
- while ((d = readdir(dir)) != NULL) {
- gchar *server, *port;
+ while ((d = g_dir_read_name(dir)) != NULL) {
+ gchar *server = NULL, *port = NULL, *fp = NULL;
SSLCertificate *cert;
- if(!strstr(d->d_name, ".cert"))
+ if(strstr(d, ".cert") != d + (strlen(d) - strlen(".cert")))
continue;
- server = get_server(d->d_name);
- port = get_port(d->d_name);
-
-
- cert = ssl_certificate_find_lookup(server, atoi(port), FALSE);
-
- ssl_manager_list_view_insert_cert(manager.certlist, NULL,
- server, port, cert);
+ if (get_serverportfp_from_filename(d, &server, &port, &fp)) {
+
+ if (server != NULL && port != NULL) {
+ gint portnum = atoi(port);
+ if (portnum > 0 && portnum <= 65535) {
+ cert = ssl_certificate_find(server, portnum, fp);
+ ssl_manager_list_view_insert_cert(manager.certlist, NULL,
+ server, port, cert);
+ }
+ }
- g_free(server);
- g_free(port);
+ g_free(server);
+ g_free(port);
+ g_free(fp);
+ }
row++;
}
- closedir(dir);
+ g_dir_close(dir);
g_free(path);
}
-void ssl_manager_close(void)
+static void ssl_manager_close(void)
{
gtk_widget_hide(manager.window);
}
-static void ssl_manager_ok_cb(GtkWidget *widget,
- gpointer data)
+static void ssl_manager_close_cb(GtkWidget *widget,
+ gpointer data)
{
ssl_manager_close();
}
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ if (!event)
+ return FALSE;
+
+ if (event->keyval == GDK_KEY_Escape)
+ ssl_manager_close();
+ else if (event->keyval == GDK_KEY_Delete)
+ ssl_manager_delete_cb(manager.delete_btn, NULL);
+
+ return FALSE;
+}
+
static void ssl_manager_double_clicked(GtkTreeView *list_view,
GtkTreePath *path,
GtkTreeViewColumn *column,
gpointer data)
{
SSLCertificate *cert;
- gchar *cmd;
GtkTreeIter iter;
- gboolean is_valid;
GtkTreeModel *model = gtk_tree_view_get_model(list_view);
if (!gtk_tree_model_get_iter(model, &iter, path))
gpointer data)
{
SSLCertificate *cert;
- GList *rowlist;
int val;
- GtkTreeIter sel;
+ GtkTreeIter iter;
GtkTreeModel *model;
- gchar *action;
- if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
- (GTK_TREE_VIEW(manager.certlist)),
- &model, &sel))
- return;
-
- gtk_tree_model_get(model, &sel,
- SSL_MANAGER_CERT, &cert,
- -1);
+ cert = gtkut_tree_view_get_selected_pointer(
+ GTK_TREE_VIEW(manager.certlist), SSL_MANAGER_CERT,
+ &model, NULL, &iter);
+
if (!cert)
return;
- val = alertpanel(_("Delete certificate"),
- _("Do you really want to delete this certificate?"),
- _("Yes"), _("+No"), NULL);
- if (val != G_ALERTDEFAULT)
+ val = alertpanel_full(_("Delete certificate"),
+ _("Do you really want to delete this certificate?"),
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST,
+ FALSE, NULL, ALERT_WARNING);
+
+
+ if (val != G_ALERTALTERNATE)
return;
ssl_certificate_delete_from_disk(cert);
ssl_certificate_destroy(cert);
- gtk_list_store_remove(GTK_LIST_STORE(model), &sel);
+ gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
}
static void ssl_manager_view_cb(GtkWidget *widget,
gpointer data)
{
SSLCertificate *cert;
- GList *rowlist;
- int val;
- GtkTreeIter sel;
- GtkTreeModel *model;
- gchar *action;
- if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
- (GTK_TREE_VIEW(manager.certlist)),
- &model, &sel))
- return;
-
- gtk_tree_model_get(model, &sel,
- SSL_MANAGER_CERT, &cert,
- -1);
+ cert = gtkut_tree_view_get_selected_pointer(
+ GTK_TREE_VIEW(manager.certlist), SSL_MANAGER_CERT,
+ NULL, NULL, NULL);
+
if (!cert)
return;
projects / claws.git / blobdiff