Changeset 341ab62ab03143302fa354d392ba2f8e585d5300

Timestamp:

12/02/10 15:56:26 (2 years ago)

Author:

Armin Burgmeier <armin@…>

git-author:

Benjamin Herr <ben@0x539.de> / 2010-02-09T19:50:58Z+0100

Parents:

bc626ac1b9062e23d8e3c0f757e7f0ca0199db4b

Children:

61cce2ce9c8b06819912a01dad14af78444f3b64

git-committer:

Armin Burgmeier <armin@arbur.net> / 2010-02-12T15:56:26Z+0100

Message:

auth-commands: Handle _TRY_AGAIN auth errors, etc.

2010-02-09 Benjamin Herr <ben@…>

• code/commands/auth-commands.hpp:
• code/commands/auth-commands.cpp: Handle _TRY_AGAIN errors, do the whole retrying thing properly.

Files:

• ChangeLog (modified) (1 diff)
• code/commands/auth-commands.cpp (modified) (3 diffs)
• code/commands/auth-commands.hpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2010-02-09  Benjamin Herr  <ben@0x539.de>
+
+        * code/commands/auth-commands.hpp:
+        * code/commands/auth-commands.cpp: Handle _TRY_AGAIN errors, do
+        the whole retrying thing properly.
+
 2010-01-31  Benjamin Herr  <ben@0x539.de>, Armin Burgmeier  <armin@arbur.net>
 

code/commands/auth-commands.cpp

@@ -141 +141 @@
                         RetryMap::iterator i = m_retries.find(xmpp);
                         if(i == m_retries.end())
+                                i = insert_retry_info(xmpp);
+                        RetryInfo& info(i->second);
+
+                        if(info.last_password.empty())
                         {
-                                i = m_retries.insert(
-                                        std::make_pair(xmpp,
-                                                       RetryInfo())).first;
-                                i->second.retries = 0;
-                                i->second.handle = g_signal_connect(
-                                        G_OBJECT(xmpp),
-                                        "notify::status",
-                                        G_CALLBACK(on_notify_status_static),
-                                        this);
+                                info.last_password =
+                                        prompt_password(m_parent, xmpp,
+                                                        info.retries);
+                                ++info.retries;
+
+                                if(info.last_password.empty())
+                                        return GSASL_NO_PASSWORD;
                         }
-                        RetryInfo& info(i->second);
-
-                        Glib::ustring password =
-                                prompt_password(m_parent, xmpp, info.retries);
-                        ++info.retries;
-
-                        if(password.empty())
-                                return GSASL_NO_PASSWORD;
+
                         gsasl_property_set(session,
                                            GSASL_PASSWORD,
-                                           password.c_str());
+                                           info.last_password.c_str());
                         return GSASL_OK;
                 }
@@ -188 +183 @@
         g_assert(INF_IS_XMPP_CONNECTION(connection));
 
+        InfXmppConnection* xmpp = INF_XMPP_CONNECTION(connection);
+        RetryMap::iterator iter = m_retries.find(xmpp);
+        if(iter == m_retries.end())
+                iter = insert_retry_info(xmpp);
+        Glib::ustring& last_password(iter->second.last_password);
+        Glib::ustring old_password;
+
+        old_password.swap(last_password);
+
         if(error->domain ==
              g_quark_from_static_string("INF_XMPP_CONNECTION_AUTH_ERROR"))
         {
-                InfXmppConnection* xmpp = INF_XMPP_CONNECTION(connection);
                 const GError* sasl_error =
                         inf_xmpp_connection_get_sasl_error(xmpp);
                 if(sasl_error != NULL &&
                    sasl_error->domain ==
-                     inf_authentication_detail_error_quark() &&
-                   sasl_error->code ==
-                     INF_AUTHENTICATION_DETAIL_ERROR_AUTHENTICATION_FAILED)
-                {
-                        GError* my_error = NULL;
-                        inf_xmpp_connection_retry_sasl_authentication(
-                                INF_XMPP_CONNECTION(connection), &my_error);
-                        if(my_error)
-                        {
-                                show_error(my_error, m_statusbar, connection);
-                                g_error_free(my_error);
-                        }
+                     inf_authentication_detail_error_quark())
+                {
+                        handle_error_detail(xmpp, sasl_error,
+                                            old_password,
+                                            last_password);
                 }
                 else if(sasl_error != NULL)
@@ -218 +214 @@
                 }
         }
-        else if(error->domain == inf_gsasl_error_quark() ||
-                error->domain == inf_authentication_detail_error_quark())
+        else if(error->domain == inf_gsasl_error_quark())
         {
                 show_error(error, m_statusbar, connection);
         }
+}
+
+void Gobby::AuthCommands::handle_error_detail(InfXmppConnection* xmpp,
+                                              const GError* detail_error,
+                                              Glib::ustring& old_password,
+                                              Glib::ustring& last_password)
+{
+        GError* error = NULL;
+        switch(detail_error->code)
+        {
+        case INF_AUTHENTICATION_DETAIL_ERROR_AUTHENTICATION_FAILED:
+                inf_xmpp_connection_retry_sasl_authentication(xmpp, &error);
+                break;
+        case INF_AUTHENTICATION_DETAIL_ERROR_TRY_AGAIN:
+                old_password.swap(last_password);
+                inf_xmpp_connection_retry_sasl_authentication(xmpp, &error);
+
+                break;
+        default:
+                show_error(detail_error, m_statusbar,
+                           INF_XML_CONNECTION(xmpp));
+                break;
+        }
+
+        if(error)
+        {
+                show_error(error, m_statusbar,
+                           INF_XML_CONNECTION(xmpp));
+                g_error_free(error);
+        }
+}
+
+Gobby::AuthCommands::RetryMap::iterator
+Gobby::AuthCommands::insert_retry_info(InfXmppConnection* xmpp)
+{
+        RetryMap::iterator iter = m_retries.insert(
+                std::make_pair(xmpp,
+                               RetryInfo())).first;
+        iter->second.retries = 0;
+        iter->second.handle = g_signal_connect(
+                G_OBJECT(xmpp),
+                "notify::status",
+                G_CALLBACK(on_notify_status_static),
+                this);
+
+        return iter;
 }
 

code/commands/auth-commands.hpp

@@ -87 +87 @@
         void browser_error_callback(InfcBrowser* browser, GError* error);
 
+        void handle_error_detail(InfXmppConnection* xmpp,
+                                 const GError* detail_error,
+                                 Glib::ustring& old_password,
+                                 Glib::ustring& last_password);
+
+        struct RetryInfo {
+                unsigned int retries;
+                Glib::ustring last_password;
+                gulong handle;
+        };
+
+        typedef std::map<InfXmppConnection*, RetryInfo> RetryMap;
+
+        RetryMap::iterator insert_retry_info(InfXmppConnection* xmpp);
+
         void on_notify_status(InfXmppConnection* connection);
 
@@ -95 +110 @@
         Gsasl* m_gsasl;
 
-        struct RetryInfo {
-                unsigned int retries;
-                gulong handle;
-        };
-
-        typedef std::map<InfXmppConnection*, RetryInfo> RetryMap;
         RetryMap m_retries;
 };