Changeset d932cb369c8c7f2d18dd1310a3729834040ea4d3

Timestamp:

02/14/09 16:23:59 (4 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

4c745f3d1d18e682c548c17d59430a68ef85955a

Children:

07e49776a394a41e8274c44947bedb7e3d0d441e

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-02-14T16:23:59Z+0100

Message:

Added /etc/ssl/certs/ca-certificates.crt as default trust file

2009-02-14 Armin Burgmeier <armin@…>

• code/util/config.hpp:
• code/util/config.cpp: Added ParentEntry::has_value().

• code/core/preferences.cpp: Added /etc/ssl/certs/ca-certificates.crt as default value for the trust-file, if the file exists.

Files:

• ChangeLog (modified) (1 diff)
• code/core/preferences.cpp (modified) (1 diff)
• code/util/config.cpp (modified) (1 diff)
• code/util/config.hpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2009-02-14  Armin Burgmeier  <armin@arbur.net>
+
+        * code/util/config.hpp:
+        * code/util/config.cpp: Added ParentEntry::has_value().
+
+        * code/core/preferences.cpp: Added /etc/ssl/certs/ca-certificates.crt
+        as default value for the trust-file, if the file exists.
+
 2009-02-03  Armin Burgmeier  <armin@arbur.net>
 

code/core/preferences.cpp

@@ -110 +110 @@
 
 Gobby::Preferences::Security::Security(Config::ParentEntry& entry):
-        trust_file(entry.get_value<std::string>("trust-file", "")),
+        trust_file(entry.get_value<std::string>("trust-file")),
         policy(static_cast<InfXmppConnectionSecurityPolicy>(
                 entry.get_value<int>("policy", static_cast<int>(
                         INF_XMPP_CONNECTION_SECURITY_BOTH_PREFER_TLS))))
 {
+        // Load default trust-file. As this accesses the filesystem, only do
+        // it when we really need it, i.e. when starting Gobby the first time.
+        if(!entry.has_value("trust-file"))
+        {
+#ifdef G_OS_WIN32
+                gchar* package_directory =
+                        g_win32_get_package_installation_directory_of_module(
+                                NULL);
+
+                trust_file = Glib::build_filename(
+                        Glib::build_filename(package_directory, "certs"),
+                        "ca-certificates.crt");
+
+                g_free(package_directory);
+#else
+                // This seems to be the default location for both
+                // Debian and Gentoo. I don't know about other distributions.
+                // Maybe they need a distro-patch for this.
+                const std::string DEFAULT_TRUST_FILE =
+                        "/etc/ssl/certs/ca-certificates.crt";
+                if(Glib::file_test(DEFAULT_TRUST_FILE,
+                                   Glib::FILE_TEST_IS_REGULAR))
+                {
+                        trust_file = DEFAULT_TRUST_FILE;
+                }
+#endif
+        }
 }
 

code/util/config.cpp

@@ -141 +141 @@
 }
 
+bool Gobby::Config::ParentEntry::has_value(const Glib::ustring& name)
+{
+        return get_value_child(name) != NULL;
+}
+
 Gobby::Config::ParentEntry& Gobby::Config::ParentEntry::
         operator[](const Glib::ustring& name)

code/util/config.hpp

@@ -44 +44 @@
         public:
                 Entry(const Glib::ustring& name);
-                virtual ~Entry() {} // compiler complains without
+                virtual ~Entry() {}
 
                 /** @brief Saves this entry into the given element.
@@ -202 +202 @@
                 get_value_child(const Glib::ustring& name) const;
 
+                /** @brief: Returns whether there is a child ValueEntry with
+                 * the given name.
+                 */
+                bool has_value(const Glib::ustring& name);
+
                 /** @brief Returns the value from the child with the given
                  * name.