From 5286587e932047f9b32001429a395d8caf193b26 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 18 Aug 2010 16:47:02 +0200 Subject: Rename empathy-auth-helper->empathy-auth-client --- ...esktop.Telepathy.Client.Empathy.Auth.service.in | 2 +- src/Makefile.am | 6 +- src/empathy-auth-client.c | 198 +++++++++++++++++++++ src/empathy-auth-helper.c | 198 --------------------- 4 files changed, 202 insertions(+), 202 deletions(-) create mode 100644 src/empathy-auth-client.c delete mode 100644 src/empathy-auth-helper.c diff --git a/data/org.freedesktop.Telepathy.Client.Empathy.Auth.service.in b/data/org.freedesktop.Telepathy.Client.Empathy.Auth.service.in index 938b31df1..65c47d3e1 100644 --- a/data/org.freedesktop.Telepathy.Client.Empathy.Auth.service.in +++ b/data/org.freedesktop.Telepathy.Client.Empathy.Auth.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.Telepathy.Client.Empathy.Auth -Exec=@libexecdir@/empathy-auth-helper \ No newline at end of file +Exec=@libexecdir@/empathy-auth-client \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index ec7b1a822..e21b348bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -86,7 +86,7 @@ bin_PROGRAMS = \ libexec_PROGRAMS = \ empathy-av \ - empathy-auth-helper + empathy-auth-client BUILT_SOURCES= @@ -111,8 +111,8 @@ empathy_av_SOURCES = \ empathy-sidebar.c empathy-sidebar.h \ $(NULL) -empathy_auth_helper_SOURCES = \ - empathy-auth-helper.c +empathy_auth_client_SOURCES = \ + empathy-auth-client.c empathy_handwritten_source = \ empathy-about-dialog.c empathy-about-dialog.h \ diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c new file mode 100644 index 000000000..45812e8e9 --- /dev/null +++ b/src/empathy-auth-client.c @@ -0,0 +1,198 @@ +/* + * Copyright (C) 2010 Collabora Ltd. + * + * 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 (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: Cosimo Cecchi + */ + +#include + +#include +#include +#include +#include + +#define DEBUG_FLAG EMPATHY_DEBUG_TLS +#include +#include +#include +#include + +#include +#include + +#include + +#include + +static void +tls_dialog_response_cb (GtkDialog *dialog, + gint response_id, + gpointer user_data) +{ + EmpathyTLSCertificate *certificate = NULL; + EmpTLSCertificateRejectReason reason = 0; + EmpathyTLSDialog *tls_dialog = EMPATHY_TLS_DIALOG (dialog); + gboolean remember = FALSE; + + DEBUG ("Response %d", response_id); + + g_object_get (tls_dialog, + "certificate", &certificate, + "reason", &reason, + "remember", &remember, + NULL); + + gtk_widget_destroy (GTK_WIDGET (dialog)); + + if (response_id == GTK_RESPONSE_YES) + empathy_tls_certificate_accept_async (certificate, NULL, NULL); + else + empathy_tls_certificate_reject_async (certificate, reason, TRUE, + NULL, NULL); + + if (remember) + empathy_tls_certificate_store_ca (certificate); + + g_object_unref (certificate); +} + +static void +display_interactive_dialog (EmpathyTLSCertificate *certificate, + EmpTLSCertificateRejectReason reason, + GHashTable *details) +{ + GtkWidget *tls_dialog; + + tls_dialog = empathy_tls_dialog_new (certificate, reason, details); + g_signal_connect (tls_dialog, "response", + G_CALLBACK (tls_dialog_response_cb), NULL); + + gtk_widget_show (tls_dialog); +} + +static void +verifier_verify_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + gboolean res; + EmpTLSCertificateRejectReason reason; + GError *error = NULL; + EmpathyTLSCertificate *certificate = NULL; + GHashTable *details = NULL; + + g_object_get (source, + "certificate", &certificate, + NULL); + + res = empathy_tls_verifier_verify_finish (EMPATHY_TLS_VERIFIER (source), + result, &reason, &details, &error); + + if (error != NULL) + { + DEBUG ("Error: %s", error->message); + display_interactive_dialog (certificate, reason, details); + + g_error_free (error); + } + else + { + empathy_tls_certificate_accept_async (certificate, NULL, NULL); + } + + g_object_unref (certificate); +} + +static void +auth_factory_new_handler_cb (EmpathyAuthFactory *factory, + EmpathyServerTLSHandler *handler, + gpointer user_data) +{ + EmpathyTLSCertificate *certificate = NULL; + gchar *hostname = NULL; + EmpathyTLSVerifier *verifier; + + DEBUG ("New TLS server handler received from the factory"); + + g_object_get (handler, + "certificate", &certificate, + "hostname", &hostname, + NULL); + + verifier = empathy_tls_verifier_new (certificate, hostname); + empathy_tls_verifier_verify_async (verifier, + verifier_verify_cb, NULL); + + g_object_unref (verifier); + g_object_unref (certificate); + g_free (hostname); +} + +int +main (int argc, + char **argv) +{ + GOptionContext *context; + GError *error = NULL; + EmpathyAuthFactory *factory; + + g_thread_init (NULL); + + context = g_option_context_new (N_(" - Empathy authentication client")); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + g_option_context_set_translation_domain (context, GETTEXT_PACKAGE); + + if (!g_option_context_parse (context, &argc, &argv, &error)) + { + g_print ("%s\nRun '%s --help' to see a full list of available command " + "line options.\n", error->message, argv[0]); + g_warning ("Error in empathy-auth-client init: %s", error->message); + return EXIT_FAILURE; + } + + g_option_context_free (context); + + empathy_gtk_init (); + gnutls_global_init (); + g_set_application_name (_("Empathy authentication client")); + + gtk_window_set_default_icon_name ("empathy"); + textdomain (GETTEXT_PACKAGE); + + factory = empathy_auth_factory_dup_singleton (); + + g_signal_connect (factory, "new-server-tls-handler", + G_CALLBACK (auth_factory_new_handler_cb), NULL); + + if (!empathy_auth_factory_register (factory, &error)) + { + g_critical ("Failed to register the auth factory: %s\n", error->message); + g_error_free (error); + g_object_unref (factory); + + return EXIT_FAILURE; + } + + DEBUG ("Empathy auth client started."); + + gtk_main (); + + g_object_unref (factory); + + return EXIT_SUCCESS; +} diff --git a/src/empathy-auth-helper.c b/src/empathy-auth-helper.c deleted file mode 100644 index 9e3a75e23..000000000 --- a/src/empathy-auth-helper.c +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright (C) 2010 Collabora Ltd. - * - * 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 (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * Authors: Cosimo Cecchi - */ - -#include - -#include -#include -#include -#include - -#define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include -#include -#include -#include - -#include -#include - -#include - -#include - -static void -tls_dialog_response_cb (GtkDialog *dialog, - gint response_id, - gpointer user_data) -{ - EmpathyTLSCertificate *certificate = NULL; - EmpTLSCertificateRejectReason reason = 0; - EmpathyTLSDialog *tls_dialog = EMPATHY_TLS_DIALOG (dialog); - gboolean remember = FALSE; - - DEBUG ("Response %d", response_id); - - g_object_get (tls_dialog, - "certificate", &certificate, - "reason", &reason, - "remember", &remember, - NULL); - - gtk_widget_destroy (GTK_WIDGET (dialog)); - - if (response_id == GTK_RESPONSE_YES) - empathy_tls_certificate_accept_async (certificate, NULL, NULL); - else - empathy_tls_certificate_reject_async (certificate, reason, TRUE, - NULL, NULL); - - if (remember) - empathy_tls_certificate_store_ca (certificate); - - g_object_unref (certificate); -} - -static void -display_interactive_dialog (EmpathyTLSCertificate *certificate, - EmpTLSCertificateRejectReason reason, - GHashTable *details) -{ - GtkWidget *tls_dialog; - - tls_dialog = empathy_tls_dialog_new (certificate, reason, details); - g_signal_connect (tls_dialog, "response", - G_CALLBACK (tls_dialog_response_cb), NULL); - - gtk_widget_show (tls_dialog); -} - -static void -verifier_verify_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) -{ - gboolean res; - EmpTLSCertificateRejectReason reason; - GError *error = NULL; - EmpathyTLSCertificate *certificate = NULL; - GHashTable *details = NULL; - - g_object_get (source, - "certificate", &certificate, - NULL); - - res = empathy_tls_verifier_verify_finish (EMPATHY_TLS_VERIFIER (source), - result, &reason, &details, &error); - - if (error != NULL) - { - DEBUG ("Error: %s", error->message); - display_interactive_dialog (certificate, reason, details); - - g_error_free (error); - } - else - { - empathy_tls_certificate_accept_async (certificate, NULL, NULL); - } - - g_object_unref (certificate); -} - -static void -auth_factory_new_handler_cb (EmpathyAuthFactory *factory, - EmpathyServerTLSHandler *handler, - gpointer user_data) -{ - EmpathyTLSCertificate *certificate = NULL; - gchar *hostname = NULL; - EmpathyTLSVerifier *verifier; - - DEBUG ("New TLS server handler received from the factory"); - - g_object_get (handler, - "certificate", &certificate, - "hostname", &hostname, - NULL); - - verifier = empathy_tls_verifier_new (certificate, hostname); - empathy_tls_verifier_verify_async (verifier, - verifier_verify_cb, NULL); - - g_object_unref (verifier); - g_object_unref (certificate); - g_free (hostname); -} - -int -main (int argc, - char **argv) -{ - GOptionContext *context; - GError *error = NULL; - EmpathyAuthFactory *factory; - - g_thread_init (NULL); - - context = g_option_context_new (N_(" - Empathy authentication helper")); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - g_option_context_set_translation_domain (context, GETTEXT_PACKAGE); - - if (!g_option_context_parse (context, &argc, &argv, &error)) - { - g_print ("%s\nRun '%s --help' to see a full list of available command " - "line options.\n", error->message, argv[0]); - g_warning ("Error in empathy-auth-helper init: %s", error->message); - return EXIT_FAILURE; - } - - g_option_context_free (context); - - empathy_gtk_init (); - gnutls_global_init (); - g_set_application_name (_("Empathy authentication helper")); - - gtk_window_set_default_icon_name ("empathy"); - textdomain (GETTEXT_PACKAGE); - - factory = empathy_auth_factory_dup_singleton (); - - g_signal_connect (factory, "new-server-tls-handler", - G_CALLBACK (auth_factory_new_handler_cb), NULL); - - if (!empathy_auth_factory_register (factory, &error)) - { - g_critical ("Failed to register the auth factory: %s\n", error->message); - g_error_free (error); - g_object_unref (factory); - - return EXIT_FAILURE; - } - - DEBUG ("Empathy auth client started."); - - gtk_main (); - - g_object_unref (factory); - - return EXIT_SUCCESS; -} -- cgit v1.2.3