Merge lp:~donadigo/switchboard-plug-parental-controls/fix-home-config into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

[Adam Bieńkowski]

* Save config file to share/pantheon-parental-controls instead of each home folder
* Rename "Vars" to "Constants"
* Do not block apps when not active
* Restarting configuration is now more unified in the code

This branch fixes an issue where created user that was never logged in (and his home directory wasn't initiated) the config file wouldn't be created and the config wouldn't be applied. We now have a config file in data/ folder which will be installed in cmake_install_prefix/share/pantheon-parental-controls. This config provides brief description of what it does and how to use it.

There are also some minor changes like renaming "Vars" to "Constants" and fixing smaller bugs.

This is work for Loki Update.

[Cody Garver (codygarver)]

Needs trunk merged in and conflicts resolved.

review: Needs Fixing

[lp:~donadigo/switchboard-plug-parental-controls/fix-home-config]

230. By Adam Bieńkowski on 2016-12-09

Merge trunk; resolve conflicts; fix writing time restrictions logic to PAM configuration

[Adam Bieńkowski (donadigo)]

Branch updated.

[Felipe Escoto (philip.scott)]

Stepping to the right direction with this branch. I'm approving it so we can move on without it getting too large

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-09-21 13:11:51 +0000
+++ CMakeLists.txt	2016-12-09 17:18:29 +0000
@@ -32,6 +32,7 @@
 
 # Configure file
 configure_file (${CMAKE_SOURCE_DIR}/config.vala.cmake ${CMAKE_BINARY_DIR}/src/config.vala)
+configure_file (${CMAKE_SOURCE_DIR}/src/shared/Constants.vala.cmake ${CMAKE_SOURCE_DIR}/src/shared/Constants.vala)
 add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 
 option (ENABLE_DAEMON_STARTUP "Enable starting daemon on system startup" TRUE)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-09-09 14:51:34 +0000
+++ data/CMakeLists.txt	2016-12-09 17:18:29 +0000
@@ -1,6 +1,7 @@
 configure_file (org.pantheon.switchboard.parental-controls.policy.cmake ${CMAKE_CURRENT_BINARY_DIR}/data/org.pantheon.switchboard.parental-controls.policy)
 configure_file (org.pantheon.ParentalControls.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.ParentalControls.service)
 
+install (FILES daemon.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pantheon-parental-controls)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/data/org.pantheon.switchboard.parental-controls.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.ParentalControls.service DESTINATION share/dbus-1/system-services)
 install (FILES org.pantheon.ParentalControls.conf DESTINATION /etc/dbus-1/system.d)

=== added file 'data/daemon.conf'
--- data/daemon.conf	1970-01-01 00:00:00 +0000
+++ data/daemon.conf	2016-12-09 17:18:29 +0000
@@ -0,0 +1,13 @@
+# This is main configuration file for pantheon parental controls daemon.
+# It is used to restrict users and control whethever they can or cannot
+# access a specified service.
+#
+# a simple example of how a configuration for user "username" would look like:
+#  [username]
+#  Active=false
+#  Targets=/path/to/executable1;/path/to/executable2;
+#  BlockUrls=website1.com;website2.com
+#  Admin=false
+#
+# End of example file.
+#
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-10-25 21:35:37 +0000
+++ src/CMakeLists.txt	2016-12-09 17:18:29 +0000
@@ -22,7 +22,7 @@
     Widgets/AppsBox.vala
     Widgets/AppChooser.vala
     Widgets/WeekSpinBox.vala
-    shared/Vars.vala
+    shared/Constants.vala
     shared/Utils.vala
     shared/PAM/Token.vala
     shared/PAM/Reader.vala

