* Authors: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
*/
-#include <config.h>
+#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-sasl-handler.h>
-#include <libempathy/empathy-server-tls-handler.h>
-#include <libempathy/empathy-tls-verifier.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-tls-dialog.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
#include <gnutls/gnutls.h>
-#include <extensions/extensions.h>
+#include "empathy-auth-factory.h"
+#include "empathy-bad-password-dialog.h"
+#include "empathy-password-dialog.h"
+#include "empathy-sanity-cleaning.h"
+#include "empathy-server-tls-handler.h"
+#include "empathy-tls-dialog.h"
+#include "empathy-tls-verifier.h"
+#include "empathy-ui-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
#define TIMEOUT 60
gint response_id,
gpointer user_data)
{
- EmpathyTLSCertificate *certificate = NULL;
- EmpTLSCertificateRejectReason reason = 0;
+ TpTLSCertificate *certificate = NULL;
+ TpTLSCertificateRejectReason reason = 0;
GHashTable *details = NULL;
EmpathyTLSDialog *tls_dialog = EMPATHY_TLS_DIALOG (dialog);
gboolean remember = FALSE;
-
- DEBUG ("Response %d", response_id);
+ EmpathyTLSVerifier *verifier = EMPATHY_TLS_VERIFIER (user_data);
g_object_get (tls_dialog,
"certificate", &certificate,
"details", &details,
NULL);
+ DEBUG ("Response %d (remember: %d)", response_id, remember);
+
gtk_widget_destroy (GTK_WIDGET (dialog));
if (response_id == GTK_RESPONSE_YES)
{
- empathy_tls_certificate_accept_async (certificate, NULL, NULL);
+ tp_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);
+ tp_tls_certificate_add_rejection (certificate, reason, NULL,
+ g_variant_new_parsed ("{ 'user-requested': <%b> }", TRUE));
+
+ tp_tls_certificate_reject_async (certificate, NULL, NULL);
}
if (remember)
- empathy_tls_certificate_store_ca (certificate);
+ empathy_tls_verifier_store_exception (verifier);
g_object_unref (certificate);
g_hash_table_unref (details);
}
static void
-display_interactive_dialog (EmpathyTLSCertificate *certificate,
- EmpTLSCertificateRejectReason reason,
+display_interactive_dialog (TpTLSCertificate *certificate,
+ EmpathyTLSVerifier *verifier,
+ TpTLSCertificateRejectReason reason,
GHashTable *details)
{
GtkWidget *tls_dialog;
stop_timer ();
tls_dialog = empathy_tls_dialog_new (certificate, reason, details);
- g_signal_connect (tls_dialog, "response",
- G_CALLBACK (tls_dialog_response_cb), NULL);
+ g_signal_connect_data (tls_dialog, "response",
+ G_CALLBACK (tls_dialog_response_cb), g_object_ref (verifier),
+ (GClosureNotify)g_object_unref, 0);
gtk_widget_show (tls_dialog);
}
GAsyncResult *result,
gpointer user_data)
{
- gboolean res;
- EmpTLSCertificateRejectReason reason;
+ TpTLSCertificateRejectReason reason;
GError *error = NULL;
- EmpathyTLSCertificate *certificate = NULL;
+ TpTLSCertificate *certificate = NULL;
GHashTable *details = NULL;
+ gchar *hostname = NULL;
g_object_get (source,
"certificate", &certificate,
NULL);
- res = empathy_tls_verifier_verify_finish (EMPATHY_TLS_VERIFIER (source),
+ 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);
+ display_interactive_dialog (certificate, EMPATHY_TLS_VERIFIER (source),
+ reason, details);
g_error_free (error);
}
else
{
- empathy_tls_certificate_accept_async (certificate, NULL, NULL);
+ tp_tls_certificate_accept_async (certificate, NULL, NULL);
}
+ g_free (hostname);
g_object_unref (certificate);
}
EmpathyServerTLSHandler *handler,
gpointer user_data)
{
- EmpathyTLSCertificate *certificate = NULL;
+ TpTLSCertificate *certificate = NULL;
gchar *hostname = NULL;
+ gchar **reference_identities = NULL;
EmpathyTLSVerifier *verifier;
DEBUG ("New TLS server handler received from the factory");
g_object_get (handler,
"certificate", &certificate,
"hostname", &hostname,
+ "reference-identities", &reference_identities,
NULL);
- verifier = empathy_tls_verifier_new (certificate, hostname);
+ verifier = empathy_tls_verifier_new (certificate, hostname,
+ (const gchar **) reference_identities);
empathy_tls_verifier_verify_async (verifier,
verifier_verify_cb, NULL);
g_object_unref (verifier);
g_object_unref (certificate);
g_free (hostname);
+ g_strfreev (reference_identities);
}
-typedef struct
-{
- EmpathyServerSASLHandler *handler;
- GtkWidget *entry;
- GtkWidget *ticky;
-} PasswordDialogData;
-
static void
-password_dialog_response_cb (GtkDialog *dialog,
- gint response,
+auth_factory_new_sasl_handler_cb (EmpathyAuthFactory *factory,
+ EmpathyServerSASLHandler *handler,
gpointer user_data)
{
- PasswordDialogData *data = user_data;
-
- if (response == GTK_RESPONSE_OK)
- {
- empathy_server_sasl_handler_provide_password (data->handler,
- gtk_entry_get_text (GTK_ENTRY (data->entry)),
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->ticky)));
- }
- else
- {
- empathy_server_sasl_handler_cancel (data->handler);
- }
+ GtkWidget *dialog;
- gtk_widget_destroy (GTK_WIDGET (dialog));
+ DEBUG ("New SASL server handler received from the factory");
- g_object_unref (data->handler);
- g_slice_free (PasswordDialogData, data);
-}
+ /* If the handler has the password it will deal with it itself. */
+ if (!empathy_server_sasl_handler_has_password (handler))
+ {
+ DEBUG ("SASL handler doesn't have a password, prompt for one");
-static void
-clear_icon_released_cb (GtkEntry *entry,
- GtkEntryIconPosition icon_pos,
- GdkEvent *event,
- gpointer user_data)
-{
- gtk_entry_set_text (entry, "");
+ dialog = empathy_password_dialog_new (handler);
+ gtk_widget_show (dialog);
+ }
}
static void
-password_entry_changed_cb (GtkEditable *entry,
- gpointer user_data)
+retry_account_cb (GtkWidget *dialog,
+ TpAccount *account,
+ const gchar *password,
+ EmpathyAuthFactory *factory)
{
- const gchar *str;
+ DEBUG ("Try reconnecting to %s", tp_account_get_path_suffix (account));
- str = gtk_entry_get_text (GTK_ENTRY (entry));
+ empathy_auth_factory_save_retry_password (factory, account, password);
- gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
- GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
+ tp_account_reconnect_async (account, NULL, NULL);
}
static void
-auth_factory_new_sasl_handler_cb (EmpathyAuthFactory *factory,
- EmpathyServerSASLHandler *handler,
+auth_factory_auth_passsword_failed (EmpathyAuthFactory *factory,
+ TpAccount *account,
+ const gchar *password,
gpointer user_data)
{
- GtkWidget *dialog, *entry, *icon, *ticky;
- GtkBox *box;
- TpAccount *account;
- PasswordDialogData *data;
-
- DEBUG ("New SASL server handler received from the factory");
-
- account = empathy_server_sasl_handler_get_account (handler);
-
- dialog = gtk_message_dialog_new_with_markup (NULL, 0,
- GTK_MESSAGE_OTHER, GTK_BUTTONS_OK_CANCEL,
- _("Enter your password for account\n<b>%s</b>"),
- tp_account_get_display_name (account));
-
- box = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
-
- /* dialog icon */
- icon = gtk_image_new_from_icon_name (tp_account_get_icon_name (account),
- GTK_ICON_SIZE_DIALOG);
- gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), icon);
- gtk_widget_show (icon);
-
- /* entry */
- entry = gtk_entry_new ();
- gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
-
- /* entry clear icon */
- gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
- GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
- gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
- GTK_ENTRY_ICON_SECONDARY, FALSE);
-
- g_signal_connect (entry, "icon-release",
- G_CALLBACK (clear_icon_released_cb), NULL);
- g_signal_connect (entry, "changed",
- G_CALLBACK (password_entry_changed_cb), NULL);
-
- gtk_box_pack_start (box, entry, FALSE, FALSE, 0);
- gtk_widget_show (entry);
+ GtkWidget *dialog;
- /* remember password ticky */
- ticky = gtk_check_button_new_with_label (_("Remember password"));
+ DEBUG ("Authentication on %s failed, popup password dialog",
+ tp_account_get_path_suffix (account));
- gtk_box_pack_start (box, ticky, FALSE, FALSE, 0);
- gtk_widget_show (ticky);
+ dialog = empathy_bad_password_dialog_new (account, password);
- data = g_slice_new0 (PasswordDialogData);
- data->handler = g_object_ref (handler);
- data->entry = entry;
- data->ticky = ticky;
-
- g_signal_connect (dialog, "response",
- G_CALLBACK (password_dialog_response_cb), data);
+ tp_g_signal_connect_object (dialog, "retry",
+ G_CALLBACK (retry_account_cb), factory, 0);
gtk_widget_show (dialog);
}
+static void
+sanity_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ start_timer ();
+}
+
int
main (int argc,
char **argv)
GOptionContext *context;
GError *error = NULL;
EmpathyAuthFactory *factory;
-
- g_thread_init (NULL);
+ TpDebugSender *debug_sender;
+ TpSimpleClientFactory *tp_factory;
+ TpDBusDaemon *dbus;
context = g_option_context_new (N_(" - Empathy authentication client"));
g_option_context_add_group (context, gtk_get_option_group (TRUE));
gnutls_global_init ();
g_set_application_name (_("Empathy authentication client"));
+ /* Make empathy and empathy-auth-client appear as the same app in
+ * gnome-shell */
+ gdk_set_program_class ("Empathy");
gtk_window_set_default_icon_name ("empathy");
textdomain (GETTEXT_PACKAGE);
- factory = empathy_auth_factory_dup_singleton ();
+ /* There is no 'main' UI window so just use the default GdkScreen */
+ empathy_set_css_provider (NULL);
+
+#ifdef ENABLE_DEBUG
+ /* Set up debug sender */
+ debug_sender = tp_debug_sender_dup ();
+ g_log_set_default_handler (tp_debug_sender_log_handler, G_LOG_DOMAIN);
+#endif
+
+ dbus = tp_dbus_daemon_dup (NULL);
+ tp_factory = tp_simple_client_factory_new (dbus);
+ tp_simple_client_factory_add_account_features_varargs (tp_factory,
+ TP_ACCOUNT_FEATURE_STORAGE,
+ 0);
+
+ factory = empathy_auth_factory_new (tp_factory);
+ g_object_unref (tp_factory);
+ g_object_unref (dbus);
g_signal_connect (factory, "new-server-tls-handler",
G_CALLBACK (auth_factory_new_tls_handler_cb), NULL);
g_signal_connect (factory, "new-server-sasl-handler",
G_CALLBACK (auth_factory_new_sasl_handler_cb), NULL);
+ g_signal_connect (factory, "auth-password-failed",
+ G_CALLBACK (auth_factory_auth_passsword_failed), NULL);
+
if (!empathy_auth_factory_register (factory, &error))
{
g_critical ("Failed to register the auth factory: %s\n", error->message);
use_timer = FALSE;
}
- start_timer ();
+ /* Wait for the migration code to be done before starting the timer */
+ empathy_sanity_checking_run_async (sanity_cb, NULL);
gtk_main ();
g_object_unref (factory);
+ g_object_unref (debug_sender);
return EXIT_SUCCESS;
}
projects / empathy.git / blobdiff