Changeset c5cb29d4d328f0f803f3bcbd5a65fc89ed548ddd

Timestamp:

12/11/09 13:42:26 (3 years ago)

Author:

Benjamin Herr <ben@…>

Parents:

485732763f97274d10799276e87f261e6289b602

Children:

e056a898bf91e96d0aaf2289e858bb5953fcde1c

git-committer:

Benjamin Herr <ben@0x539.de> / 2009-12-11T13:42:26Z+0100

Message:

temporary commit

Files:

• code/commands/Makefile.am (modified) (2 diffs)
• code/commands/auth-commands.cpp (added)
• code/commands/auth-commands.hpp (added)
• code/core/browser.cpp (modified) (6 diffs)
• code/core/browser.hpp (modified) (3 diffs)
• code/dialogs/Makefile.am (modified) (2 diffs)
• code/dialogs/password-dialog.cpp (added)
• code/dialogs/password-dialog.hpp (added)
• code/window.cpp (modified) (1 diff)
• code/window.hpp (modified) (2 diffs)
• configure.ac (modified) (1 diff)

code/commands/Makefile.am

@@ -4 +4 @@
 
 libgobby_commands_a_SOURCES = \
+        auth-commands.cpp \
         autosave-commands.cpp \
         browser-commands.cpp \
@@ -17 +18 @@
 
 noinst_HEADERS = \
+        auth-commands.hpp \
         autosave-commands.hpp \
         browser-commands.hpp \

code/core/browser.cpp

@@ -17 +17 @@
  */
 
+#include "dialogs/password-dialog.hpp"
 #include "core/browser.hpp"
 #include "util/file.hpp"
@@ -27 +28 @@
 
 #ifndef G_OS_WIN32
-# include <sys/socket.h> 
+# include <sys/socket.h>
 # include <net/if.h>
 #endif
+
+namespace
+{
+        Glib::ustring prompt_password(Gtk::Window& parent,
+                                      Gsasl_session* session)
+        {
+                InfXmppConnection* xmpp =
+                        INF_XMPP_CONNECTION(gsasl_session_hook_get(session));
+                gchar* remote_id;
+                g_object_get(G_OBJECT(xmpp), "remote-id", &remote_id, NULL);
+                Glib::ustring remote_id_(remote_id);
+                g_free(remote_id);
+                Gobby::PasswordDialog dialog(parent, remote_id_);
+                dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
+                dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+                if(dialog.run() != Gtk::RESPONSE_ACCEPT)
+                        return "";
+                return dialog.get_password();
+        }
+}
 
 gint compare_func(GtkTreeModel* model, GtkTreeIter* first, GtkTreeIter* second, gpointer user_data)
@@ -89 +110 @@
         m_status_bar(status_bar),
         m_preferences(preferences),
+        m_gsasl(NULL),
         m_expander(_("_Direct Connection"), true),
         m_hbox(false, 6),
@@ -184 +206 @@
         }
 
+        gsasl_done(m_gsasl);
+
         g_object_unref(m_browser_store);
         g_object_unref(m_sort_model);
@@ -287 +311 @@
                                 NULL, hostname.c_str(),
                                 m_preferences.security.policy,
-                                NULL, NULL, NULL);
+                                NULL,
+                                m_gsasl,
+                                m_gsasl_mechanisms.empty()
+                                        ? ""
+                                        : m_gsasl_mechanisms.c_str());
 
                         inf_xmpp_manager_add_connection(m_xmpp_manager, xmpp);
@@ -442 +470 @@
 }
 
+void Gobby::Browser::set_gsasl_context(Gsasl* gsasl, const char* mechanisms)
+{
+        m_gsasl = gsasl;
+        m_gsasl_mechanisms = mechanisms ? mechanisms : "";
+#ifdef LIBINFINITY_HAVE_AVAHI
+        g_object_set(G_OBJECT(m_discovery),
+                "sasl-context", m_gsasl,
+                "sasl-mechanisms", mechanisms,
+                NULL);
+#endif
+}
+
 void Gobby::Browser::on_security_policy_changed()
 {

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>
@@ -78 +80 @@
 
         void connect_to_host(Glib::ustring str);
+
+        void set_gsasl_context(Gsasl* gsasl, const char* mechanisms);
 
         SignalActivate signal_activate() const { return m_signal_activate; }
@@ -123 +127 @@
         Preferences& m_preferences;
 
+        Gsasl* m_gsasl;
+        std::string m_gsasl_mechanisms;
         InfXmppManager* m_xmpp_manager;
 #ifdef LIBINFINITY_HAVE_AVAHI

code/dialogs/Makefile.am

@@ -8 +8 @@
         initial-dialog.cpp \
         open-location-dialog.cpp \
+        password-dialog.cpp \
         preferences-dialog.cpp
 
@@ -17 +18 @@
         initial-dialog.hpp \
         open-location-dialog.hpp \
+        password-dialog.hpp \
         preferences-dialog.hpp
 

code/window.cpp

@@ -55 +55 @@
         m_browser_context_commands(*this, m_browser, m_file_chooser,
                                    m_operations, m_preferences),
+        m_auth_commands(*this, m_browser, m_preferences),
         m_autosave_commands(m_text_folder, m_operations, m_info_storage,
                             m_preferences),

code/window.hpp

@@ -28 +28 @@
 #include "commands/user-join-commands.hpp"
 #include "commands/browser-context-commands.hpp"
+#include "commands/auth-commands.hpp"
 #include "commands/folder-commands.hpp"
 #include "commands/file-commands.hpp"
@@ -178 +179 @@
         BrowserContextCommands m_browser_context_commands;
 
+        AuthCommands m_auth_commands;
+
         AutosaveCommands m_autosave_commands;
         SubscriptionCommands m_subscription_commands;

configure.ac

@@ -37 +37 @@
 AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
 
-required_libs="libxml++-2.6 glibmm-2.4 >= 2.18.0 giomm-2.4 >= 2.18.0 gtkmm-2.4 >= 2.12.0 gthread-2.0 gtksourceview-2.0 >= 2.4"
+required_libs="libxml++-2.6 glibmm-2.4 >= 2.18.0 giomm-2.4 >= 2.18.0 gtkmm-2.4 >= 2.12.0 gthread-2.0 gtksourceview-2.0 >= 2.4 libgsasl >= 0.2.21"
 
 # Check if we are running on OS X, for special link handling.