[glib/settings-portal] Wip: add support for system defaults to keyfile backend



commit d216c55f16df73051d1f939471efc75fcdaa011a
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Nov 5 16:07:55 2018 -0500

    Wip: add support for system defaults to keyfile backend
    
    Stacked databases and locks are dconf features that allow
    management software like Fleet Commander to set system-wide
    defaults and overrides centrally for applications.
    
    This proof-of-concept patch adds minimal support for the
    same to the keyfile settings backend. We read system-wide
    overrides and locks (the current file locations are just for
    testing), and treat the values from the system-wide keyfile
    as overrides or defaults, depending on whether the key is on
    the list of locks or not.
    
    Writes always go to the per-user keyfile.

 gio/gkeyfilesettingsbackend.c | 130 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 129 insertions(+), 1 deletion(-)
---
diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c
index ab214d3d4..d6026f20c 100644
--- a/gio/gkeyfilesettingsbackend.c
+++ b/gio/gkeyfilesettingsbackend.c
@@ -29,6 +29,7 @@
 
 #include "gfile.h"
 #include "gfileinfo.h"
+#include "gfileenumerator.h"
 #include "gfilemonitor.h"
 #include "gsimplepermission.h"
 #include "gsettingsbackendinternal.h"
@@ -60,6 +61,8 @@ typedef struct
   GKeyFile          *keyfile;
   GPermission       *permission;
   gboolean           writable;
+  GKeyFile          *system_keyfile;
+  GHashTable        *system_locks;
 
   gchar             *prefix;
   gint               prefix_len;
@@ -204,10 +207,19 @@ get_from_keyfile (GKeyfileSettingsBackend *kfsb,
   if (convert_path (kfsb, key, &group, &name))
     {
       gchar *str;
+      gchar *sysstr;
 
       g_assert (*name);
 
+      sysstr = g_key_file_get_value (kfsb->system_keyfile, group, name, NULL);
       str = g_key_file_get_value (kfsb->keyfile, group, name, NULL);
+      if (sysstr &&
+          (g_hash_table_contains (kfsb->system_locks, key) ||
+           str == NULL))
+        {
+          g_free (str);
+          str = g_strdup (sysstr);
+        }
 
       if (str)
         {
@@ -215,6 +227,8 @@ get_from_keyfile (GKeyfileSettingsBackend *kfsb,
           g_free (str);
         }
 
+      g_free (sysstr);
+
       g_free (group);
       g_free (name);
     }
@@ -229,6 +243,9 @@ set_to_keyfile (GKeyfileSettingsBackend *kfsb,
 {
   gchar *group, *name;
 
+  if (g_hash_table_contains (kfsb->system_locks, key))
+    return FALSE;
+
   if (convert_path (kfsb, key, &group, &name))
     {
       if (value)
@@ -375,7 +392,9 @@ g_keyfile_settings_backend_get_writable (GSettingsBackend *backend,
 {
   GKeyfileSettingsBackend *kfsb = G_KEYFILE_SETTINGS_BACKEND (backend);
 
-  return kfsb->writable && path_is_valid (kfsb, name);
+  return kfsb->writable &&
+         !g_hash_table_contains (kfsb->system_locks, name) &&
+         path_is_valid (kfsb, name);
 }
 
 static GPermission *
@@ -521,6 +540,8 @@ g_keyfile_settings_backend_finalize (GObject *object)
 
   g_key_file_free (kfsb->keyfile);
   g_object_unref (kfsb->permission);
+  g_key_file_free (kfsb->system_keyfile);
+  g_hash_table_unref (kfsb->system_locks);
 
   g_file_monitor_cancel (kfsb->file_monitor);
   g_object_unref (kfsb->file_monitor);
@@ -569,6 +590,111 @@ dir_changed (GFileMonitor       *monitor,
   g_keyfile_settings_backend_keyfile_writable (kfsb);
 }
 
+static void
+load_system_settings (GKeyfileSettingsBackend *kfsb)
+{
+  GError *error = NULL;
+  // FIXME: just for test purposes, use two files present on Fedora
+  const char *db_path = "/etc/dconf/db/distro.d/";
+  GFile *file;
+  GFileEnumerator *enumerator;
+  GFile *lock_file;
+
+  kfsb->system_keyfile = g_key_file_new ();
+
+  file = g_file_new_for_path (db_path);
+  enumerator = g_file_enumerate_children (file, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL);
+  if (enumerator != NULL)
+    {
+      while (TRUE)
+        {
+          GFileInfo *info;
+          const char *name;
+          char *path;
+
+          info = g_file_enumerator_next_file (enumerator, NULL, NULL);
+          if (info == NULL)
+            break;
+
+          if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR)
+            continue;
+
+          name = g_file_info_get_name (info);
+          path = g_build_filename (db_path, name, NULL);
+
+          g_debug ("Loading system-wide settings from %s", path);
+
+          if (!g_key_file_load_from_file (kfsb->system_keyfile, path, G_KEY_FILE_NONE, &error))
+            {
+              if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+                g_warning ("Failed to read %s: %s", path, error->message);
+              g_clear_error (&error);
+            }
+          g_free (path);
+          g_object_unref (info);
+        }
+
+      g_object_unref (enumerator);
+    }
+
+  kfsb->system_locks = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+  lock_file = g_file_get_child (file, "locks");
+  enumerator = g_file_enumerate_children (lock_file, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL);
+  if (enumerator != NULL)
+    {
+      while (TRUE)
+        {
+          GFileInfo *info;
+          const char *name;
+          char *path;
+          char *contents;
+          int i;
+          char **lines;
+
+          info = g_file_enumerator_next_file (enumerator, NULL, NULL);
+          if (info == NULL)
+            break;
+
+          name = g_file_info_get_name (info);
+          path = g_build_filename (db_path, "locks", name, NULL);
+
+          g_debug ("Loading system-wide locks from %s", path);
+
+          if (!g_file_get_contents (path, &contents, NULL, &error))
+            {
+              if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+                g_warning ("Failed to read %s: %s", path, error->message);
+              g_clear_error (&error);
+            }
+
+          lines = g_strsplit (contents, "\n", 0);
+          for (i = 0; lines[i]; i++)
+            {
+              const char *line = lines[i];
+              if (line[0] == '#')
+                continue;
+              if (line[0] == '\0')
+                continue;
+
+              g_debug ("Locking key %s", line);
+              g_hash_table_add (kfsb->system_locks, g_strdup (line));
+            }
+
+          g_strfreev (lines);
+          g_free (contents);
+
+          g_free (path);
+          g_object_unref (info);
+        }
+
+      g_object_unref (enumerator);
+    }
+
+  g_object_unref (lock_file);
+  g_object_unref (file);
+}
+
 static void
 g_keyfile_settings_backend_constructed (GObject *object)
 {
@@ -602,6 +728,8 @@ g_keyfile_settings_backend_constructed (GObject *object)
 
   g_keyfile_settings_backend_keyfile_writable (kfsb);
   g_keyfile_settings_backend_keyfile_reload (kfsb);
+
+  load_system_settings (kfsb);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]