Changeset a2a811e2605275a015a5c8d402ea98b2947afb86

Timestamp:

09/19/08 00:01:22 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

04fe422de37ab2581560c02d9fbb84e47b49f86e

Children:

823255b93401a002c0156230dbcbd5a508dd0baf

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-09-19T00:01:22Z+0200

Message:

Added security page to preferences dialog

2008-09-18 Armin Burgmeier <armin@…>

• inc/dialogs/preferencesdialogs.hpp:
• src/dialogs/preferencesdialogs.cpp: Added a security page.

• inc/core/browser.hpp:
• src/core/browser.cpp: Set discovery's security policy and certificate manager's trust file from preferences.

Files:

• ChangeLog (modified) (1 diff)
• inc/core/browser.hpp (modified) (3 diffs)
• inc/dialogs/preferencesdialog.hpp (modified) (3 diffs)
• src/core/browser.cpp (modified) (5 diffs)
• src/dialogs/preferencesdialog.cpp (modified) (8 diffs)

ChangeLog

@@ +1 @@
+2008-09-18  Armin Burgmeier  <armin@arbur.net>
+
+        * inc/dialogs/preferencesdialogs.hpp:
+        * src/dialogs/preferencesdialogs.cpp: Added a security page.
+
+        * inc/core/browser.hpp:
+        * src/core/browser.cpp: Set discovery's security policy and
+        certificate manager's trust file from preferences.
+
 2008-09-18  Armin Burgmeier  <armin@arbur.net>
 

inc/core/browser.hpp

@@ -29 +29 @@
 #include <libinfgtk/inf-gtk-certificate-manager.h>
 #include <libinfinity/client/infc-browser.h>
+#include <libinfinity/common/inf-discovery-avahi.h>
 #include <libinfinity/common/inf-xmpp-manager.h>
+#include <libinfinity/inf-config.h>
 
 #include <gtkmm/window.h>
@@ -106 +108 @@
                              const std::runtime_error& error);
 
+        void on_security_policy_changed();
+        void on_trust_file_changed();
+
         Gtk::Window& m_parent;
         const InfcNotePlugin* m_text_plugin;
@@ -112 +117 @@
 
         InfXmppManager* m_xmpp_manager;
+#ifdef INFINOTE_HAVE_AVAHI
+        InfDiscoveryAvahi* m_discovery;
+#endif
         InfGtkIo* m_io;
         InfGtkCertificateManager* m_cert_manager;

inc/dialogs/preferencesdialog.hpp

@@ -29 +29 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/checkbutton.h>
-#include <gtkmm/comboboxtext.h>
+#include <gtkmm/combobox.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/filechooserbutton.h>
 #include <gtkmm/fontbutton.h>
-//#include <gtkmm/colorbutton.h>
 #include <gtkmm/sizegroup.h>
+#include <gtkmm/liststore.h>
 
 namespace Gobby
 {
+
+template<typename OptionType>
+class PreferencesComboBox: public Gtk::ComboBox
+{
+public:
+        PreferencesComboBox(Preferences::Option<OptionType>& option):
+                m_option(option), m_store(Gtk::ListStore::create(m_columns))
+        {
+                set_model(m_store);
+
+                Gtk::CellRendererText* renderer =
+                        Gtk::manage(new Gtk::CellRendererText);
+                pack_start(*renderer, true);
+                add_attribute(renderer->property_text(), m_columns.text);
+        }
+
+        void add(const Glib::ustring& text, const OptionType& value)
+        {
+                Gtk::TreeIter iter = m_store->append();
+                (*iter)[m_columns.text] = text;
+                (*iter)[m_columns.value] = value;
+
+                if(m_option == value)
+                        set_active(iter);
+        }
+
+private:
+        class Columns: public Gtk::TreeModelColumnRecord
+        {
+        public:
+                Gtk::TreeModelColumn<Glib::ustring> text;
+                Gtk::TreeModelColumn<OptionType> value;
+
+                Columns() { add(text); add(value); }
+        };
+
+        virtual void on_changed()
+        {
+                Gtk::ComboBox::on_changed();
+                m_option = (*get_active())[m_columns.value];
+        }
+
+        Preferences::Option<OptionType>& m_option;
+
+        Columns m_columns;
+        Glib::RefPtr<Gtk::ListStore> m_store;
+};
 
 class PreferencesDialog : public Gtk::Dialog
 {
 public:
+        template<typename OptionType>
+        class ComboColumns: public Gtk::TreeModelColumnRecord
+        {
+        };
+
         class Group: public Gtk::Frame
         {
@@ -148 +200 @@
                 Group m_group_font;
 
-                Gtk::ComboBoxText m_cmb_toolbar_style;
-
+                PreferencesComboBox<Gtk::ToolbarStyle> m_cmb_toolbar_style;
                 Gtk::FontButton m_btn_font;
+        };
+
+        class Security: public Page
+        {
+        public:
+                Security(Preferences& preferences);
+        
+        protected:
+                Group m_group_trust_file;
+                Group m_group_connection_policy;
+
+                Gtk::FileChooserButton m_btn_path_trust_file;
+                PreferencesComboBox<InfXmppConnectionSecurityPolicy>
+                        m_cmb_connection_policy;
         };
 
@@ -167 +232 @@
         View m_page_view;
         Appearance m_page_appearance;
+        Security m_page_security;
 };
 

src/core/browser.cpp

@@ -21 +21 @@
 
 #include <libinfinity/inf-config.h>
-#include <libinfinity/common/inf-discovery-avahi.h>
 
 #include <gtkmm/stock.h>
@@ -63 +62 @@
         m_xmpp_manager = inf_xmpp_manager_new();
 #ifdef INFINOTE_HAVE_AVAHI
-        InfDiscoveryAvahi* discovery =
-                inf_discovery_avahi_new(INF_IO(m_io), m_xmpp_manager,
-                                        NULL, NULL);
+        m_discovery = inf_discovery_avahi_new(INF_IO(m_io), m_xmpp_manager,
+                                              NULL, NULL);
+        inf_discovery_avahi_set_security_policy(
+                m_discovery, m_preferences.security.policy);
         inf_gtk_browser_store_add_discovery(m_browser_store,
-                                            INF_DISCOVERY(discovery));
-        g_object_unref(discovery);
+                                            INF_DISCOVERY(m_discovery));
 #endif
 
         Glib::ustring known_hosts_file = Glib::build_filename(
                 Glib::get_home_dir(), GOBBY_CONFIGDIR"/known_hosts");
