Merge branch 'tls-connection'

4 files changed, 285 insertions, 4 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8800aee3c..e21b348bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,7 +85,8 @@ bin_PROGRAMS =			\
 	$(NULL)
 
 libexec_PROGRAMS = \
-	empathy-av
+	empathy-av \
+	empathy-auth-client
 
 BUILT_SOURCES=
 
@@ -110,6 +111,9 @@ empathy_av_SOURCES =						\
 	empathy-sidebar.c empathy-sidebar.h \
 	$(NULL)
 
+empathy_auth_client_SOURCES =						\
+	empathy-auth-client.c
+
 empathy_handwritten_source = \
 	empathy-about-dialog.c empathy-about-dialog.h			\
 	empathy-chat-window.c empathy-chat-window.h			\
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index c41763d90..c753a9f20 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -310,7 +310,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
                 gchar *message;
 
                 message = g_strdup_printf (_("Offline — %s"),
-                    empathy_account_get_error_message (account));
+                    empathy_account_get_error_message (account, NULL));
                 gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar),
                     GTK_MESSAGE_WARNING);
 
@@ -322,7 +322,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
                 gchar *message;
 
                 message = g_strdup_printf (_("Disconnected — %s"),
-                    empathy_account_get_error_message (account));
+                    empathy_account_get_error_message (account, NULL));
                 gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar),
                     GTK_MESSAGE_ERROR);
 
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
new file mode 100644
index 000000000..17b66a57d
--- /dev/null
+++ b/src/empathy-auth-client.c
@@ -0,0 +1,268 @@
+/*
+ * 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 <cosimo.cecchi@collabora.co.uk>
+ */
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-auth-factory.h>
+#include <libempathy/empathy-server-tls-handler.h>
+#include <libempathy/empathy-tls-verifier.h>
+
+#include <libempathy-gtk/empathy-tls-dialog.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
+
+#include <gnutls/gnutls.h>
+
+#include <extensions/extensions.h>
+
+#define TIMEOUT 60
+
+static gboolean use_timer = TRUE;
+static guint timeout_id = 0;
+static guint num_windows = 0;
+
+static gboolean
+timeout_cb (gpointer p)
+{
+  DEBUG ("Timeout reached; exiting...");
+
+  gtk_main_quit ();
+  return FALSE;
+}
+
+static void
+start_timer (void)
+{
+  if (!use_timer)
+    return;
+
+  if (timeout_id != 0)
+    return;
+
+  DEBUG ("Start timer");
+
+  timeout_id = g_timeout_add_seconds (TIMEOUT, timeout_cb, NULL);
+}
+
+static void
+stop_timer (void)
+{
+  if (timeout_id == 0)
+    return;
+
+  DEBUG ("Stop timer");
+
+  g_source_remove (timeout_id);
+  timeout_id = 0;
+}
+
+static void
+tls_dialog_response_cb (GtkDialog *dialog,
+    gint response_id,
+    gpointer user_data)
+{
+  EmpathyTLSCertificate *certificate = NULL;
+  EmpTLSCertificateRejectReason reason = 0;
+  GHashTable *details = NULL;
+  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,
+      "details", &details,
+      NULL);
+
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+
+  if (response_id == GTK_RESPONSE_YES)
+    {
+      empathy_tls_certificate_accept_async (certificate, NULL, NULL);
+    }
+  else
+    {
+      tp_asv_set_boolean (details, "user-requested", TRUE);
+      empathy_tls_certificate_reject_async (certificate, reason, details,
+          NULL, NULL);
+    }
+
+  if (remember)
+    empathy_tls_certificate_store_ca (certificate);
+
+  g_object_unref (certificate);
+  g_hash_table_unref (details);
+
+  /* restart the timeout */
+  num_windows--;
+
+  if (num_windows > 0)
+    return;
+
+  start_timer ();
+}
+
+static void
+display_interactive_dialog (EmpathyTLSCertificate *certificate,
+    EmpTLSCertificateRejectReason reason,
+    GHashTable *details)
+{
+  GtkWidget *tls_dialog;
+
+  /* stop the timeout */
+  num_windows++;
+  stop_timer ();
+
+  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.");
+
+  if (g_getenv ("EMPATHY_PERSIST") != NULL)
+    {
+      DEBUG ("Timed-exit disabled");
+
+      use_timer = FALSE;
+    }
+
+  start_timer ();
+
+  gtk_main ();
+
+  g_object_unref (factory);
+
+  return EXIT_SUCCESS;
+}
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index ff8bb5e98..0efa4a97d 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -475,10 +475,19 @@ main_window_error_display (EmpathyMainWindow *window,
 	GtkWidget *action_table;
 	gchar     *str;
 	const gchar     *icon_name;
+	const gchar *error_message;
+	gboolean user_requested;
+
+	error_message =
+		empathy_account_get_error_message (account, &user_requested);
+
+	if (user_requested) {
+		return;
+	}
 
 	str = g_markup_printf_escaped ("<b>%s</b>\n%s",
 					       tp_account_get_display_name (account),
-					       empathy_account_get_error_message (account));
+					       error_message);
 
 	info_bar = g_hash_table_lookup (priv->errors, account);
 	if (info_bar) {