=== modified file 'src/Widgets/GeneralBox.vala'
--- src/Widgets/GeneralBox.vala	2016-09-27 20:32:53 +0000
+++ src/Widgets/GeneralBox.vala	2016-12-09 17:18:29 +0000
@@ -38,7 +38,7 @@
 
         public GeneralBox (Act.User user) {
             this.user = user;
-            plank_conf_file_path = Path.build_filename (user.get_home_dir (), Vars.PLANK_CONF_DIR);
+            plank_conf_file_path = Path.build_filename (user.get_home_dir (), Constants.PLANK_CONF_DIR);
 
             dock_btn.notify["active"].connect (on_dock_btn_activate);
             print_btn.notify["active"].connect (on_print_conf_activate);
@@ -136,7 +136,7 @@
         }
 
         private void load_restrictions () {
-            var token = PAM.Reader.get_token_for_user (Vars.PAM_TIME_CONF_PATH, user.get_user_name ());
+            var token = PAM.Reader.get_token_for_user (Constants.PAM_TIME_CONF_PATH, user.get_user_name ());
             if (token == null) {
                 return;
             }
@@ -204,7 +204,7 @@
             string[] users = { user.get_user_name () };
 
             try {
-                CupsPkHelper? helper = Bus.get_proxy_sync (BusType.SYSTEM, Vars.CUPS_PK_HELPER_IFACE, "/");
+                CupsPkHelper? helper = Bus.get_proxy_sync (BusType.SYSTEM, Constants.CUPS_PK_HELPER_IFACE, "/");
                 if (helper == null) {
                     return;
                 }

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2016-08-30 17:40:51 +0000
+++ src/client/CMakeLists.txt	2016-12-09 17:18:29 +0000
@@ -9,7 +9,7 @@
 vala_precompile (VALA_C ${CLIENT_EXEC_NAME}
     Client.vala
     AppUnavailableDialog.vala
-    ${CMAKE_SOURCE_DIR}/src/shared/Vars.vala
+    ${CMAKE_SOURCE_DIR}/src/shared/Constants.vala
     ${CMAKE_SOURCE_DIR}/src/shared/Utils.vala
 PACKAGES
     posix

=== modified file 'src/daemon/CMakeLists.txt'
--- src/daemon/CMakeLists.txt	2016-08-30 17:40:51 +0000
+++ src/daemon/CMakeLists.txt	2016-12-09 17:18:29 +0000
@@ -18,7 +18,7 @@
     Interfaces.vala
     UserConfig.vala
     Server.vala
-    ${CMAKE_SOURCE_DIR}/src/shared/Vars.vala
+    ${CMAKE_SOURCE_DIR}/src/shared/Constants.vala
     ${CMAKE_SOURCE_DIR}/src/shared/Utils.vala
     ${CMAKE_SOURCE_DIR}/src/shared/PAM/Token.vala
     ${CMAKE_SOURCE_DIR}/src/shared/PAM/Reader.vala

=== modified file 'src/daemon/Daemon.vala'
--- src/daemon/Daemon.vala	2016-08-29 22:25:35 +0000
+++ src/daemon/Daemon.vala	2016-12-09 17:18:29 +0000
@@ -64,7 +64,7 @@
 
         private void on_bus_acquired (DBusConnection connection) {
             try {
-                connection.register_object (Vars.PARENTAL_CONTROLS_OBJECT_PATH, Server.get_default ());
+                connection.register_object (Constants.PARENTAL_CONTROLS_OBJECT_PATH, Server.get_default ());
             } catch (IOError e) {
                 warning ("%s\n", e.message);
             }
@@ -75,12 +75,12 @@
                 return;
             }
 
-            Bus.own_name (BusType.SYSTEM, Vars.PARENTAL_CONTROLS_IFACE, BusNameOwnerFlags.REPLACE,
+            Bus.own_name (BusType.SYSTEM, Constants.PARENTAL_CONTROLS_IFACE, BusNameOwnerFlags.REPLACE,
                           on_bus_acquired,
                           () => {},
                           on_bus_lost);
 
-            session_manager = new SessionManager ();
+            session_manager = SessionManager.get_default ();
             session_manager.start ();
         }
 

=== modified file 'src/daemon/IptablesHelper.vala'
--- src/daemon/IptablesHelper.vala	2016-08-30 17:28:55 +0000
+++ src/daemon/IptablesHelper.vala	2016-12-09 17:18:29 +0000
@@ -27,7 +27,6 @@
 
         private UserConfig config;
         private string[] current_urls;
-        private ulong changed_signal_id;
 
         public static bool get_can_start () {
             return Environment.find_program_in_path (IPTABLES_EXEC) != null;
@@ -40,18 +39,17 @@
         public void start () {
             this.current_urls = config.get_block_urls ();
             add_rules ();
-
-            changed_signal_id = config.changed.connect (() => {
-                remove_rules ();
-
-                current_urls = config.get_block_urls ();
-                add_rules ();
-            });
+        }
+
+        public void restart () {
+            remove_rules ();
+
+            current_urls = config.get_block_urls ();
+            add_rules ();            
         }
 
         public void stop () {
             remove_rules ();
-            disconnect (changed_signal_id);
         }
 
         private void add_rules () {

=== modified file 'src/daemon/ProcessWatcher.vala'
--- src/daemon/ProcessWatcher.vala	2016-10-25 21:35:37 +0000
+++ src/daemon/ProcessWatcher.vala	2016-12-09 17:18:29 +0000
@@ -42,7 +42,7 @@
         }
 
         private void handle_pid (int pid) {
-            if (config == null) {
+            if (config == null || !config.get_active ()) {
                 return;
             }
 
@@ -86,7 +86,7 @@
                         try {
                             var unix_user = new Polkit.UnixUser.for_name (config.username);
                             var result = authority.check_authorization_sync (new Polkit.UnixProcess.for_owner (client_pid, 0, unix_user.get_uid ()),
-                                                                            Vars.PARENTAL_CONTROLS_ACTION_ID,
+                                                                            Constants.PARENTAL_CONTROLS_ACTION_ID,
                                                                             null,
                                                                             Polkit.CheckAuthorizationFlags.NONE);
                             if (result.get_is_authorized ()) {
@@ -100,7 +100,7 @@
                         server.disconnect (signal_id);
                     });
 
-                    server.app_authorize (config.username, executable, Vars.PARENTAL_CONTROLS_ACTION_ID);
+                    server.app_authorize (config.username, executable, Constants.PARENTAL_CONTROLS_ACTION_ID);
                 } else {
                     server.show_app_unavailable (executable);
                 }

=== modified file 'src/daemon/Server.vala'
--- src/daemon/Server.vala	2016-10-25 21:35:37 +0000
+++ src/daemon/Server.vala	2016-12-09 17:18:29 +0000
@@ -60,6 +60,8 @@
             }
 
             UserConfig.init ();
+
+            config_changed.connect (on_config_changed);
         }
 
         [DBus (visible = false)]
@@ -69,7 +71,7 @@
         public signal void launch (string[] args);
         public signal void show_app_unavailable (string path);
         public signal void show_timeout (int hours, int minutes);
-        public signal void user_config_changed (string username);
+        public signal void config_changed ();
 
         public void end_app_authorization (BusName sender) {
             uint32 pid = get_pid_from_sender (sender);
@@ -188,6 +190,13 @@
             return config.get_admin ();
         }
 
+        private void on_config_changed () {
+            var current_handler = SessionManager.get_default ().current_handler;
+            if (current_handler != null) {
+                current_handler.update ();
+            }
+        }
+
         private void ensure_pam_lightdm_enabled () {
             string path = "/etc/pam.d/lightdm";
             
@@ -231,7 +240,7 @@
 
             try {
                 var authority = Polkit.Authority.get_sync (null);
-                var auth_result = authority.check_authorization_sync (subject, Vars.PARENTAL_CONTROLS_ACTION_ID, null, Polkit.CheckAuthorizationFlags.NONE);
+                var auth_result = authority.check_authorization_sync (subject, Constants.PARENTAL_CONTROLS_ACTION_ID, null, Polkit.CheckAuthorizationFlags.NONE);
                 return auth_result.get_is_authorized ();     
             } catch (Error e) {
                 warning (e.message);

=== modified file 'src/daemon/SessionHandler.vala'
--- src/daemon/SessionHandler.vala	2016-08-30 17:28:55 +0000
+++ src/daemon/SessionHandler.vala	2016-12-09 17:18:29 +0000
@@ -43,7 +43,7 @@
 
             iptables_helper = new IptablesHelper (config);
 
-            var token = PAM.Reader.get_token_for_user (Vars.PAM_TIME_CONF_PATH, session.name);
+            var token = PAM.Reader.get_token_for_user (Constants.PAM_TIME_CONF_PATH, session.name);
             if (token != null) {
                 timer = new Timer (token);
                 timer.terminate.connect (() => {
@@ -53,7 +53,7 @@
                         warning (e.message);
                     }                    
                 });
-            }            
+            }
         }
 
         public string get_id () {
@@ -78,6 +78,21 @@
             }
         }
 
+        public void update () {
+            if (!config.get_active ()) {
+                iptables_helper.stop ();
+                if (timer != null) {
+                    timer.stop ();
+                }
+
+                return;
+            }
+
+            if (IptablesHelper.get_can_start ()) {
+                iptables_helper.restart ();
+            }
+        }
+
         public void stop () {
             iptables_helper.stop ();
             if (timer != null) {

=== modified file 'src/daemon/SessionManager.vala'
--- src/daemon/SessionManager.vala	2016-08-30 17:28:55 +0000
+++ src/daemon/SessionManager.vala	2016-12-09 17:18:29 +0000
@@ -22,16 +22,25 @@
 
  namespace PC.Daemon {
     public class SessionManager : Object {
-        private SessionHandler? current_handler = null;
+        public SessionHandler? current_handler = null;
         private IManager? manager = null;
         private DBusConnection? conn = null;
         private ProcessWatcher pwatcher;
 
         private uint[] signal_ids;
 
+        private static SessionManager? instance = null;
+        public static SessionManager get_default () {
+            if (instance == null) {
+                instance = new SessionManager ();
+            }
+
+            return instance;
+        }
+
         public SessionManager () {
             try {
-                manager = Bus.get_proxy_sync (BusType.SYSTEM, Vars.LOGIN_IFACE, Vars.LOGIN_OBJECT_PATH);
+                manager = Bus.get_proxy_sync (BusType.SYSTEM, Constants.LOGIN_IFACE, Constants.LOGIN_OBJECT_PATH);
                 conn = Bus.get_sync (BusType.SYSTEM, null);
             } catch (IOError e) {
                 warning ("%s\n", e.message);
@@ -52,7 +61,7 @@
             try {
                 foreach (SeatStruct seat_s in manager.list_seats ()) {
                     signal_ids += conn.signal_subscribe (null,
-                                    Vars.DBUS_PROPERTIES_IFACE,
+                                    Constants.DBUS_PROPERTIES_IFACE,
                                     "PropertiesChanged",
                                     seat_s.object_path,
                                     null,
@@ -78,7 +87,7 @@
             try {
                 var structs = manager.list_sessions ();
                 foreach (SessionStruct session_s in structs) {
-                    ISession? session = Bus.get_proxy_sync (BusType.SYSTEM, Vars.LOGIN_IFACE, session_s.object_path);
+                    ISession? session = Bus.get_proxy_sync (BusType.SYSTEM, Constants.LOGIN_IFACE, session_s.object_path);
                     if (session != null && session.active) {
                         return session;
                     }
@@ -100,7 +109,7 @@
 
             if (session != null &&
                 session.name != null &&
-                !(session.name in Vars.DAEMON_IGNORED_USERS)) {
+                !(session.name in Constants.DAEMON_IGNORED_USERS)) {
                 current_handler = new SessionHandler (session);
                 current_handler.start ();
                 pwatcher.set_config (current_handler.get_config ());

=== modified file 'src/daemon/UserConfig.vala'
--- src/daemon/UserConfig.vala	2016-08-30 17:28:55 +0000
+++ src/daemon/UserConfig.vala	2016-12-09 17:18:29 +0000
@@ -23,11 +23,8 @@
 namespace PC.Daemon {
     public class UserConfig : Object {
         public string username;
-        public signal void changed ();
-
-        private KeyFile key;
-        private string config_path;
-
+
+        private static KeyFile key;
         private static List<UserConfig> config_list;
 
         public static UserConfig? get_for_username (string username, bool create) {
@@ -38,9 +35,9 @@
             }
 
             if (create) {
-                return create_for_username (username);    
-            }
-            
+                return create_for_username (username);
+            }            
+
             return null;
         }
 
@@ -51,84 +48,96 @@
         public static void init () {
             config_list = new List<UserConfig> ();
 
+            key = new KeyFile ();
+            key.set_list_separator (';');
+
+            if (!init_config_file ()) {
+                return;
+            }
+
+            try {
+                key.load_from_file (Constants.DAEMON_CONF_FILE, KeyFileFlags.KEEP_COMMENTS | KeyFileFlags.KEEP_TRANSLATIONS);
+            } catch (KeyFileError e) {
+                warning (e.message);
+            } catch (FileError e) {
+                warning (e.message);
+            }
+            
             foreach (Act.User user in Utils.get_usermanager ().list_users ()) {
-                string config_path = Utils.build_daemon_conf_path (user);
-                if (!FileUtils.test (config_path, FileTest.IS_REGULAR)) {
+                string username = user.get_user_name ();
+                if (!key.has_group (username)) {
                     continue;
                 }
 
-                var key = new KeyFile ();
-                key.set_list_separator (';');
-                try {
-                    if (!key.load_from_file (config_path, KeyFileFlags.NONE)) {
-                        continue;
-                    }
-                } catch (KeyFileError e) {
-                    warning (e.message);
-                    continue;
-                } catch (FileError e) {
-                    warning (e.message);
-                    continue;
-                }
-                
-                var user_config = new UserConfig (config_path, user.get_user_name (), key);
+                var user_config = new UserConfig (username);
                 config_list.append (user_config);
             }
         }
 
+        private static bool init_config_file () {
+            var file = File.new_for_path (Constants.DAEMON_CONF_FILE);
+            if (!file.query_exists ()) {
+                critical ("Could not found daemon config file: %s does not exist".printf (file.get_path ()));
+                return false;
+            }
+
+            try {
+                var monitor = file.monitor (FileMonitorFlags.NONE, null);
+                monitor.changed.connect ((src, dest, event) => {
+                    if (event == FileMonitorEvent.CHANGES_DONE_HINT) {
+                        foreach (UserConfig config in config_list) {
+                            config.update_key ();
+                        }
+
+                        Server.get_default ().config_changed ();
+                    }
+                });
+            } catch (Error e) {
+                warning (e.message);
+            }
+
+            return true;
+        }
+
         private static UserConfig? create_for_username (string username) {
             var user = Utils.get_usermanager ().get_user (username);
             if (user == null) {
                 return null;
             }
 
-            string config_path = Utils.build_daemon_conf_path (user);
-            var file = File.new_for_path (config_path);
-            try {
-                file.create (FileCreateFlags.PRIVATE);    
-            } catch (FileError e) {
-                warning (e.message);
-                return null;
-            } catch (Error e) {
-                warning (e.message);
-                return null;
-            }
-
-            var config = new UserConfig (config_path, username, new KeyFile ());
+            var config = new UserConfig (username);
+            config.set_active (false);
             config_list.append (config);
             return config;
         }
 
-        private UserConfig (string config_path, string username, KeyFile key) {
+        private UserConfig (string username) {
             this.username = username;
-            this.key = key;
-            this.config_path = config_path;
-            monitor_file ();
         }
 
         public void set_active (bool active) {
-            key.set_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ACTIVE, active);
+            key.set_boolean (username, Constants.DAEMON_KEY_ACTIVE, active);
             save ();
         }
 
         public void set_targets (string[] targets) {
-            key.set_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_TARGETS, targets);
+            key.set_string_list (username, Constants.DAEMON_KEY_TARGETS, targets);
             save ();
         }
 
         public void set_block_urls (string[] block_urls) {
-            key.set_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_BLOCK_URLS, block_urls);
+            key.set_string_list (username, Constants.DAEMON_KEY_BLOCK_URLS, block_urls);
             save ();
         }
 
         public void set_admin (bool admin) {
-            key.set_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ADMIN, admin);
+            key.set_boolean (username, Constants.DAEMON_KEY_ADMIN, admin);
             save ();
         }
 
         public bool get_active () {
             try {
-                return key.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ACTIVE);
+                return key.get_boolean (username, Constants.DAEMON_KEY_ACTIVE);
             } catch (KeyFileError e) {
                 warning (e.message);
             }
@@ -138,7 +147,7 @@
 
         public string[] get_targets () {
             try {            
-                return key.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_TARGETS);
+                return key.get_string_list (username, Constants.DAEMON_KEY_TARGETS);
             } catch (KeyFileError e) {
                 warning (e.message);
             }   
@@ -148,7 +157,7 @@
 
         public string[] get_block_urls () {
             try {
-                return key.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_BLOCK_URLS);
+                return key.get_string_list (username, Constants.DAEMON_KEY_BLOCK_URLS);
             } catch (KeyFileError e) {
                 warning (e.message);
             }
@@ -158,7 +167,7 @@
 
         public bool get_admin () {
             try {
-                return key.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ADMIN);
+                return key.get_boolean (username, Constants.DAEMON_KEY_ADMIN);
             } catch (KeyFileError e) {
                 warning (e.message);
             }
@@ -166,26 +175,9 @@
             return false;
         }
 
-        private void monitor_file () {
-            var file = File.new_for_path (config_path);
-            try {
-                var monitor = file.monitor (FileMonitorFlags.NONE, null);
-                monitor.changed.connect ((src, dest, event) => {
-                    if (event == FileMonitorEvent.CHANGES_DONE_HINT) {
-                        update_key ();
-
-                        Server.get_default ().user_config_changed (username);
-                        changed ();
-                    }
-                });
-            } catch (Error e) {
-                warning (e.message);
-            }
-        } 
-
-        private void update_key () {
-            try {
-                key.load_from_file (config_path, KeyFileFlags.NONE);
+        public void update_key () {
+            try {
+                key.load_from_file (Constants.DAEMON_CONF_FILE, KeyFileFlags.KEEP_COMMENTS | KeyFileFlags.KEEP_TRANSLATIONS);
             } catch (KeyFileError e) {
                 warning (e.message);
             } catch (FileError e) {
@@ -195,14 +187,13 @@
 
         private void save () {
             try {
-                key.save_to_file (config_path);
+                key.save_to_file (Constants.DAEMON_CONF_FILE);
             } catch (FileError e) {
                 warning (e.message);
                 return;
             }
 
-            Server.get_default ().user_config_changed (username);
-            changed ();
+            Server.get_default ().config_changed ();
         }
     }
 }
\ No newline at end of file

=== renamed file 'src/shared/Vars.vala' => 'src/shared/Constants.vala.cmake'
--- src/shared/Vars.vala	2016-08-29 22:25:35 +0000
+++ src/shared/Constants.vala.cmake	2016-12-09 17:18:29 +0000
@@ -20,7 +20,7 @@
  * Authored by: Adam Bieńkowski <[e-mail]>
  */
  
-namespace PC.Vars {
+namespace PC.Constants {
     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";
@@ -31,7 +31,7 @@
     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 DAEMON_CONF_DIR = "/.config/pantheon-parental-controls-daemon.conf";
+    public const string DAEMON_CONF_FILE = "@CMAKE_INSTALL_PREFIX@/share/pantheon-parental-controls/daemon.conf";
     public const string[] DAEMON_IGNORED_USERS = { "lightdm" };
     public const string DAEMON_GROUP = "PCDaemon";
     public const string DAEMON_KEY_ACTIVE = "Active";

=== modified file 'src/shared/PAM/Reader.vala'
--- src/shared/PAM/Reader.vala	2016-08-30 17:28:55 +0000
+++ src/shared/PAM/Reader.vala	2016-12-09 17:18:29 +0000
@@ -22,22 +22,15 @@
 
 namespace PC.PAM {
     public class Reader : Object {
-        public static string get_config (string contents, bool ignore_comments = true) {
-            string config = "";
+        public static string get_config (string contents, out int start_idx, out int end_idx) {
+            start_idx = contents.index_of (Constants.PAM_CONF_START);
+            end_idx = contents.index_of (Constants.PAM_CONF_END) + Constants.PAM_CONF_END.char_count ();
 
-            int start_idx = contents.index_of (Vars.PAM_CONF_START);
-            int end_idx = contents.index_of (Vars.PAM_CONF_END) + Vars.PAM_CONF_END.char_count ();
             if (start_idx == -1 || end_idx == -1) {
-                return config;
-            }
-
-            config = contents.slice (start_idx, end_idx);
-
-            if (ignore_comments) {
-                return Utils.remove_comments (config);
-            }
-
-            return config;
+                return "";
+            }
+
+            return contents.slice (start_idx, end_idx);
         }
 
         public static List<Token> get_tokens (string filename) {
@@ -49,7 +42,7 @@
                 return new List<Token> ();
             }
 
-            string config = get_config (contents);
+            string config = get_config (contents, null, null);
             return Token.parse (config);
         }
 

=== modified file 'src/shared/PAM/Writer.vala'
--- src/shared/PAM/Writer.vala	2016-08-30 17:28:55 +0000
+++ src/shared/PAM/Writer.vala	2016-12-09 17:18:29 +0000
@@ -25,7 +25,7 @@
         private string filename;
 
         public static Writer new_for_time () {
-            return new Writer (Vars.PAM_TIME_CONF_PATH);
+            return new Writer (Constants.PAM_TIME_CONF_PATH);
         }
 
         public Writer (string filename) {
@@ -33,13 +33,11 @@
         }
 
         public void add_restriction_for_user (string input, bool clean) {
+            string? clean_username = null;
             if (clean) {
                 var token = Token.parse_line (input);
                 if (token != null) {
-                    string username = token.get_user_arg0 ();
-                    if (Reader.get_token_for_user (filename, username) != null) {
-                        remove_restriction_for_user (username);
-                    }
+                    clean_username = token.get_user_arg0 ();
                 }   
             }
 
@@ -51,26 +49,32 @@
                 return;
             }
 
-            string config = Reader.get_config (contents, false);
-
-            var builder = new StringBuilder (Vars.PAM_CONF_START);
-            if (config != "") {
-                builder.append ("\n");
-                builder.append (Utils.remove_comments (config));
-            } else {
+            int start_idx;
+            int end_idx;
+            string config = Reader.get_config (contents, out start_idx, out end_idx);
+
+            if (start_idx != -1 && end_idx != -1) {
+                contents = contents.splice (start_idx - 1, end_idx);
+            }
+
+            var builder = new StringBuilder (Constants.PAM_CONF_START);
+            builder.append ("\n");
+
+            foreach (var token in Token.parse (config)) {
+                if (token.get_user_arg0 () == clean_username) {
+                    continue;
+                }
+
+                builder.append (token.to_string ());
                 builder.append ("\n");
             }
 
             builder.append (input);
             builder.append ("\n");
-            builder.append (Vars.PAM_CONF_END);
+            builder.append (Constants.PAM_CONF_END);
 
             try {
-                if (config != "") {
-                    FileUtils.set_contents (filename, contents.replace (config, builder.str));
-                } else {
-                    FileUtils.set_contents (filename, "\n%s\n%s\n".printf (contents, builder.str));
-                }
+                FileUtils.set_contents (filename, "%s\n%s".printf (contents, builder.str));
             } catch (FileError e) {
                 warning ("%s\n", e.message);
             }
@@ -85,26 +89,35 @@
                 return;
             }
 
-            string config = Reader.get_config (contents);
+            int start_idx;
+            int end_idx;
+            string config = Reader.get_config (contents, out start_idx, out end_idx);
 
-            if (config == "") {
+            if (start_idx != -1 && end_idx != -1) {
+                contents = contents.splice (start_idx - 1, end_idx);
+            } else {
                 return;
             }
 
-            string buffer = "";
+            var builder = new StringBuilder (Constants.PAM_CONF_START);
+            builder.append ("\n");
 
-            foreach (string line in config.split ("\n")) {
-                var token = Token.parse_line (line);
-                if (token != null && token.get_user_arg0 () != username) {
-                    buffer += line;
+            foreach (var token in Token.parse (config)) {
+                if (token.get_user_arg0 () == username) {
+                    continue;
                 }
+
+                builder.append (token.to_string ());
+                builder.append ("\n");
             }
 
+            builder.append (Constants.PAM_CONF_END);
+
             try {
-                FileUtils.set_contents (filename, contents.replace (config, buffer));
+                FileUtils.set_contents (filename, "%s\n%s".printf (contents, builder.str));
             } catch (FileError e) {
                 warning ("%s\n", e.message);
             }
-        }        
+        }
     }
 }
\ No newline at end of file

=== modified file 'src/shared/Utils.vala'
--- src/shared/Utils.vala	2016-10-25 21:35:37 +0000
+++ src/shared/Utils.vala	2016-12-09 17:18:29 +0000
@@ -75,7 +75,7 @@
             }
 
             try {
-                api = Bus.get_proxy_sync (BusType.SYSTEM, Vars.PARENTAL_CONTROLS_IFACE, Vars.PARENTAL_CONTROLS_OBJECT_PATH);
+                api = Bus.get_proxy_sync (BusType.SYSTEM, Constants.PARENTAL_CONTROLS_IFACE, Constants.PARENTAL_CONTROLS_OBJECT_PATH);
             } catch (Error e) {
                 critical ("%s, using dummy parental controls backend", e.message);
                 api = new DummyParentalControls ();
@@ -90,8 +90,9 @@
             }
 
             try {
+
                 var user = new Polkit.UnixUser.for_name (Environment.get_user_name ());
-                permission = new Polkit.Permission.sync (Vars.PARENTAL_CONTROLS_ACTION_ID,
+                permission = new Polkit.Permission.sync (Constants.PARENTAL_CONTROLS_ACTION_ID,
                                 new Polkit.UnixProcess.for_owner (Posix.getpid (), 0, user.get_uid ()));
                 return permission;
             } catch (Error e) {
@@ -132,9 +133,5 @@
 
             return buffer;
         }
-
-        public static string build_daemon_conf_path (Act.User user) {
-            return Path.build_filename (user.get_home_dir (), Vars.DAEMON_CONF_DIR);
-        }
     }
 }