Merge lp:~donadigo/switchboard-plug-parental-controls/update-plank-backend into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

[Adam Bieńkowski]

* Fix bug #1583221: "Update Plank settings handling".

Fixes bug #1583221: "Update Plank settings handling".

This is a rewrite of Plank backend which is controlling of whethever to lock the dock or not for current user.

[lp:~donadigo/switchboard-plug-parental-controls/update-plank-backend]

164. By Adam Bieńkowski on 2016-05-27

Remove unneded user variable

[Danielle Foré (danrabbit)]

I can't confirm that this locks the dock for another user. I can confirm that the daemon is running because website blocking is working

review: Needs Fixing

Unmerged revisions

164. By Adam Bieńkowski on 2016-05-27

Remove unneded user variable

163. By Adam Bieńkowski on 2016-05-27

Rewrite plank locking; organize constant variables

=== modified file 'src/Widgets/GeneralBox.vala'
--- src/Widgets/GeneralBox.vala	2016-05-19 18:11:33 +0000
+++ src/Widgets/GeneralBox.vala	2016-05-27 14:00:40 +0000
@@ -22,7 +22,6 @@
 
 namespace PC.Widgets {
     public class GeneralBox : Gtk.Grid {
-        private string plank_conf_file_path = "";
         private Act.User user;
         private Gtk.CheckButton dock_btn;
         private Gtk.CheckButton print_btn;
@@ -36,10 +35,8 @@
 
         public GeneralBox (Act.User user) {
             this.user = user;
-            plank_conf_file_path = Path.build_filename (user.get_home_dir (), Vars.PLANK_CONF_DIR);
 
             dock_btn.notify["active"].connect (on_dock_btn_activate);
-
             print_btn.notify["active"].connect (on_print_conf_activate);
 
             limit_switch.notify["active"].connect (on_limit_switch_changed);
@@ -51,7 +48,6 @@
             weekday_box.changed.connect (update_pam);
             weekend_box.changed.connect (update_pam);
 
-            monitor_updates ();
             update ();
             load_restrictions ();
         }
@@ -78,9 +74,9 @@
 
             limit_combobox = new Gtk.ComboBoxText ();
             limit_combobox.hexpand = true;
-            limit_combobox.append (Vars.ALL_ID, _("On weekdays and weekends"));
-            limit_combobox.append (Vars.WEEKDAYS_ID, _("Only on weekdays"));
-            limit_combobox.append (Vars.WEEKENDS_ID, _("Only on weekends"));
+            limit_combobox.append (Vars.PAM_ALL_ID, _("On weekdays and weekends"));
+            limit_combobox.append (Vars.PAM_WEEKDAYS_ID, _("Only on weekdays"));
+            limit_combobox.append (Vars.PAM_WEEKENDS_ID, _("Only on weekends"));
             limit_combobox.active_id = "all";
 
             frame = new Gtk.Frame (null);
@@ -130,7 +126,7 @@
 
                     limit_combobox.active_id = restrict.day_id;
                     switch (restrict.day_id) {
-                        case Vars.ALL_ID:
+                        case Vars.PAM_ALL_ID:
                             string from_weekday = restrict.weekday_hours.split ("-")[0];
                             string to_weekday = restrict.weekday_hours.split ("-")[1];
                             string from_weekend = restrict.weekend_hours.split ("-")[0];
@@ -142,11 +138,11 @@
                             weekend_box.set_from (from_weekend);
                             weekend_box.set_to (to_weekend);
                             break;
-                        case Vars.WEEKDAYS_ID:
+                        case Vars.PAM_WEEKDAYS_ID:
                             weekday_box.set_from (restrict.from);
                             weekday_box.set_to (restrict.to);
                             break;
-                        case Vars.WEEKENDS_ID:
+                        case Vars.PAM_WEEKENDS_ID:
                             weekend_box.set_from (restrict.from);
                             weekend_box.set_to (restrict.to);
                             break;
@@ -161,14 +157,14 @@
             string restrict = "";
             string id = limit_combobox.get_active_id ();
             switch (id) {
-                case Vars.ALL_ID:
+                case Vars.PAM_ALL_ID:
                     restrict = generate_pam_conf_restriction (id, weekday_box.get_from (), weekday_box.get_to ());
                     restrict += "|" + weekend_box.get_from () + "-" + weekend_box.get_to ();
                     break;
-                case Vars.WEEKDAYS_ID:
+                case Vars.PAM_WEEKDAYS_ID:
                     restrict = generate_pam_conf_restriction (id, weekday_box.get_from (), weekday_box.get_to ());
                     break;
-                case Vars.WEEKENDS_ID:
+                case Vars.PAM_WEEKENDS_ID:
                     restrict = generate_pam_conf_restriction (id, weekend_box.get_from (), weekend_box.get_to ());
                     break;
             }
@@ -180,13 +176,13 @@
             string retval = "*;*;";
             string days = "";
             switch (id) {
-                case Vars.ALL_ID:
+                case Vars.PAM_ALL_ID:
                     days = "Al";
                     break;
-                case Vars.WEEKDAYS_ID:
+                case Vars.PAM_WEEKDAYS_ID:
                     days = "Wk";
                     break;
-                case Vars.WEEKENDS_ID:
+                case Vars.PAM_WEEKENDS_ID:
                     days = "Wd";
                     break;
             }
@@ -195,20 +191,11 @@
             return retval;
         }
 
-        private void monitor_updates () {
-            try {
-                var monitor = File.new_for_path (plank_conf_file_path).monitor_file (FileMonitorFlags.NONE);
-                monitor.changed.connect (update);
-            } catch (IOError e) {
-                warning ("%s\n", e.message);
-            }
-        }
-
         private void update () {
             var key_file = new KeyFile ();
             try {
-                key_file.load_from_file (plank_conf_file_path, KeyFileFlags.NONE);
-                dock_btn.active = !key_file.get_boolean (Vars.PLANK_CONF_GROUP, Vars.PLANK_CONF_LOCK_ITEMS_KEY);
+                key_file.load_from_file (Utils.build_daemon_conf_path (user), KeyFileFlags.NONE);
+                dock_btn.active = !key_file.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_LOCK_PLANK_ITEMS);
             } catch (FileError e) {
                 dock_btn.active = true;
                 warning ("%s\n", e.message);
@@ -272,15 +259,15 @@
 
         private void on_limit_combobox_changed () {
             switch (limit_combobox.get_active_id ()) {
-                case Vars.ALL_ID:
+                case Vars.PAM_ALL_ID:
                     weekday_box.sensitive = true;
                     weekend_box.sensitive = true;
                     break;
-                case Vars.WEEKDAYS_ID:
+                case Vars.PAM_WEEKDAYS_ID:
                     weekday_box.sensitive = true;
                     weekend_box.sensitive = false;      
                     break;
-                case Vars.WEEKENDS_ID:
+                case Vars.PAM_WEEKENDS_ID:
                     weekday_box.sensitive = false;
                     weekend_box.sensitive = true;
                     break;                                

=== modified file 'src/cli/Application.vala'
--- src/cli/Application.vala	2016-05-18 15:29:00 +0000
+++ src/cli/Application.vala	2016-05-27 14:00:40 +0000
@@ -23,7 +23,6 @@
 namespace PC.Cli {
     public class App : Application {
         private const string TIME_CONF_FILE = "/etc/security/time.conf";
-        private string plank_conf_file_path = "";
 
         public App () {
             Object (flags: ApplicationFlags.HANDLES_COMMAND_LINE);
@@ -160,24 +159,22 @@
         }
 
         private void lock_dock_for_user (string user, bool lock) {
-            plank_conf_file_path = Path.build_filename (Utils.get_usermanager ().get_user (user).get_home_dir (), Vars.PLANK_CONF_DIR);
-            if (plank_conf_file_path != "" && File.new_for_path (plank_conf_file_path).query_exists ()) {
-                var key_file = new KeyFile ();
-                try {
-                    key_file.load_from_file (plank_conf_file_path, KeyFileFlags.KEEP_COMMENTS | KeyFileFlags.KEEP_TRANSLATIONS);
-                } catch (KeyFileError e) {
-                    warning ("%s\n", e.message);
-                } catch (FileError e) {
-                    warning ("%s\n", e.message);
-                }
-                                           
-                key_file.set_boolean (Vars.PLANK_CONF_GROUP, Vars.PLANK_CONF_LOCK_ITEMS_KEY, lock);
+            string path = Utils.build_daemon_conf_path (Utils.get_usermanager ().get_user (user));
+            var key_file = new KeyFile ();
+            try {
+                key_file.load_from_file (path, KeyFileFlags.KEEP_COMMENTS | KeyFileFlags.KEEP_TRANSLATIONS);
+            } catch (KeyFileError e) {
+                warning ("%s\n", e.message);
+            } catch (FileError e) {
+                warning ("%s\n", e.message);
+            }
+                                       
+            key_file.set_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_LOCK_PLANK_ITEMS, lock);
 
-                try {
-                    key_file.save_to_file (plank_conf_file_path);
-                } catch (FileError e) {
-                    warning ("%s\n", e.message);
-                }       
+            try {
+                key_file.save_to_file (path);
+            } catch (FileError e) {
+                warning ("%s\n", e.message);
             }
         }
 

=== modified file 'src/daemon/CMakeLists.txt'
--- src/daemon/CMakeLists.txt	2016-03-06 11:20:50 +0000
+++ src/daemon/CMakeLists.txt	2016-05-27 14:00:40 +0000
@@ -14,6 +14,7 @@
     IptablesHelper.vala
     SessionManager.vala
     SessionHandler.vala
+    PlankController.vala
     Interfaces.vala
     Server.vala
     ${CMAKE_SOURCE_DIR}/src/shared/Vars.vala

=== added file 'src/daemon/PlankController.vala'
--- src/daemon/PlankController.vala	1970-01-01 00:00:00 +0000
+++ src/daemon/PlankController.vala	2016-05-27 14:00:40 +0000
@@ -0,0 +1,80 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2016 Adam Bieńkowski (https://launchpad.net/switchboard-plug-parental-controls)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+namespace PC.Daemon {
+    public class PlankController : Object {
+        private bool lock_dock;
+        private HashTable<ulong, Settings> settings_table; 
+
+        public PlankController (bool _lock_dock) {
+            lock_dock = _lock_dock;
+            settings_table = new HashTable<ulong, Settings> (null, null);
+        }
+
+        public void start () {
+            if (!lock_dock) {
+                return;
+            }
+
+            string[]? docks = get_docks ();
+
+            var schema = SettingsSchemaSource.get_default ().lookup (Vars.PLANK_SETTINGS_SCHEMA_ID, true);
+            if (schema == null || docks == null) {
+                return;
+            }
+
+            foreach (string dock in docks) {
+                var dock_settings = new Settings.full (schema, null, Vars.PLANK_SETTINGS_PATH.printf (dock));
+                dock_settings.set_boolean (Vars.PLANK_SETTINGS_LOCK_ITEMS_KEY, lock_dock);
+                settings_table.insert (dock_settings.changed.connect (settings_changed), dock_settings);
+            }
+
+        }
+
+        public void stop () {
+            if (!lock_dock || settings_table.length == 0) {
+                return;
+            }
+
+            settings_table.foreach ((handler_id, settings) => {
+                settings.disconnect (handler_id);
+                settings.reset (Vars.PLANK_SETTINGS_LOCK_ITEMS_KEY);
+            });
+        }
+
+        private void settings_changed (Settings dock_settings, string key) {
+            if (key == Vars.PLANK_SETTINGS_LOCK_ITEMS_KEY
+                && dock_settings.get_boolean (Vars.PLANK_SETTINGS_LOCK_ITEMS_KEY) != lock_dock) {
+                dock_settings.set_boolean (Vars.PLANK_SETTINGS_LOCK_ITEMS_KEY, lock_dock);
+            }
+        }
+
+        private string[]? get_docks () {
+            var plank_settings = new Settings ("net.launchpad.plank");
+            if (plank_settings != null) {
+                return plank_settings.get_strv (Vars.PLANK_SETTINGS_ENABLED_DOCKS_KEY);
+            }            
+
+            return null;
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/daemon/SessionHandler.vala'
--- src/daemon/SessionHandler.vala	2016-05-18 14:52:41 +0000
+++ src/daemon/SessionHandler.vala	2016-05-27 14:00:40 +0000
@@ -27,6 +27,7 @@
 
         public Core core;
         public IptablesHelper iptables_helper;
+        public PlankController plank_controller;
 
         private ISession session;
         private Server server;
@@ -49,13 +50,16 @@
             }
 
             string[] block_urls = {};
+            bool lock_dock = false;
             try {
                 block_urls = core.key_file.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_BLOCK_URLS);
+                lock_dock = core.key_file.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_LOCK_PLANK_ITEMS);
             } catch (KeyFileError e) {
                 warning ("%s\n", e.message);
             }
 
             iptables_helper = new IptablesHelper (block_urls);
+            plank_controller = new PlankController (lock_dock);
         }
 
         public void start () {
@@ -71,6 +75,8 @@
                 iptables_helper.add_rules ();
             }
 
+            plank_controller.start ();
+
             var restricts = PAMControl.get_all_restrictions ();
             foreach (var restrict in restricts) {
                 if (restrict.user == Utils.get_current_user ().get_user_name ()) {
@@ -81,7 +87,7 @@
                     }
 
                     switch (restrict.day_id) {
-                        case Vars.WEEKDAYS_ID:
+                        case Vars.PAM_WEEKDAYS_ID:
                             if (current_date.get_day_of_week () < 6) {
                                 int estimated_time = int.parse (restrict.to);
                                 var span = get_difference_span (estimated_time, current_date);
@@ -89,7 +95,7 @@
                             }
 
                             break;
-                        case Vars.WEEKENDS_ID:
+                        case Vars.PAM_WEEKENDS_ID:
                             if (current_date.get_day_of_week () >= 6) {
                                 int estimated_time = int.parse (restrict.to);
                                 var span = get_difference_span (estimated_time, current_date);
@@ -97,7 +103,7 @@
                             }
 
                             break;
-                        case Vars.ALL_ID:
+                        case Vars.PAM_ALL_ID:
                             int estimated_time = 2400;
                             if (current_date.get_day_of_week () < 6) {
                                 estimated_time = int.parse (restrict.weekday_hours.split ("-")[1]);
@@ -124,6 +130,7 @@
         public void stop () {
             core.stop ();
             iptables_helper.reset ();
+            plank_controller.stop ();
         }
 
         private TimeSpan get_difference_span (int estimated_time, DateTime current_date) {

=== modified file 'src/shared/Vars.vala'
--- src/shared/Vars.vala	2016-05-20 21:19:09 +0000
+++ src/shared/Vars.vala	2016-05-27 14:00:40 +0000
@@ -24,12 +24,16 @@
     public const string LOGIN_IFACE = "org.freedesktop.login1";
     public const string LOGIN_OBJECT_PATH = "/org/freedesktop/login1";
     public const string DBUS_PROPERTIES_IFACE = "org.freedesktop.DBus.Properties";
+
     public const string PARENTAL_CONTROLS_IFACE = "org.pantheon.ParentalControls";
     public const string PARENTAL_CONTROLS_OBJECT_PATH = "/org/pantheon/ParentalControls";
     public const string PARENTAL_CONTROLS_ACTION_ID = "org.pantheon.switchboard.parental-controls.administration";
-    public const string PLANK_CONF_DIR = "/.config/plank/dock1/settings";
-    public const string PLANK_CONF_GROUP = "PlankDockPreferences";
-    public const string PLANK_CONF_LOCK_ITEMS_KEY = "LockItems";
+
+    public const string PLANK_SETTINGS_SCHEMA_ID = "net.launchpad.plank.dock.settings";
+    public const string PLANK_SETTINGS_PATH = "/net/launchpad/plank/docks/%s/";
+    public const string PLANK_SETTINGS_LOCK_ITEMS_KEY = "lock-items";
+    public const string PLANK_SETTINGS_ENABLED_DOCKS_KEY = "enabled-docks";
+
     public const string DAEMON_CONF_DIR = "/.config/pantheon-parental-controls-daemon.conf";
     public const string[] DAEMON_IGNORED_USERS = { "lightdm" };
     public const string DAEMON_GROUP = "PCDaemon";
@@ -37,10 +41,12 @@
     public const string DAEMON_KEY_TARGETS = "Targets";
     public const string DAEMON_KEY_ADMIN = "Admin";
     public const string DAEMON_KEY_BLOCK_URLS = "BlockUrls";
+    public const string DAEMON_KEY_LOCK_PLANK_ITEMS = "LockPlankItems";
+
     public const string PAM_CONF_START = "## PANTHEON_PARENTAL_CONTROLS_START";
     public const string PAM_CONF_END = "## PANTHEON_PARENTAL_CONTROLS_END";
     public const string PAM_CONF_REGEX = PAM_CONF_START + "|" + PAM_CONF_END;
-    public const string ALL_ID = "all";
-    public const string WEEKDAYS_ID = "weekdays";
-    public const string WEEKENDS_ID = "weekends";
+    public const string PAM_ALL_ID = "all";
+    public const string PAM_WEEKDAYS_ID = "weekdays";
+    public const string PAM_WEEKENDS_ID = "weekends";
 }
\ No newline at end of file