#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <telepathy-glib/debug-sender.h>
+
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-auth-factory.h>
#include <libempathy/empathy-tls-verifier.h>
#include <libempathy/empathy-utils.h>
+#include <libempathy-gtk/empathy-password-dialog.h>
#include <libempathy-gtk/empathy-tls-dialog.h>
#include <libempathy-gtk/empathy-ui-utils.h>
GHashTable *details = NULL;
EmpathyTLSDialog *tls_dialog = EMPATHY_TLS_DIALOG (dialog);
gboolean remember = FALSE;
+ EmpathyTLSVerifier *verifier = EMPATHY_TLS_VERIFIER (user_data);
DEBUG ("Response %d", response_id);
}
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,
+ EmpathyTLSVerifier *verifier,
EmpTLSCertificateRejectReason reason,
GHashTable *details)
{
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;
GError *error = NULL;
EmpathyTLSCertificate *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);
}
empathy_tls_certificate_accept_async (certificate, NULL, NULL);
}
+ g_free (hostname);
g_object_unref (certificate);
}
{
EmpathyTLSCertificate *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);
-}
-
-typedef struct
-{
- EmpathyServerSASLHandler *handler;
- GtkWidget *entry;
- GtkWidget *ticky;
-} PasswordDialogData;
-
-static void
-password_dialog_response_cb (GtkDialog *dialog,
- gint response,
- 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);
- }
-
- gtk_widget_destroy (GTK_WIDGET (dialog));
-
- g_object_unref (data->handler);
- g_slice_free (PasswordDialogData, data);
-}
-
-static void
-clear_icon_released_cb (GtkEntry *entry,
- GtkEntryIconPosition icon_pos,
- GdkEvent *event,
- gpointer user_data)
-{
- gtk_entry_set_text (entry, "");
-}
-
-static void
-password_entry_changed_cb (GtkEditable *entry,
- gpointer user_data)
-{
- const gchar *str;
-
- str = gtk_entry_get_text (GTK_ENTRY (entry));
-
- gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
- GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
-}
-
-#define KEYBOARD_GRABBED \
- g_quark_from_static_string ("password-entry-keyboard-grabbed")
-
-static gboolean
-password_dialog_grab_keyboard (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
-{
- if (g_object_get_qdata (G_OBJECT (widget), KEYBOARD_GRABBED) == NULL)
- {
- GdkGrabStatus status = gdk_keyboard_grab (gtk_widget_get_window (widget),
- FALSE, gdk_event_get_time (event));
-
- if (status != GDK_GRAB_SUCCESS)
- {
- DEBUG ("Could not grab keyboard; grab status was %u", status);
- }
- else
- {
- g_object_set_qdata (G_OBJECT (widget), KEYBOARD_GRABBED,
- GINT_TO_POINTER (TRUE));
- }
- }
-
- return FALSE;
-}
-
-static gboolean
-password_dialog_ungrab_keyboard (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
-{
- if (g_object_get_qdata (G_OBJECT (widget), KEYBOARD_GRABBED) != NULL)
- {
- gdk_keyboard_ungrab (gdk_event_get_time (event));
- g_object_set_qdata (G_OBJECT (widget), KEYBOARD_GRABBED, NULL);
- }
-
- return FALSE;
-}
-
-static gboolean
-password_dialog_window_state_changed (GtkWidget *widget,
- GdkEventWindowState *event,
- gpointer data)
-{
- GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (widget));
-
- if (state & GDK_WINDOW_STATE_WITHDRAWN
- || state & GDK_WINDOW_STATE_ICONIFIED
- || state & GDK_WINDOW_STATE_FULLSCREEN
- || state & GDK_WINDOW_STATE_MAXIMIZED)
- {
- password_dialog_ungrab_keyboard (widget, (GdkEvent*) event, data);
- }
- else
- {
- password_dialog_grab_keyboard (widget, (GdkEvent*) event, data);
- }
-
- return FALSE;
+ g_strfreev (reference_identities);
}
static void
EmpathyServerSASLHandler *handler,
gpointer user_data)
{
- GtkWidget *dialog, *entry, *icon, *ticky;
- GtkBox *box;
- TpAccount *account;
- PasswordDialogData *data;
+ GtkWidget *dialog;
DEBUG ("New SASL server handler received from the factory");
- account = empathy_server_sasl_handler_get_account (handler);
-
- /* dialog */
- 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));
- gtk_window_set_icon_name (GTK_WINDOW (dialog),
- GTK_STOCK_DIALOG_AUTHENTICATION);
-
- 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);
-
- /* remember password ticky */
- ticky = gtk_check_button_new_with_label (_("Remember password"));
-
- gtk_box_pack_start (box, ticky, FALSE, FALSE, 0);
- gtk_widget_show (ticky);
-
- 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);
- g_signal_connect (dialog, "window-state-event",
- G_CALLBACK (password_dialog_window_state_changed), NULL);
- g_signal_connect (dialog, "map-event",
- G_CALLBACK (password_dialog_grab_keyboard), NULL);
- g_signal_connect (dialog, "unmap-event",
- G_CALLBACK (password_dialog_ungrab_keyboard), NULL);
-
- gtk_widget_show (dialog);
- gtk_widget_grab_focus (entry);
+ /* If the handler has the password it will deal with it itself. */
+ if (!empathy_server_sasl_handler_has_password (handler))
+ {
+ dialog = empathy_password_dialog_new (handler);
+ gtk_widget_show (dialog);
+ }
}
int
GOptionContext *context;
GError *error = NULL;
EmpathyAuthFactory *factory;
+ TpDebugSender *debug_sender;
g_thread_init (NULL);
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);
+#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
+
factory = empathy_auth_factory_dup_singleton ();
g_signal_connect (factory, "new-server-tls-handler",
gtk_main ();
g_object_unref (factory);
+ g_object_unref (debug_sender);
return EXIT_SUCCESS;
}