Changeset 4ea88a5b849ba932b20b25f858d00acde49b65b5

Timestamp:

12/25/10 20:44:00 (2 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

3b10ba674e94451d6b4b1c416cb0bf351a04f9bf

Children:

124c09a527b0d240598db4dbc383ed37e949c93e

git-committer:

Armin Burgmeier <armin@arbur.net> / 2010-12-25T20:44:00Z+0100

Message:

Show password dialog asynchronously

2010-12-25 Armin Burgmeier <armin@…>

• code/core/browser.hpp:
• code/core/browser.cpp:
• code/commands/auth-commands.hpp:
• code/commands/auth-commands.cpp: Adapt to latest API changes in libinfinity, show password dialog asynchronously.

Files:

• ChangeLog (modified) (1 diff)
• code/commands/auth-commands.cpp (modified) (10 diffs)
• code/commands/auth-commands.hpp (modified) (6 diffs)
• code/core/browser.cpp (modified) (4 diffs)
• code/core/browser.hpp (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2010-12-25  Armin Burgmeier  <armin@arbur.net>
+
+        * code/core/browser.hpp:
+        * code/core/browser.cpp:
+        * code/commands/auth-commands.hpp:
+        * code/commands/auth-commands.cpp: Adapt to latest API changes in
+        libinfinity, show password dialog asynchronously.
+
 2010-09-21  Armin Burgmeier  <armin@arbur.net>
 

code/commands/auth-commands.cpp

@@ -18 +18 @@
 
 #include "commands/auth-commands.hpp"
-#include "dialogs/password-dialog.hpp"
 #include "util/i18n.hpp"
 
@@ -28 +27 @@
 namespace
 {
-        Glib::ustring prompt_password(Gtk::Window& parent,
-                                      InfXmppConnection* xmpp,
-                                      unsigned int retry_counter)
-        {
-                gchar* remote_id;
-                g_object_get(G_OBJECT(xmpp),
-                        "remote-hostname", &remote_id,
-                        NULL);
-                Glib::ustring remote_id_(remote_id);
-                g_free(remote_id);
-                Gobby::PasswordDialog dialog(parent,
-                                             remote_id_,
-                                             retry_counter);
-                dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-
-                dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
-                if(dialog.run() != Gtk::RESPONSE_ACCEPT)
-                        return "";
-                return dialog.get_password();
-        }
-
         void show_error(const GError* error,
                         Gobby::StatusBar& statusbar,
@@ -88 +66 @@
         m_preferences(preferences)
 {
-        int gsasl_status = gsasl_init(&m_gsasl);
-        if(gsasl_status != GSASL_OK)
-                throw std::runtime_error(
-                        std::string("gsasl error: ") +
-                        gsasl_strerror(gsasl_status));
-        gsasl_callback_set(m_gsasl, &AuthCommands::gsasl_callback_static);
-        gsasl_callback_hook_set(m_gsasl, this);
-        g_object_set_data_full(G_OBJECT(m_browser.get_store()),
-                               "Gobby::AuthCommands::m_gsasl",
-                               m_gsasl,
-                               reinterpret_cast<GDestroyNotify>(gsasl_done));
-        m_browser.set_gsasl_context(m_gsasl, "ANONYMOUS PLAIN");
+        GError* error = NULL;
+        m_sasl_context = inf_sasl_context_new(&error);
+
+        if(!m_sasl_context)
+        {
+                std::string error_message =
+                        std::string("SASL initialization error: ") +
+                        error->message;
+                g_error_free(error);
+                throw std::runtime_error(error_message);
+        }
+
+        inf_sasl_context_set_callback(
+                m_sasl_context, &AuthCommands::sasl_callback_static, this);
+
+        m_browser.set_sasl_context(m_sasl_context, "ANONYMOUS PLAIN");
+
         g_signal_connect(
                 G_OBJECT(m_browser.get_store()),
@@ -109 +92 @@
 Gobby::AuthCommands::~AuthCommands()
 {
-        m_browser.set_gsasl_context(NULL, NULL);
+        m_browser.set_sasl_context(NULL, NULL);
+        inf_sasl_context_unref(m_sasl_context);
 
         for(RetryMap::iterator iter = m_retries.begin();
@@ -118 +102 @@
 }
 
-int Gobby::AuthCommands::gsasl_callback(Gsasl_session* session,
+void Gobby::AuthCommands::sasl_callback(InfSaslContextSession* session,
+                                        InfXmppConnection* xmpp,
                                         Gsasl_property prop)
 {
@@ -125 +110 @@
         {
         case GSASL_ANONYMOUS_TOKEN:
-                gsasl_property_set(session,
-                                   GSASL_ANONYMOUS_TOKEN,
-                                   username.c_str());
-                return GSASL_OK;
+                inf_sasl_context_session_set_property(
+                        session, GSASL_ANONYMOUS_TOKEN, username.c_str());
+                inf_sasl_context_session_continue(session, GSASL_OK);
+                break;
         case GSASL_AUTHID:
-                gsasl_property_set(session,
-                                   GSASL_AUTHID,
-                                   username.c_str());
-                return GSASL_OK;
+                inf_sasl_context_session_set_property(
+                        session, GSASL_AUTHID, username.c_str());
+                inf_sasl_context_session_continue(session, GSASL_OK);
+                break;
         case GSASL_PASSWORD:
                 {
-                        InfXmppConnection* xmpp =
-                                INF_XMPP_CONNECTION(
-                                        gsasl_session_hook_get(session));
                         RetryMap::iterator i = m_retries.find(xmpp);
                         if(i == m_retries.end())
@@ -144 +126 @@
                         RetryInfo& info(i->second);
 
-                        if(info.last_password.empty())
+                        if(!info.last_password.empty())
                         {
-                                info.last_password =
-                                        prompt_password(m_parent, xmpp,
-                                                        info.retries);
-                                ++info.retries;
-
-                                if(info.last_password.empty())
-                                        return GSASL_NO_PASSWORD;
+                                inf_sasl_context_session_set_property(
+                                        session, GSASL_PASSWORD,
+                                        info.last_password.c_str());
+
+                                inf_sasl_context_session_continue(session,
+                                                                  GSASL_OK);
                         }
-
-                        gsasl_property_set(session,
-                                           GSASL_PASSWORD,
-                                           info.last_password.c_str());
-                        return GSASL_OK;
-                }
+                        else
+                        {
+                                // Query user for password
+                                g_assert(info.password_dialog == NULL);
+
+                                gchar* remote_id;
+                                g_object_get(G_OBJECT(xmpp),
+                                             "remote-hostname", &remote_id,
+                                             NULL);
+                                Glib::ustring remote_id_(remote_id);
+                                g_free(remote_id);
+
+                                info.password_dialog = new PasswordDialog(
+                                        m_parent, remote_id_, info.retries);
+                                info.password_dialog->add_button(
+                                        Gtk::Stock::CANCEL,
+                                        Gtk::RESPONSE_CANCEL);
+                                info.password_dialog->add_button(
+                                        Gtk::Stock::OK,
+                                        Gtk::RESPONSE_ACCEPT);
+
+                                Gtk::Dialog& dialog = *info.password_dialog;
+                                dialog.signal_response().connect(sigc::bind(
+                                        sigc::mem_fun(
+                                                *this,
+                                                &AuthCommands::on_response),
+                                        session, xmpp));
+
+                                info.password_dialog->present();
+                        }
+                }
+
+                break;
         default:
-                return GSASL_NO_CALLBACK;
+                inf_sasl_context_session_continue(session, GSASL_NO_CALLBACK);
+                break;
+        }
+}
+
+void Gobby::AuthCommands::on_response(int response_id,
+                                      InfSaslContextSession* session,
+                                      InfXmppConnection* xmpp)
+{
+        RetryMap::iterator i = m_retries.find(xmpp);
+        g_assert(i != m_retries.end());
+        RetryInfo& info(i->second);
+
+        if(response_id == Gtk::RESPONSE_ACCEPT)
+                info.last_password = info.password_dialog->get_password();
+        else
+                info.last_password = "";
+
+        delete info.password_dialog;
+        info.password_dialog = NULL;
+
+        ++info.retries;
+
+        if(info.last_password.empty())
+        {
+                inf_sasl_context_session_continue(session, GSASL_NO_PASSWORD);
+        }
+        else
+        {
+                inf_sasl_context_session_set_property(
+                        session, GSASL_PASSWORD, info.last_password.c_str());
+                inf_sasl_context_session_continue(session, GSASL_OK);
         }
 }
@@ -195 +234 @@
              g_quark_from_static_string("INF_XMPP_CONNECTION_AUTH_ERROR"))
         {
+                // Authentication failed for some reason, maybe because the
+                // server aborted authentication. If we were querying a
+                // password then close the dialog now.
+                delete iter->second.password_dialog;
+                iter->second.password_dialog = NULL;
+
                 const GError* sasl_error =
                         inf_xmpp_connection_get_sasl_error(xmpp);
@@ -262 +307 @@
                 G_CALLBACK(on_notify_status_static),
                 this);
+        iter->second.password_dialog = NULL;
 
         return iter;
@@ -270 +316 @@
         InfXmlConnectionStatus status;
         g_object_get(G_OBJECT(connection), "status", &status, NULL);
+
         if(status != INF_XML_CONNECTION_OPENING)
         {
                 RetryMap::iterator iter = m_retries.find(connection);
                 g_signal_handler_disconnect(connection, iter->second.handle);
+                delete iter->second.password_dialog;
                 m_retries.erase(iter);
         }

code/commands/auth-commands.hpp

@@ -20 +20 @@
 #define _GOBBY_AUTH_COMMANDS_HPP_
 
+#include "dialogs/password-dialog.hpp"
+
 #include "core/browser.hpp"
 #include "core/statusbar.hpp"
 #include "core/preferences.hpp"
-
-#include <gsasl.h>
 
 #include <gtkmm/window.h>
@@ -43 +43 @@
 
 protected:
-        static int gsasl_callback_static(Gsasl* ctx,
-                                         Gsasl_session* session,
-                                         Gsasl_property prop)
+        static void sasl_callback_static(InfSaslContextSession* session,
+                                         Gsasl_property prop,
+                                         gpointer session_data,
+                                         gpointer user_data)
         {
-                AuthCommands* auth = static_cast<AuthCommands*>(
-                        gsasl_callback_hook_get(ctx));
-                return auth->gsasl_callback(session, prop);
+                AuthCommands* auth = static_cast<AuthCommands*>(user_data);
+
+                auth->sasl_callback(
+                        session, INF_XMPP_CONNECTION(session_data), prop);
         }
 
@@ -80 +82 @@
         }
 
-        int gsasl_callback(Gsasl_session* session,
+        void sasl_callback(InfSaslContextSession* session,
+                           InfXmppConnection* xmpp,
                            Gsasl_property prop);
 
@@ -96 +99 @@
                 Glib::ustring last_password;
                 gulong handle;
+                PasswordDialog* password_dialog;
         };
 
@@ -103 +107 @@
 
         void on_notify_status(InfXmppConnection* connection);
+        void on_response(int response_id, InfSaslContextSession* session,
+                         InfXmppConnection* xmpp);
 
         Gtk::Window& m_parent;
@@ -108 +114 @@
         StatusBar& m_statusbar;
         const Preferences& m_preferences;
-        Gsasl* m_gsasl;
+        InfSaslContext* m_sasl_context;
 
         RetryMap m_retries;

code/core/browser.cpp

@@ -110 +110 @@
         m_status_bar(status_bar),
         m_preferences(preferences),
-        m_gsasl(NULL),
+        m_sasl_context(NULL),
         m_expander(_("_Direct Connection"), true),
         m_hbox(false, 6),
@@ -206 +206 @@
         }
 
+        if(m_sasl_context)
+                inf_sasl_context_unref(m_sasl_context);
+
         g_object_unref(m_browser_store);
         g_object_unref(m_sort_model);
@@ -310 +313 @@
                                 m_preferences.security.policy,
                                 NULL,
-                                m_gsasl,
-                                m_gsasl_mechanisms.empty()
+                                m_sasl_context,
+                                m_sasl_mechanisms.empty()
                                         ? ""
-                                        : m_gsasl_mechanisms.c_str());
+                                        : m_sasl_mechanisms.c_str());
 
                         inf_xmpp_manager_add_connection(m_xmpp_manager, xmpp);
@@ -468 +471 @@
 }
 
-void Gobby::Browser::set_gsasl_context(Gsasl* gsasl, const char* mechanisms)
-{
-        m_gsasl = gsasl;
-        m_gsasl_mechanisms = mechanisms ? mechanisms : "";
+void Gobby::Browser::set_sasl_context(InfSaslContext* sasl_context,
+                                      const char* mechanisms)
+{
+        if(m_sasl_context) inf_sasl_context_unref(m_sasl_context);
+        m_sasl_context = sasl_context;
+        if(m_sasl_context) inf_sasl_context_ref(m_sasl_context);
+        m_sasl_mechanisms = mechanisms ? mechanisms : "";
+
 #ifdef LIBINFINITY_HAVE_AVAHI
         g_object_set(G_OBJECT(m_discovery),
-                "sasl-context", m_gsasl,
+                "sasl-context", m_sasl_context,
                 "sasl-mechanisms", mechanisms,
                 NULL);

code/core/browser.hpp

@@ -35 +35 @@
 #include <libinfgtk/inf-gtk-browser-model.h>
 #include <libinfgtk/inf-gtk-browser-model-sort.h>
-
-#include <gsasl.h>
 
 #include <gtkmm/window.h>
@@ -81 +79 @@
         void connect_to_host(Glib::ustring str);
 
-        void set_gsasl_context(Gsasl* gsasl, const char* mechanisms);
+        void set_sasl_context(InfSaslContext* sasl_context,
+                              const char* mechanisms);
 
         SignalActivate signal_activate() const { return m_signal_activate; }
@@ -127 +126 @@
         Preferences& m_preferences;
 
-        Gsasl* m_gsasl;
-        std::string m_gsasl_mechanisms;
+        InfSaslContext* m_sasl_context;
+        std::string m_sasl_mechanisms;
         InfXmppManager* m_xmpp_manager;
 #ifdef LIBINFINITY_HAVE_AVAHI