/pidgin/main: 7ae437591e5e: Port Pidgin to use TLS Certificate API
Mike Ruprecht
cmaiku at gmail.com
Thu Apr 7 13:36:20 EDT 2016
Changeset: 7ae437591e5e9f78ee1d6edcf4dbc8e68ac0b1ce
Author: Mike Ruprecht <cmaiku at gmail.com>
Date: 2016-03-30 02:42 -0500
Branch: purple-ssl-to-gio
URL: https://hg.pidgin.im/pidgin/main/rev/7ae437591e5e
Description:
Port Pidgin to use TLS Certificate API
This patch ports Pidgin to use the new, simpler certificate API.
However, with it, the certificate manager no longer updates if
any certificates are added to the certificate directory in the
purple config, while it's open. GFileMonitor could be used to
replicate this capability if desired.
diffstat:
pidgin/gtkcertmgr.c | 184 ++++++++++++++++++++++++++-------------------------
pidgin/gtkrequest.c | 13 ++-
2 files changed, 103 insertions(+), 94 deletions(-)
diffs (truncated from 409 to 300 lines):
diff --git a/pidgin/gtkcertmgr.c b/pidgin/gtkcertmgr.c
--- a/pidgin/gtkcertmgr.c
+++ b/pidgin/gtkcertmgr.c
@@ -25,7 +25,7 @@
#include "pidgin.h"
#include "pidginstock.h"
-#include "certificate.h"
+#include "tls-certificate.h"
#include "debug.h"
#include "notify.h"
#include "request.h"
@@ -37,7 +37,7 @@
#include "gtkcertmgr.h"
/*****************************************************************************
- * X.509 tls_peers management interface *
+ * X.509 certificate management interface *
*****************************************************************************/
typedef struct {
@@ -48,7 +48,6 @@ typedef struct {
GtkWidget *exportbutton;
GtkWidget *infobutton;
GtkWidget *deletebutton;
- PurpleCertificatePool *tls_peers;
} tls_peers_mgmt_data;
tls_peers_mgmt_data *tpm_dat = NULL;
@@ -76,7 +75,6 @@ static void
tls_peers_mgmt_repopulate_list(void)
{
GtkTreeView *listview = tpm_dat->listview;
- PurpleCertificatePool *tls_peers;
GList *idlist, *l;
GtkListStore *store = GTK_LIST_STORE(
@@ -85,12 +83,8 @@ tls_peers_mgmt_repopulate_list(void)
/* First, delete everything in the list */
gtk_list_store_clear(store);
- /* Locate the "tls_peers" pool */
- tls_peers = purple_certificate_find_pool("x509", "tls_peers");
- g_return_if_fail(tls_peers);
-
- /* Grab the loaded certificates */
- idlist = purple_certificate_pool_get_idlist(tls_peers);
+ /* Grab the available certificates */
+ idlist = purple_tls_certificate_list_ids();
/* Populate the listview */
for (l = idlist; l; l = l->next) {
@@ -101,15 +95,8 @@ tls_peers_mgmt_repopulate_list(void)
TPM_HOSTNAME_COLUMN, l->data,
-1);
}
- purple_certificate_pool_destroy_idlist(idlist);
-}
-static void
-tls_peers_mgmt_mod_cb(PurpleCertificatePool *pool, const gchar *id, gpointer data)
-{
- g_assert (pool == tpm_dat->tls_peers);
-
- tls_peers_mgmt_repopulate_list();
+ purple_tls_certificate_free_ids(idlist);
}
static void
@@ -137,43 +124,54 @@ tls_peers_mgmt_select_chg_cb(GtkTreeSele
static void
tls_peers_mgmt_import_ok2_cb(gpointer data, const char *result)
{
- PurpleCertificate *crt = (PurpleCertificate *) data;
+ GTlsCertificate *crt = data;
+ GError *error = NULL;
/* TODO: Perhaps prompt if you're overwriting a cert? */
- /* Drop the certificate into the pool */
- if (result && *result)
- purple_certificate_pool_store(tpm_dat->tls_peers, result, crt);
+ /* Trust the certificate */
+ if (result && *result) {
+ if(!purple_tls_certificate_trust(result, crt, &error)) {
+ purple_debug_error("gtkcertmgr/tls_peers_mgmt",
+ "Error trusting certificate '%s': %s",
+ result, error->message);
+ g_clear_error(&error);
+ }
+
+ tls_peers_mgmt_repopulate_list();
+ }
/* And this certificate is not needed any more */
- purple_certificate_destroy(crt);
+ g_object_unref(crt);
}
static void
tls_peers_mgmt_import_cancel2_cb(gpointer data, const char *result)
{
- PurpleCertificate *crt = (PurpleCertificate *) data;
- purple_certificate_destroy(crt);
+ GTlsCertificate *crt = data;
+ g_object_unref(crt);
}
static void
tls_peers_mgmt_import_ok_cb(gpointer data, const char *filename)
{
- PurpleCertificateScheme *x509;
- PurpleCertificate *crt;
-
- /* Load the scheme of our tls_peers pool (ought to be x509) */
- x509 = purple_certificate_pool_get_scheme(tpm_dat->tls_peers);
+ GTlsCertificate *crt;
+ GError *error = NULL;
/* Now load the certificate from disk */
- crt = purple_certificate_import(x509, filename);
+ crt = g_tls_certificate_new_from_file(filename, &error);
/* Did it work? */
if (crt != NULL) {
gchar *default_hostname;
- /* Get name to add to pool as */
+ PurpleTlsCertificateInfo *info;
+
+ /* Get name to add trust as */
/* Make a guess about what the hostname should be */
- default_hostname = purple_certificate_get_subject_name(crt);
+ info = purple_tls_certificate_get_info(crt);
+ default_hostname = purple_tls_certificate_info_get_subject_name(info);
+ purple_tls_certificate_info_free(info);
+
/* TODO: Find a way to make sure that crt gets destroyed
if the window gets closed unusually, such as by handle
deletion */
@@ -201,6 +199,11 @@ tls_peers_mgmt_import_ok_cb(gpointer dat
went wrong? */
gchar * secondary;
+ purple_debug_warning("gtkcertmgr/tls_peers_mgmt",
+ "File %s couldn't be imported: %s",
+ filename, error->message);
+ g_clear_error(&error);
+
secondary = g_strdup_printf(_("File %s could not be imported.\nMake sure that the file is readable and in PEM format.\n"), filename);
purple_notify_error(NULL,
_("Certificate Import Error"),
@@ -226,43 +229,49 @@ tls_peers_mgmt_import_cb(GtkWidget *butt
static void
tls_peers_mgmt_export_ok_cb(gpointer data, const char *filename)
{
- PurpleCertificate *crt = (PurpleCertificate *) data;
+ GTlsCertificate *crt = data;
+ gchar *pem = NULL;
+ GError *error = NULL;
g_assert(filename);
- if (!purple_certificate_export(filename, crt)) {
+ g_object_get(crt, "certificate-pem", &pem, NULL);
+
+ if (!g_file_set_contents(filename, pem, -1, &error)) {
/* Errors! Oh no! */
/* TODO: Perhaps find a way to be specific about what just
went wrong? */
gchar * secondary;
+ purple_debug_warning("gtkcertmgr/tls_peers_mgmt",
+ "File %s couldn't be exported: %s",
+ filename, error->message);
+ g_clear_error(&error);
+
secondary = g_strdup_printf(_("Export to file %s failed.\nCheck that you have write permission to the target path\n"), filename);
purple_notify_error(NULL,
_("Certificate Export Error"),
_("X.509 certificate export failed"),
secondary, NULL);
g_free(secondary);
+ } else {
+ tls_peers_mgmt_repopulate_list();
}
- purple_certificate_destroy(crt);
-}
-
-static void
-tls_peers_mgmt_export_cancel_cb(gpointer data, const char *filename)
-{
- PurpleCertificate *crt = (PurpleCertificate *) data;
- /* Pressing cancel just frees the duplicated certificate */
- purple_certificate_destroy(crt);
+ g_free(pem);
+ g_object_unref(crt);
}
static void
tls_peers_mgmt_export_cb(GtkWidget *button, gpointer data)
{
- PurpleCertificate *crt;
+ GTlsCertificate *crt;
GtkTreeSelection *select = tpm_dat->listselect;
GtkTreeIter iter;
GtkTreeModel *model;
gchar *id;
+ gchar *path;
+ GError *error = NULL;
/* See if things are selected */
if (!gtk_tree_selection_get_selected(select, &model, &iter)) {
@@ -276,12 +285,13 @@ tls_peers_mgmt_export_cb(GtkWidget *butt
/* Extract the certificate from the pool now to make sure it doesn't
get deleted out from under us */
- crt = purple_certificate_pool_retrieve(tpm_dat->tls_peers, id);
+ crt = purple_tls_certificate_new_from_id(id, &error);
if (NULL == crt) {
purple_debug_error("gtkcertmgr/tls_peers_mgmt",
- "Id %s was not in the peers cache?!\n",
- id);
+ "Error fetching trusted cert '%s': %s\n",
+ id, error->message);
+ g_clear_error(&error);
g_free(id);
return;
}
@@ -293,7 +303,7 @@ tls_peers_mgmt_export_cb(GtkWidget *butt
"certificate.pem",
TRUE, /* Is a save dialog */
G_CALLBACK(tls_peers_mgmt_export_ok_cb),
- G_CALLBACK(tls_peers_mgmt_export_cancel_cb),
+ G_CALLBACK(g_object_unref),
NULL, /* No extra parameters */
crt); /* Pass the certificate on to the callback */
}
@@ -305,8 +315,9 @@ tls_peers_mgmt_info_cb(GtkWidget *button
GtkTreeIter iter;
GtkTreeModel *model;
gchar *id;
- PurpleCertificate *crt;
+ GTlsCertificate *crt;
char *title;
+ GError *error = NULL;
/* See if things are selected */
if (!gtk_tree_selection_get_selected(select, &model, &iter)) {
@@ -319,14 +330,21 @@ tls_peers_mgmt_info_cb(GtkWidget *button
gtk_tree_model_get(model, &iter, TPM_HOSTNAME_COLUMN, &id, -1);
/* Now retrieve the certificate */
- crt = purple_certificate_pool_retrieve(tpm_dat->tls_peers, id);
- g_return_if_fail(crt);
+ crt = purple_tls_certificate_new_from_id(id, NULL);
+
+ if (crt == NULL) {
+ purple_debug_warning("gtkcertmgr/tls_peers_mgmt",
+ "Unable to fetch certificate '%s': %s",
+ id, error->message);
+ g_clear_error(&error);
+ g_free(id);
+ }
/* Fire the notification */
title = g_strdup_printf(_("Certificate Information for %s"), id);
purple_request_certificate(tpm_dat, title, NULL, NULL, crt,
- _("OK"), G_CALLBACK(purple_certificate_destroy),
- _("Cancel"), G_CALLBACK(purple_certificate_destroy),
+ _("OK"), G_CALLBACK(g_object_unref),
+ _("Cancel"), G_CALLBACK(g_object_unref),
crt);
g_free(id);
@@ -342,14 +360,19 @@ tls_peers_mgmt_activated_cb(GtkTreeView
static void
tls_peers_mgmt_delete_confirm_cb(gchar *id, gint choice)
{
+ GError *error = NULL;
+
if (1 == choice) {
- /* Yes, delete was confirmed */
- /* Now delete the thing */
- if (!purple_certificate_pool_delete(tpm_dat->tls_peers, id)) {
+ /* Yes, distrust was confirmed */
+ /* Now distrust the thing */
+ if (!purple_tls_certificate_distrust(id, &error)) {
purple_debug_warning("gtkcertmgr/tls_peers_mgmt",
- "Deletion failed on id %s\n",
- id);
- };
+ "Deletion failed on id %s: %s\n",
+ id, error->message);
+ g_clear_error(&error);
+ } else {
+ tls_peers_mgmt_repopulate_list();
+ }
}
More information about the Commits
mailing list