+
+        const std::string trust_file = m_preferences.security.trust_file;
         m_cert_manager = inf_gtk_certificate_manager_new(
                 parent.gobj(), m_xmpp_manager,
-                NULL, known_hosts_file.c_str());
+                trust_file.empty() ? NULL : trust_file.c_str(),
+                known_hosts_file.c_str());
 
         m_browser_view =
@@ -103 +105 @@
         );
 
+        m_preferences.security.policy.signal_changed().connect(
+                sigc::mem_fun(*this, &Browser::on_security_policy_changed));
+        m_preferences.security.trust_file.signal_changed().connect(
+                sigc::mem_fun(*this, &Browser::on_trust_file_changed));
+
         set_spacing(6);
         pack_start(m_scroll, Gtk::PACK_EXPAND_WIDGET);
@@ -120 +127 @@
         g_object_unref(m_cert_manager);
         g_object_unref(m_xmpp_manager);
+#ifdef INFINOTE_HAVE_AVAHI
+        g_object_unref(m_discovery);
+#endif
         g_object_unref(m_io);
 }
@@ -319 +329 @@
         inf_gtk_browser_view_set_selected(m_browser_view, &tree_iter);
 }
+
+void Gobby::Browser::on_security_policy_changed()
+{
+#ifdef INFINOTE_HAVE_AVAHI
+        inf_discovery_avahi_set_security_policy(
+                m_discovery, m_preferences.security.policy);
+#endif
+}
+
+void Gobby::Browser::on_trust_file_changed()
+{
+        const std::string trust_file = m_preferences.security.trust_file;
+
+        g_object_set(G_OBJECT(m_cert_manager), "trust-file",
+                     trust_file.empty() ? NULL : trust_file.c_str(), NULL);
+}

src/dialogs/preferencesdialog.cpp

@@ -29 +29 @@
         using namespace Gobby;
 
-        Gtk::ToolbarStyle rownum_to_toolstyle(int rownum)
-        {
-                switch(rownum)
-                {
-                case 0: return Gtk::TOOLBAR_TEXT;
-                case 1: return Gtk::TOOLBAR_ICONS;
-                case 3: return Gtk::TOOLBAR_BOTH_HORIZ;
-                case 2: default: return Gtk::TOOLBAR_BOTH;
-                }
-        }
-
         Gtk::WrapMode
         wrap_mode_from_check_buttons(Gtk::CheckButton& char_button,
@@ -106 +95 @@
                                         entry,
                                         &Gtk::Entry::get_text
-                                )
-                        )
-                );
-        }
-
-        void
-        connect_toolbar_style_option(Gtk::ComboBox& box,
-                                     Preferences::Option<Gtk::ToolbarStyle>&
-                                     option)
-        {
-                box.signal_changed().connect(
-                        sigc::compose(
-                                sigc::mem_fun(
-                                        option,
-                                        &Preferences::Option<
-                                                Gtk::ToolbarStyle>::set
-                                ),
-                                sigc::compose(
-                                        sigc::ptr_fun(rownum_to_toolstyle),
-                                        sigc::mem_fun(
-                                                box,
-                                                &Gtk::ComboBox::
-                                                        get_active_row_number
-                                        )
                                 )
                         )
@@ -482 +447 @@
 }
 
-Gobby::PreferencesDialog::Appearance::
-        Appearance(Gobby::Preferences& preferences):
+Gobby::PreferencesDialog::Appearance::Appearance(Preferences& preferences):
         m_group_toolbar(_("Toolbar") ),
-        m_group_font(_("Font") )
-{
-        Gtk::ToolbarStyle style = preferences.appearance.toolbar_style;
+        m_group_font(_("Font") ),
+        m_cmb_toolbar_style(preferences.appearance.toolbar_style)
+{
         const Pango::FontDescription& font = preferences.appearance.font;
 
-        m_cmb_toolbar_style.append_text(_("Show text only") );
-        m_cmb_toolbar_style.append_text(_("Show icons only") );
-        m_cmb_toolbar_style.append_text(_("Show both icons and text") );
-        m_cmb_toolbar_style.append_text(_("Show text besides icons") );
+        m_cmb_toolbar_style.add(_("Show text only"),
+                                Gtk::TOOLBAR_TEXT);
+        m_cmb_toolbar_style.add(_("Show icons only"),
+                                Gtk::TOOLBAR_ICONS);
+        m_cmb_toolbar_style.add(_("Show both icons and text"),
+                                Gtk::TOOLBAR_BOTH );
+        m_cmb_toolbar_style.add(_("Show text besides icons"),
+                                Gtk::TOOLBAR_BOTH_HORIZ );
         m_cmb_toolbar_style.show();
-        connect_toolbar_style_option(m_cmb_toolbar_style,
-                                     preferences.appearance.toolbar_style);
-
-        switch(style)
-        {
-        case Gtk::TOOLBAR_TEXT: m_cmb_toolbar_style.set_active(0); break;
-        case Gtk::TOOLBAR_ICONS: m_cmb_toolbar_style.set_active(1); break;
-        case Gtk::TOOLBAR_BOTH: m_cmb_toolbar_style.set_active(2); break;
-        case Gtk::TOOLBAR_BOTH_HORIZ: m_cmb_toolbar_style.set_active(3); break;
-        default: break; // Avoids compiler warnings
-        }
 
         m_btn_font.set_font_name(font.to_string());
@@ -519 +476 @@
         add(m_group_toolbar);
         add(m_group_font);
+}
+
+Gobby::PreferencesDialog::Security::Security(Preferences& preferences):
+        m_group_trust_file(_("Trusted CAs")),
+        m_group_connection_policy(_("Secure Connection")),
+        m_btn_path_trust_file(_("Select a file containing trusted CAs")),
+        m_cmb_connection_policy(preferences.security.policy)
+{
+        const std::string& trust_file = preferences.security.trust_file;
+        if(!trust_file.empty())
+                m_btn_path_trust_file.set_filename(trust_file);
+
+        connect_path_option(m_btn_path_trust_file,
+                            preferences.security.trust_file);
+        m_btn_path_trust_file.show();
+        m_group_trust_file.add(m_btn_path_trust_file);
+        m_group_trust_file.show();
+
+/*      m_cmb_connection_policy.add(
+                _("Never use a secure connection"),
+                INF_XMPP_CONNECTION_SECURITY_ONLY_UNSECURED);*/
+        m_cmb_connection_policy.add(
+                _("Use TLS if possible"),
+                INF_XMPP_CONNECTION_SECURITY_BOTH_PREFER_TLS);
+        m_cmb_connection_policy.add(
+                _("Always use TLS"),
+                INF_XMPP_CONNECTION_SECURITY_ONLY_TLS);
+        m_cmb_connection_policy.show();
+        m_group_connection_policy.add(m_cmb_connection_policy);
+        m_group_connection_policy.show();
+
+        add(m_group_trust_file);
+        add(m_group_connection_policy);
 }
 
@@ -525 +515 @@
         Gtk::Dialog(_("Preferences"), parent), m_preferences(preferences),
         m_page_user(*this, preferences), m_page_editor(preferences),
-        m_page_view(preferences), m_page_appearance(preferences)
+        m_page_view(preferences), m_page_appearance(preferences),
+        m_page_security(preferences)
 {
         m_notebook.append_page(m_page_user, _("User"));
@@ -531 +522 @@
         m_notebook.append_page(m_page_view, _("View"));
         m_notebook.append_page(m_page_appearance, _("Appearance"));
+        m_notebook.append_page(m_page_security, _("Security"));
 
         m_page_user.show();
@@ -536 +528 @@
         m_page_view.show();
         m_page_appearance.show();
+        m_page_security.show();
 
         get_vbox()->set_spacing(6);
@@ -544 +537 @@
 
         set_border_width(12);
+        set_resizable(false);
 }