Merge lp:~donadigo/switchboard-plug-parental-controls/merge-cli-daemon into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

[Adam Bieńkowski]

* Merge CLI functionalities with daemon
* Remove unneded code
* Rework PAM time module parsing
* Use more native objects like Resolver to resolve addresses
* Expose Get and Set methods over DBus for easier access
* Code cleanup and rework
* Split big classes onto smaller ones for better code understanding

This branch is an update for Loki stable or either Loki update. It reworks how the daemon and removes the unneded code, makes it a lot easier to read and understand. It does not introduce any new features or string replacements over trunk.

The command line utility is now completely removed. It's function is now built-in to the daemon, through a DBus server. We now have different classes for parsing PAM time module which use native string utilities unlike the old parsing methods. The PAM timer logic (to show a timeout to the user) was moved into a Timer class which is also much simpler than the previous handling of this feature. There is also UserConfig class which is a representation of a key file in ~/.config/pantheon-parental-controls-daemon.conf, it can get and set the properties of it live, that means that changing something in the UI will update the daemon to the new properties.

All Get () methods of the daemon are accessible to the normal user (for displaying them in the UI without authentication) and all Set () methods need authentication to be done before calling them.

[lp:~donadigo/switchboard-plug-parental-controls/merge-cli-daemon]

233. By Adam Bieńkowski on 2016-08-30

Remove C debug prints

234. By Adam Bieńkowski on 2016-08-30

Moved set active contents of AppsBox to ControlPage

[Felipe Escoto (philip.scott)]

review: Approve

=== modified file 'lib/exec-monitor.c'
--- lib/exec-monitor.c	2016-05-19 19:47:38 +0000
+++ lib/exec-monitor.c	2016-08-30 20:17:54 +0000
@@ -110,12 +110,12 @@
 
     iface = EXEC_MONITOR_GET_IFACE (self);
     iface->monitor_events = FALSE;
+    close (iface->sk_nl);
 }
 
 void
 exec_monitor_start_internal (ExecMonitor *self)
 {
-    int sk_nl;
     int err;
     struct sockaddr_nl my_nla, kern_nla, from_nla;
     socklen_t from_nla_len;
@@ -132,8 +132,8 @@
     ExecMonitorInterface *iface;
     iface = EXEC_MONITOR_GET_IFACE (self);
 
-    sk_nl = socket (PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
-    if (sk_nl == -1) {
+    iface->sk_nl = socket (PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
+    if (iface->sk_nl == -1) {
         return;
     }
 
@@ -145,7 +145,7 @@
     kern_nla.nl_groups = CN_IDX_PROC;
     kern_nla.nl_pid = 1;
 
-    err = bind (sk_nl, (struct sockaddr *)&my_nla, sizeof (my_nla));
+    err = bind (iface->sk_nl, (struct sockaddr *)&my_nla, sizeof (my_nla));
     if (err == -1) {
         return;
     }
@@ -169,7 +169,7 @@
     cn_hdr->ack = 0;
     cn_hdr->len = sizeof (enum proc_cn_mcast_op);
 
-    if (send (sk_nl, nl_hdr, nl_hdr->nlmsg_len, 0) != nl_hdr->nlmsg_len) {
+    if (send (iface->sk_nl, nl_hdr, nl_hdr->nlmsg_len, 0) != nl_hdr->nlmsg_len) {
         return;
     }
 
@@ -182,7 +182,7 @@
         struct nlmsghdr *nlh = (struct nlmsghdr*)buff;
         memcpy (&from_nla, &kern_nla, sizeof (from_nla));
 
-        recv_len = recvfrom (sk_nl, buff, BUFF_SIZE, 0,
+        recv_len = recvfrom (iface->sk_nl, buff, BUFF_SIZE, 0,
                 (struct sockaddr*)&from_nla, &from_nla_len);
         if (from_nla.nl_pid != 0) {
             continue;

=== modified file 'lib/exec-monitor.h'
--- lib/exec-monitor.h	2016-02-21 18:52:25 +0000
+++ lib/exec-monitor.h	2016-08-30 20:17:54 +0000
@@ -42,6 +42,7 @@
 {
   GTypeInterface parent_iface;
   gboolean monitor_events;
+  int sk_nl;
 
   void (* handle_pid)   (ExecMonitor *exec_monitor,
                         gint pid);

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-02-25 18:47:22 +0000
+++ src/CMakeLists.txt	2016-08-30 20:17:54 +0000
@@ -23,8 +23,10 @@
     Widgets/AppChooser.vala
     Widgets/WeekSpinBox.vala
     shared/Vars.vala
-    shared/PAMControl.vala
     shared/Utils.vala
+    shared/PAM/Token.vala
+    shared/PAM/Reader.vala
+    shared/PAM/Writer.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     gtk+-3.0
@@ -38,7 +40,6 @@
     --thread
 )
 
-add_subdirectory (cli)
 add_subdirectory (client)
 add_subdirectory (daemon)
 

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-06-16 20:22:58 +0000
+++ src/Plug.vala	2016-08-30 20:17:54 +0000
@@ -35,7 +35,6 @@
         private Act.UserManager usermanager;
 
         public MainBox () {
-            Utils.set_user_name (Environment.get_user_name ());
             usermanager = Utils.get_usermanager ();
 
             stack = new Gtk.Stack ();

=== modified file 'src/Widgets/AppsBox.vala'
--- src/Widgets/AppsBox.vala	2016-05-19 18:58:09 +0000
+++ src/Widgets/AppsBox.vala	2016-08-30 20:17:54 +0000
@@ -22,12 +22,6 @@
 
 namespace PC.Widgets {
     public class AppsBox : Gtk.Grid {
-        public signal void update_key_file ();
-
-        public string[] targets = {};
-        public bool admin = false;
-        public bool daemon_active = false;
-
         private List<AppEntry> entries;
         private Act.User user;
 
@@ -37,7 +31,6 @@
         private Gtk.Button remove_button;
         private Gtk.Button clear_button;
 
-
         protected class AppEntry : Gtk.ListBoxRow {
             public signal void deleted ();
 
@@ -101,7 +94,7 @@
             header_label.get_style_context ().add_class ("h4");
 
             list_box = new Gtk.ListBox ();
-            list_box.row_selected.connect (on_changed);
+            list_box.row_selected.connect (update_sensitivity);
             scrolled.add (list_box);
 
             var add_button = new Gtk.Button.from_icon_name ("list-add-symbolic", Gtk.IconSize.MENU);
@@ -142,25 +135,16 @@
 
             admin_switch_btn = new Gtk.Switch ();
             admin_switch_btn.halign = Gtk.Align.START;
-            admin_switch_btn.notify["active"].connect (on_changed);
+            admin_switch_btn.notify["active"].connect (update_admin);
 
             attach (frame, 0, 0, 2, 1);
             attach (admin_label, 0, 1, 1, 1);
             attach (admin_switch_btn, 1, 1, 1, 1);
 
-            load_existing ();
+            load_existing.begin ();
             show_all ();
         }
 
-        public bool get_active () {
-            return daemon_active;
-        } 
-
-        public void set_active (bool active) {
-            daemon_active = active;
-            on_changed ();
-        }
-
         private void on_add_button_clicked () {
             apps_popover.show_all ();
         }
@@ -180,15 +164,17 @@
         }
 
         private void load_info (AppInfo info) {
-            if (!get_info_loaded (info)) {
-                var row = new AppEntry (info);
-                row.deleted.connect (on_deleted);
-
-                entries.append (row);
-                list_box.add (row);
-                list_box.show_all ();
-                on_changed ();
+            if (get_info_loaded (info)) {
+                return;
             }
+
+            var row = new AppEntry (info);
+            row.deleted.connect (on_deleted);
+
+            entries.append (row);
+            list_box.add (row);
+            list_box.show_all ();
+            update_targets ();
         }
 
         private bool get_info_loaded (AppInfo info) {
@@ -204,39 +190,50 @@
         private void on_deleted (AppEntry row) {
             entries.remove (row);
             row.destroy ();
-            on_changed ();
-        }
-
-        private void on_changed () {
+            update_targets ();
+        }
+
+        private void update_admin () {
+            update_sensitivity ();
+
+            if (Utils.get_permission ().get_allowed ()) {
+                Utils.get_api ().set_user_daemon_admin.begin (user.get_user_name (), admin_switch_btn.get_active ());
+            }
+        }
+
+        private void update_targets () {
+            update_sensitivity ();
+
+            if (!Utils.get_permission ().get_allowed ()) {
+                return;
+            }
+
+            string[] targets = {};
+            foreach (var entry in entries) {
+                targets += Environment.find_program_in_path (entry.get_executable ());
+            }            
+            
+            Utils.get_api ().set_user_daemon_targets.begin (user.get_user_name (), targets); 
+        }
+
+        private void update_sensitivity () {
             remove_button.sensitive = (list_box.get_selected_row () != null);
             clear_button.sensitive = (entries.length () > 0);
-
-            string[] _targets = {};
-            foreach (var entry in entries) {
-                _targets += Environment.find_program_in_path (entry.get_executable ());
-            }
-
-            admin = admin_switch_btn.get_active ();
-            targets = _targets;
-            update_key_file ();
         }
 
-        private void load_existing () {
-            var key_file = new KeyFile ();
+        private async void load_existing () {
             try {
-                key_file.load_from_file (Utils.build_daemon_conf_path (user), 0);
-                string[] _targets = key_file.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_TARGETS);
-                daemon_active = key_file.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ACTIVE);
+                string[] targets = yield Utils.get_api ().get_user_daemon_targets (user.get_user_name ());
+                bool admin = yield Utils.get_api ().get_user_daemon_admin (user.get_user_name ());
+                admin_switch_btn.set_active (admin);
+
                 foreach (var info in AppInfo.get_all ()) {
-                    if (info.should_show ()
-                        && Environment.find_program_in_path (info.get_executable ()) in _targets) {
+                    if (info.should_show () && Environment.find_program_in_path (info.get_executable ()) in targets) {
                         load_info (info);
                     }
                 }
-            } catch (KeyFileError e) {
-                warning ("%s\n", e.message);
-            } catch (FileError e) {
-                warning ("%s\n", e.message);
+            } catch (Error e) {
+                warning (e.message);
             }
         }
     }

=== modified file 'src/Widgets/ControlPage.vala'
--- src/Widgets/ControlPage.vala	2016-05-20 13:35:36 +0000
+++ src/Widgets/ControlPage.vala	2016-08-30 20:17:54 +0000
@@ -29,25 +29,6 @@
         private AppsBox apps_box;
         private KeyFile key_file;
 
-        public bool active {
-            get {
-                return apps_box.get_active ();
-            }
-            set {
-                apps_box.set_active (value);
-                if (Utils.get_permission ().get_allowed ()) {
-                    if (value) {
-                        general_box.refresh ();
-                        Utils.call_cli ({"--user", user.get_user_name (), "--enable-restrict"});
-                    } else {
-                        general_box.set_lock_dock_active (false);
-                        general_box.set_printer_active (true);                    
-                        Utils.call_cli ({"--user", user.get_user_name (), "--disable-restrict"});
-                    }
-                }            
-            }
-        }
-
         public ControlPage (Act.User user) {
             this.user = user;
 
@@ -64,11 +45,9 @@
 
             internet_box = new InternetBox (user);
             internet_box.expand = true;
-            internet_box.update_key_file.connect (on_update_key_file);
 
             apps_box = new AppsBox (user);
             apps_box.expand = true;
-            apps_box.update_key_file.connect (on_update_key_file);
 
             stack = new Gtk.Stack ();
             stack.add_titled (general_box, "general", _("General"));
@@ -87,24 +66,35 @@
             show_all ();
         }
 
+        public void set_active (bool active) {
+            if (Utils.get_permission ().get_allowed ()) {
+                Utils.get_api ().set_user_daemon_active.begin (user.get_user_name (), active);
+                if (active) {
+                    general_box.refresh ();
+                    general_box.update_pam ();
+                } else {
+                    general_box.set_lock_dock_active (false);
+                    general_box.set_printer_active (true);
+                    Utils.get_api ().remove_restriction_for_user.begin (user.get_user_name ());
+                }
+            }  
+        }
+
+        public async bool get_active () {
+            try {
+                return yield Utils.get_api ().get_user_daemon_active (user.get_user_name ());    
+            } catch (IOError e) {
+                warning (e.message);
+            }
+            
+            return false;
+        } 
+
         private void update_view_state () {
             bool allowed = Utils.get_permission ().get_allowed ();
             general_box.sensitive = allowed;
             internet_box.sensitive = allowed;
             apps_box.sensitive = allowed;
         }
-
-        private void on_update_key_file () {
-            if (!Utils.get_permission ().get_allowed ()) {
-                return;
-            }
-
-            key_file.set_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ACTIVE, apps_box.daemon_active);
-            key_file.set_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_TARGETS, apps_box.targets);
-            key_file.set_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ADMIN, apps_box.admin);
-            key_file.set_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_BLOCK_URLS, internet_box.urls);
-
-            Utils.call_cli ({ "--set-contents", key_file.to_data (), "--file", Utils.build_daemon_conf_path (user) });
-        }
     }
 }

=== modified file 'src/Widgets/GeneralBox.vala'
--- src/Widgets/GeneralBox.vala	2016-07-27 16:14:53 +0000
+++ src/Widgets/GeneralBox.vala	2016-08-30 20:17:54 +0000
@@ -50,8 +50,6 @@
             weekday_box.changed.connect (update_pam);
             weekend_box.changed.connect (update_pam);
 
-            monitor_updates ();
-            update ();
             load_restrictions ();
         }
 
@@ -89,10 +87,10 @@
 
             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.active_id = "all";
+            limit_combobox.append (PAM.DayType.WEEKDAY.to_string () + PAM.DayType.WEEKEND.to_string (), _("On weekdays and weekends"));
+            limit_combobox.append (PAM.DayType.WEEKDAY.to_string (), _("Only on weekdays"));
+            limit_combobox.append (PAM.DayType.WEEKEND.to_string (), _("Only on weekends"));
+            limit_combobox.active = 0;
 
             frame = new Gtk.Frame (null);
             frame.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
@@ -134,104 +132,54 @@
         }
 
         private void load_restrictions () {
-            var restricts = PAMControl.get_all_restrictions ();
-            foreach (var restrict in restricts) {
-                if (restrict.user == user.get_user_name ()) {
-                    limit_switch.active = true;
-
-                    limit_combobox.active_id = restrict.day_id;
-                    switch (restrict.day_id) {
-                        case Vars.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];
-                            string to_weekend = restrict.weekend_hours.split ("-")[1];
-
-                            weekday_box.set_from (from_weekday);
-                            weekday_box.set_to (to_weekday);
-
-                            weekend_box.set_from (from_weekend);
-                            weekend_box.set_to (to_weekend);
-                            break;
-                        case Vars.WEEKDAYS_ID:
-                            weekday_box.set_from (restrict.from);
-                            weekday_box.set_to (restrict.to);
-                            break;
-                        case Vars.WEEKENDS_ID:
-                            weekend_box.set_from (restrict.from);
-                            weekend_box.set_to (restrict.to);
-                            break;
-                        default:
-                            break;
-                    }
+            var token = PAM.Reader.get_token_for_user (Vars.PAM_TIME_CONF_PATH, user.get_user_name ());
+            if (token == null) {
+                return;
+            }
+
+            limit_switch.active = true;
+
+            string[] ids = {};
+            foreach (PAM.TimeInfo info in token.get_times_info ()) {
+                ids += info.day_type.to_string ();
+                switch (info.day_type) {
+                    case PAM.DayType.WEEKDAY:
+                        weekday_box.set_from (info.from);
+                        weekday_box.set_to (info.to);
+                        break;
+                    case PAM.DayType.WEEKEND:
+                        weekend_box.set_from (info.from);
+                        weekend_box.set_to (info.to);
+                        break;
+                    default:
+                        break;
                 }
             }
+
+            if (ids.length > 0) {
+                limit_combobox.active_id = string.joinv ("|", ids);    
+            }
         }
 
-        private void update_pam () {
-            string restrict = "";
+        public void update_pam () {
+            if (!Utils.get_permission ().get_allowed ()) {
+                return;
+            }
+
+            string[] times = {};
+            string[] users = { user.get_user_name () };
             string id = limit_combobox.get_active_id ();
-            switch (id) {
-                case Vars.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:
-                    restrict = generate_pam_conf_restriction (id, weekday_box.get_from (), weekday_box.get_to ());
-                    break;
-                case Vars.WEEKENDS_ID:
-                    restrict = generate_pam_conf_restriction (id, weekend_box.get_from (), weekend_box.get_to ());
-                    break;
-            }
-
-            PAMControl.try_add_restrict_line (user.get_user_name (), restrict);
-        }
-
-        private string generate_pam_conf_restriction (string id, string from, string to) {
-            string retval = "*;*;";
-            string days = "";
-            switch (id) {
-                case Vars.ALL_ID:
-                    days = "Al";
-                    break;
-                case Vars.WEEKDAYS_ID:
-                    days = "Wk";
-                    break;
-                case Vars.WEEKENDS_ID:
-                    days = "Wd";
-                    break;
-            }
-
-            retval += user.get_user_name () + ";" + days + from + "-" + to;
-            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);
-            } catch (FileError e) {
-                dock_btn.active = true;
-                warning ("%s\n", e.message);
-            } catch (Error e) {
-                dock_btn.active = true;
-                warning ("%s\n", e.message);
-            }
-
-            /* TODO: Get denied users for printing configuration */
-
-            /* For now, we assume that printing is enabled */
-            print_btn.active = true;
+
+            if (PAM.DayType.WEEKDAY.to_string () in id) {
+                times += PAM.DayType.WEEKDAY.to_string () + weekday_box.get_from () + "-" + weekday_box.get_to ();
+            }
+
+            if (PAM.DayType.WEEKEND.to_string () in id) {
+                times += PAM.DayType.WEEKEND.to_string () + weekend_box.get_from () + "-" + weekend_box.get_to ();
+            }
+
+            string input = PAM.Token.construct_pam_restriction_simple (users, times);
+            Utils.get_api ().add_restriction_for_user.begin (input, true);
         }
 
         private void on_dock_btn_activate () {
@@ -240,7 +188,7 @@
 
         public void set_lock_dock_active (bool active) {
             if (Utils.get_permission ().get_allowed ()) {
-                Utils.call_cli ({"--user", user.get_user_name (), "--lock-dock", active.to_string ()});
+                Utils.get_api ().lock_dock_icons_for_user.begin (user.get_user_name (), active);
             }
         }
 
@@ -272,25 +220,23 @@
         private void on_limit_switch_changed () {
             if (limit_switch.get_active ()) {
                 update_pam ();
-            } else {
-                PAMControl.try_remove_user_restrict (user.get_user_name ());
+            } else if (Utils.get_permission ().get_allowed ()) {
+                Utils.get_api ().remove_restriction_for_user.begin (user.get_user_name ());
             }
         }
 
         private void on_limit_combobox_changed () {
-            switch (limit_combobox.get_active_id ()) {
-                case Vars.ALL_ID:
-                    weekday_box.sensitive = true;
-                    weekend_box.sensitive = true;
-                    break;
-                case Vars.WEEKDAYS_ID:
-                    weekday_box.sensitive = true;
-                    weekend_box.sensitive = false;      
-                    break;
-                case Vars.WEEKENDS_ID:
-                    weekday_box.sensitive = false;
-                    weekend_box.sensitive = true;
-                    break;                                
+            string id = limit_combobox.get_active_id ();
+
+            if (PAM.DayType.WEEKDAY.to_string () in id && PAM.DayType.WEEKEND.to_string () in id) {
+                weekday_box.sensitive = true;
+                weekend_box.sensitive = true;
+            } else if (PAM.DayType.WEEKDAY.to_string () in id) {
+                weekday_box.sensitive = true;
+                weekend_box.sensitive = false;
+            } else if (PAM.DayType.WEEKEND.to_string () in id) {
+                weekday_box.sensitive = false;
+                weekend_box.sensitive = true;
             }
 
             update_pam ();

=== modified file 'src/Widgets/InternetBox.vala'
--- src/Widgets/InternetBox.vala	2016-05-19 18:58:09 +0000
+++ src/Widgets/InternetBox.vala	2016-08-30 20:17:54 +0000
@@ -22,7 +22,6 @@
 
 namespace PC.Widgets {
     public class InternetBox : Gtk.Grid {
-        public signal void update_key_file ();
         public string[] urls;
 
         private const string URL_REGEX_RULE = "[-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.[a-z]{2,4}\\b([-a-zA-Z0-9@:%_\\+.~#?&//=]*)";
@@ -118,16 +117,14 @@
             frame.add (main_box);
 
             add (frame);
-            load_existing ();
+            load_existing.begin ();
             show_all ();
         }
 
-        private void load_existing () {
-            var key_file = new KeyFile ();
+        private async void load_existing () {
             try {
-                key_file.load_from_file (Utils.build_daemon_conf_path (user), 0);
-                urls = key_file.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_BLOCK_URLS);
-                foreach (string url in urls) {
+                string[] block_urls = yield Utils.get_api ().get_user_daemon_block_urls (user.get_user_name ());
+                foreach (string url in block_urls) {
                     add_entry (new UrlEntry (url));
                 }
             } catch (Error e) {
@@ -135,14 +132,17 @@
             }         
         }
 
-        private void update () {
-            string[] _urls = {};
+        private void update_block_urls () {
+            if (!Utils.get_permission ().get_allowed ()) {
+                return;
+            }
+
+            string[] block_urls = {};
             foreach (var url_entry in url_list) {
-                _urls += url_entry.get_url ();
+                block_urls += url_entry.get_url ();
             }
 
-            urls = _urls;
-            update_key_file ();
+            Utils.get_api ().set_user_daemon_block_urls.begin (user.get_user_name (), block_urls);
         }
 
         private void on_entry_changed () {
@@ -173,7 +173,7 @@
             add_entry (url_entry);
 
             entry.text = "";
-            update ();
+            update_block_urls ();
         }
 
         private void add_entry (UrlEntry url_entry) {
@@ -186,7 +186,7 @@
         private void on_url_entry_deleted (UrlEntry url_entry) {
             url_list.remove (url_entry);
             list_box.remove (url_entry);
-            update ();
+            update_block_urls ();
         }
     }
 }

=== modified file 'src/Widgets/UserItem.vala'
--- src/Widgets/UserItem.vala	2016-05-20 21:18:29 +0000
+++ src/Widgets/UserItem.vala	2016-08-30 20:17:54 +0000
@@ -64,7 +64,10 @@
             grid.attach (username_label, 1, 1, 1, 1); 
             grid.attach (master_switch, 2, 0, 1, 2);  
 
-            master_switch.bind_property ("active", page, "active", BindingFlags.DEFAULT);
+            master_switch.notify["active"].connect (() => {
+                page.set_active (master_switch.get_active ());
+            });
+
             master_switch.bind_property ("active", page.stack, "sensitive", BindingFlags.SYNC_CREATE);
 
             Utils.get_permission ().notify["allowed"].connect (update_view);
@@ -75,7 +78,10 @@
         }
 
         public void update_view () {
-            master_switch.active = page.active;
+            page.get_active.begin ((obj, res) => {
+                master_switch.active = page.get_active.end (res);
+            });
+
             master_switch.sensitive = Utils.get_permission ().get_allowed ();
 
             try {

=== modified file 'src/Widgets/WeekSpinBox.vala'
--- src/Widgets/WeekSpinBox.vala	2016-05-20 21:48:27 +0000
+++ src/Widgets/WeekSpinBox.vala	2016-08-30 20:17:54 +0000
@@ -32,14 +32,14 @@
             spacing = 12;
 
             picker_from = new Granite.Widgets.TimePicker ();
+            picker_from.time_changed.connect (() => changed ());
+
             picker_to = new Granite.Widgets.TimePicker ();
+            picker_to.time_changed.connect (() => changed ());
 
             var label = new Gtk.Label (title);
             label.get_style_context ().add_class ("h4");
 
-            picker_from.time_changed.connect (_changed);
-            picker_to.time_changed.connect (_changed);
-
             add (label);
             add (new Gtk.Label (_("From:")));
             add (picker_from);
@@ -59,27 +59,21 @@
         }
 
         public void set_from (string from) {
-            char[] data = from.to_utf8 ();
-            string hours = data[0].to_string () + data[1].to_string ();
-            string minutes = data[2].to_string () + data[3].to_string ();
+            string hours = from.slice (0, 2);
+            string minutes = from.substring (2);
 
             var time = new DateTime.local (new DateTime.now_local ().get_year (), 1, 1, int.parse (hours), int.parse (minutes), 0);
             picker_from.time = time;
         }
 
         public void set_to (string to) {
-            char[] data = to.to_utf8 ();
-            string hours = data[0].to_string () + data[1].to_string ();
-            string minutes = data[2].to_string () + data[3].to_string ();
+            string hours = to.slice (0, 2);
+            string minutes = to.substring (2);
 
             var time = new DateTime.local (new DateTime.now_local ().get_year (), 1, 1, int.parse (hours), int.parse (minutes), 0);
             picker_to.time = time;
         }
 
-        private void _changed () {
-            changed ();
-        }
-
         private string format_time_string (int val) {
             if (val < 10) {
                 return "0" + val.to_string ();

=== removed directory 'src/cli'
=== removed file 'src/cli/Application.vala'
--- src/cli/Application.vala	2016-05-18 15:29:00 +0000
+++ src/cli/Application.vala	1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/*-
- * Copyright (c) 2015 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.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);
-        }
-        
-        public static int main (string[] args) {
-            var app = new App ();
-            return app.run (args);
-        }
-
-        private int _command_line (ApplicationCommandLine command_line) {
-            string? user = null;
-            string? restrict_pam_line = null;
-            string? lock_dock = null;
-            string? set_contents = null;
-            string? file = null;
-
-            bool remove_restrict = false;
-            bool enable_restrict = false;
-            bool disable_restrict = false;
-
-            var options = new OptionEntry[9];
-            options[0] = { "user", 0, 0, OptionArg.STRING, ref user, "Use specific user", null };
-            options[1] = { "lock-dock", 0, 0, OptionArg.STRING, ref lock_dock, "Lock the given user dock", null };
-            options[2] = { "restrict-pam-line", 0, 0, OptionArg.STRING, ref restrict_pam_line, "Add specified line to pam configuration", null };
-            options[3] = { "remove-restrict", 0, 0, OptionArg.NONE, ref remove_restrict, "Remove all time restrictions for specified user", null };
-            options[4] = { "set-contents", 0, 0, OptionArg.STRING, ref set_contents, "Set contents of specified filename", null };
-            options[5] = { "file", 0, 0, OptionArg.FILENAME, ref file, "A file to write contents to", null };
-            options[6] = { "enable-restrict", 0, 0, OptionArg.NONE, ref enable_restrict, "Enable PAM restrictions for the user", null };
-            options[7] = { "disable-restrict", 0, 0, OptionArg.NONE, ref disable_restrict, "Disable PAM restrictions for the user", null };
-
-            string[] args = command_line.get_arguments ();
-            string*[] _args = new string[args.length];
-            for (int i = 0; i < args.length; i++) {
-                _args[i] = args[i];
-            }
-
-            try {
-                var opt_context = new OptionContext ("context");
-                opt_context.set_help_enabled (true);
-                opt_context.add_main_entries (options, null);
-                unowned string[] tmp = _args;
-                opt_context.parse (ref tmp);
-            } catch (OptionError e) {
-                command_line.print ("error: %s\n", e.message);
-                command_line.print ("Run '%s --help' to see a full list of available command line options.\n", args[0]);
-                return 1;
-            }   
-
-            if (Posix.getuid () != 0) {
-                command_line.print ("Error: To run this program you need root privigiles\n\n");
-                Process.exit (1);
-            } 
-
-            if (remove_restrict && user != "") {
-            	var pam_writer = new PAMWriter (File.new_for_path (TIME_CONF_FILE));
-            	pam_writer.remove_user_restrictions (user);
-            }
-
-            if (enable_restrict && user != "") {
-                var pam_writer = new PAMWriter (File.new_for_path (TIME_CONF_FILE));
-                pam_writer.modify_user_restrictions (user, true);
-            }
-
-            if (disable_restrict && user != "") {
-                var pam_writer = new PAMWriter (File.new_for_path (TIME_CONF_FILE));
-                pam_writer.modify_user_restrictions (user, false);
-            }
-
-            if (restrict_pam_line != null && user != null) {
-                ensure_pam_lightdm_enabled ();
-
-                var pam_writer = new PAMWriter (File.new_for_path (TIME_CONF_FILE));
-                pam_writer.add_conf_line (restrict_pam_line, user);
-            }
-
-            if (user != null && lock_dock != null) {
-                var loop = new MainLoop ();
-
-                Utils.get_usermanager ().notify["is-loaded"].connect (() => {
-                    if (Utils.get_usermanager ().is_loaded) {
-                        lock_dock_for_user (user, bool.parse (lock_dock));
-                        loop.quit ();
-                    }
-                });
-
-                loop.run ();
-            }
-
-            if (set_contents != null && file != null) {
-                set_file_contents (file, set_contents);
-            }
-
-            return 0;
-        }
-
-        private void set_file_contents (string path, string contents) {
-            var file = File.new_for_path (path);
-            if (!file.query_exists ()) {
-                try {
-                    var os = file.create (FileCreateFlags.REPLACE_DESTINATION);
-                    os.write (contents.data);
-                } catch (Error e) {
-                    warning ("%s\n", e.message);
-                }
-            } else {
-                try {
-                    FileUtils.set_contents (path, contents);
-                } catch (Error e) {
-                    warning ("%s\n", e.message);
-                }
-            }
-        }
-
-        private void ensure_pam_lightdm_enabled () {
-            string path = "/etc/pam.d/lightdm";
-            string contents = "";
-            try {
-                FileUtils.get_contents (path, out contents);
-            } catch (FileError e) {
-                warning ("%s\n", e.message);
-            }                
-            
-            string conf_line = "\naccount required pam_time.so";
-            if (!(conf_line in contents)) {
-                contents += conf_line;
-
-                try {
-                    FileUtils.set_contents (path, contents);
-                } catch (FileError e) {
-                    warning ("%s\n", e.message);
-                }
-            }
-        }
-
-        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);
-
-                try {
-                    key_file.save_to_file (plank_conf_file_path);
-                } catch (FileError e) {
-                    warning ("%s\n", e.message);
-                }       
-            }
-        }
-
-        public override int command_line (ApplicationCommandLine command_line) {
-            this.hold ();
-            int res = _command_line (command_line);
-            this.release ();
-            return res;
-        }
-    }
-}
\ No newline at end of file

=== removed file 'src/cli/CMakeLists.txt'
--- src/cli/CMakeLists.txt	2016-03-06 18:26:44 +0000
+++ src/cli/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-find_package (PkgConfig)
-
-pkg_check_modules (CLI_DEPS REQUIRED glib-2.0 gio-2.0 polkit-gobject-1 accountsservice)
-add_definitions (${CLI_DEPS_CFLAGS})
-link_directories (${CLI_DEPS_LIBRARY_DIRS})
-
-set (CLI_EXEC_NAME pantheon-parental-controls-cli)
-
-vala_precompile (VALA_C ${CLI_EXEC_NAME}
-    Application.vala
-    PAMWriter.vala
-    ${CMAKE_SOURCE_DIR}/src/shared/Vars.vala
-    ${CMAKE_SOURCE_DIR}/src/shared/Utils.vala
-PACKAGES
-    gio-2.0
-    accountsservice
-    polkit-gobject-1
-    posix
-OPTIONS
-    --vapidir=${CMAKE_SOURCE_DIR}/vapi/
-    --thread  
-)
-
-add_executable (${CLI_EXEC_NAME} ${VALA_C})
-target_link_libraries (${CLI_EXEC_NAME} ${DEPS_LIBRARIES}) 
-
-# Installation
-install (TARGETS ${CLI_EXEC_NAME} RUNTIME DESTINATION bin)
\ No newline at end of file

=== removed file 'src/cli/PAMWriter.vala'
--- src/cli/PAMWriter.vala	2016-03-06 18:26:44 +0000
+++ src/cli/PAMWriter.vala	1970-01-01 00:00:00 +0000
@@ -1,204 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/*-
- * Copyright (c) 2015 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.Cli {
-    public class PAMWriter : Object {
-        public File file;
-
-        public PAMWriter (File file) {
-            this.file = file;
-        }    
-
-        public string get_conf_section () {
-            string contents = read_contents (file);
-            try {
-                var regex = new Regex (Vars.PAM_CONF_REGEX);
-
-                if (regex.match (contents)) {
-                    int i = 0;
-                    foreach (string str in regex.split (contents)) {
-                        // Do not replace the contents of the PC plug section
-                        if (i != 1) {
-                            contents = contents.replace (str, "");
-                        }
-
-                        i++;
-                    }
-                } else {
-                    return "";
-                }
-            } catch (RegexError e) {
-                warning ("%s\n", e.message);
-            }
-
-
-            return contents;
-        }
-
-        public void remove_conf_section () {
-            string contents = read_contents (file);
-            string final_contents = contents.replace (get_conf_section (), "");
-
-            try {
-                FileUtils.set_contents (file.get_path (), final_contents);
-            } catch (FileError e) {
-                warning ("%s\n", e.message);
-            }
-        }
-
-        public void remove_user_restrictions (string user) {
-            string contents = read_contents (file);
-            string conf_section = get_conf_section ();
-
-            string new_conf = "";
-            if (conf_section != "" && user != "") {
-                int i = 0;
-                string[] split = conf_section.split ("\n");
-                foreach (string section_line in split) {
-                    bool contains = (user in section_line);
-                    if (!contains) {
-                        if (i > 0) {
-                            new_conf += "\n";
-                        }
-
-                        new_conf += section_line;
-                    }
-
-                    i++;
-                }
-
-                try {
-                    FileUtils.set_contents (file.get_path (), contents.replace (conf_section, new_conf));
-                } catch (FileError e) {
-                    warning ("%s\n", e.message);
-                }
-            }            
-        } 
-
-        public void modify_user_restrictions (string user, bool enable) {
-            string contents = read_contents (file);
-            string conf_section = get_conf_section ();
-
-            string new_conf = "";
-            if (conf_section != "" && user != "") {
-                int i = 0;
-                string[] split = conf_section.split ("\n");
-                foreach (string section_line in split) {
-                    if (i > 0) {
-                        new_conf += "\n";
-                    }
-
-                    bool contains = (user in section_line);
-                    if (!contains) {
-                        new_conf += section_line;
-                    } else {
-                        string prefix = "#";
-                        if (enable) {
-                            prefix = "";
-                            section_line = section_line.replace ("#", "");
-                        }
-
-                        new_conf += prefix + section_line;
-                    }
-
-                    i++;
-                }
-
-                try {
-                    FileUtils.set_contents (file.get_path (), contents.replace (conf_section, new_conf));
-                } catch (FileError e) {
-                    warning ("%s\n", e.message);
-                }
-            }            
-        } 
-
-        public void add_conf_line (string line, string? user = null) {
-            string contents = read_contents (file);
-            string conf_section = get_conf_section ();
-
-            string new_conf = "";
-            if (conf_section != "" && user != null) {
-                int i = 0;
-                string[] split = conf_section.split ("\n");
-                foreach (string section_line in split) {
-                    bool contains = (user in section_line);
-                    if (!contains) {
-                        if (i > 0) {
-                            new_conf += "\n";
-                        }
-
-                        new_conf += section_line;
-                    }
-
-                    i++;
-                }
-
-                try {
-                    FileUtils.set_contents (file.get_path (), contents.replace (conf_section, new_conf));
-                } catch (FileError e) {
-                    warning ("%s\n", e.message);
-                }
-
-                contents = read_contents (file);
-                conf_section = get_conf_section ();
-            }
-
-            
-            string final_contents = "";
-
-            if (conf_section == "") {
-                final_contents = contents +
-                                    "\n" +
-                                    Vars.PAM_CONF_START +
-                                    "\n" +
-                                    line +
-                                    "\n" +
-                                    Vars.PAM_CONF_END;
-            } else {
-                final_contents = conf_section.replace (Vars.PAM_CONF_END, "");
-                final_contents += line + "\n" + Vars.PAM_CONF_END;
-                final_contents = contents.replace (conf_section, final_contents);
-            }
-
-            try {
-                FileUtils.set_contents (file.get_path (), final_contents);
-            } catch (FileError e) {
-                warning ("%s\n", e.message);
-            }
-        }  
-
-        private string read_contents (File file) {
-            string data = "";
-            if (!file.query_exists ()) {
-                return "";
-            }
-
-            try {
-                FileUtils.get_contents (file.get_path (), out data);
-            } catch (FileError e) {
-                warning ("%s\n", e.message);
-            }
-
-            return data;
-        }
-    }
-}
\ No newline at end of file

=== renamed file 'src/client/AppLockDialog.vala' => 'src/client/AppUnavailableDialog.vala'
--- src/client/AppLockDialog.vala	2016-02-25 18:47:22 +0000
+++ src/client/AppUnavailableDialog.vala	2016-08-30 20:17:54 +0000
@@ -20,9 +20,9 @@
  * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
-namespace AppLock {
-    public class AppLockDialog : Gtk.MessageDialog {
-        public AppLockDialog () {
+namespace PC.Client {
+    public class AppUnavailableDialog : Gtk.MessageDialog {
+        public AppUnavailableDialog () {
             deletable = false;
             text = _("You cannot run this application");
             secondary_text = _("You are not permitted to run this application.");

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2016-02-25 18:47:22 +0000
+++ src/client/CMakeLists.txt	2016-08-30 20:17:54 +0000
@@ -8,11 +8,13 @@
 
 vala_precompile (VALA_C ${CLIENT_EXEC_NAME}
     Client.vala
-    AppLockDialog.vala
+    AppUnavailableDialog.vala
     ${CMAKE_SOURCE_DIR}/src/shared/Vars.vala
+    ${CMAKE_SOURCE_DIR}/src/shared/Utils.vala
 PACKAGES
     posix
     polkit-gobject-1
+    accountsservice
     gio-2.0
     gtk+-3.0
 OPTIONS

=== modified file 'src/client/Client.vala'
--- src/client/Client.vala	2016-07-31 00:18:06 +0000
+++ src/client/Client.vala	2016-08-30 20:17:54 +0000
@@ -20,19 +20,8 @@
  * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
- namespace PC.Client {
-    [DBus (name = "org.pantheon.ParentalControls")]
-    public interface ParentalControls : Object {
-        public signal void show_app_lock_dialog ();
-        public signal void authorize (string user, string action_id);
-        public signal void launch (string[] args);
-        public signal void send_time_notification (int hours, int minutes);
-
-        public abstract void end_authorization (int client_pid) throws IOError;
-    }
-
+namespace PC.Client {
     public class Client : Gtk.Application {
-        private ParentalControls? parental_controls;
         private Polkit.Permission? permission = null;
 
         public static int main (string[] args) {
@@ -43,31 +32,22 @@
         }
 
         public override void activate () {
-            try {
-                parental_controls = Bus.get_proxy_sync (BusType.SYSTEM, Vars.PARENTAL_CONTROLS_IFACE, Vars.PARENTAL_CONTROLS_OBJECT_PATH);
-            } catch (Error e) {
-                warning ("%s\n", e.message);
-                return;
-            }
-
-            if (parental_controls == null) {
-                return;
-            }
-
-            parental_controls.show_app_lock_dialog.connect (on_show_app_lock_dialog);
-            parental_controls.authorize.connect (on_authorize);
-            parental_controls.launch.connect (on_launch);
-            parental_controls.send_time_notification.connect (on_send_time_notification);
+            var api = Utils.get_api ();
+
+            api.show_app_unavailable.connect (on_show_app_unavailable);
+            api.app_authorize.connect (on_authorize);
+            api.launch.connect (on_launch);
+            api.show_timeout.connect (on_show_timeout);
 
             Gtk.main ();
         }
 
-        private void on_show_app_lock_dialog () {
-            var app_lock_dialog = new AppLock.AppLockDialog ();
+        private void on_show_app_unavailable (string path) {
+            var app_lock_dialog = new AppUnavailableDialog ();
             app_lock_dialog.show_all ();
         }
 
-        private void on_authorize (string user_name, string action_id) {
+        private void on_authorize (string username, string path, string action_id) {
             if (permission != null && permission.get_can_release ()) {
                 try {
                     permission.release ();
@@ -77,36 +57,26 @@
             }
 
             try {
-                var user = (Polkit.UnixUser)Polkit.UnixUser.new_for_name (user_name);
+                var user = (Polkit.UnixUser)Polkit.UnixUser.new_for_name (username);
                 permission = new Polkit.Permission.sync (action_id,
                                         Polkit.UnixProcess.new_for_owner (Posix.getpid (), 0, user.get_uid ()));
             } catch (Error e) {
                 warning ("%s\n", e.message);
             }
 
+            ulong signal_id = 0;
+            signal_id = permission.notify["allowed"].connect (() => {
+                Utils.get_api ().end_app_authorization.begin ();
+                permission.disconnect (signal_id);
+            });
+
             permission.acquire_async.begin ();
-            permission.notify["allowed"].connect (() => {
-                if (parental_controls != null) {
-                    try {
-                        parental_controls.end_authorization (Posix.getpid ());
-                    } catch (IOError e) {
-                        warning ("%s\n", e.message);
-                    }
-                }
-            });
         }
 
         private void on_launch (string[] args) {
-            string[] _args = {};
-            for (int i = 0; i < args.length; i++) {
-                if (args[i].strip () != "") {
-                    _args[i] = args[i];
-                }
-            }
-
             try {
                 GLib.Process.spawn_async ("/",
-                                        _args,
+                                        args,
                                         Environ.get (),
                                         SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD,
                                         null,
@@ -117,7 +87,7 @@
         }
 
 
-        private void on_send_time_notification (int hours, int minutes) {
+        private void on_show_timeout (int hours, int minutes) {
             string hours_str = "";
             string minutes_str = "";
             string info = "";
@@ -138,8 +108,8 @@
             var notification = new Notification (_("Time left"));
             var icon = new ThemedIcon ("dialog-warning");
             notification.set_icon (icon);
-
             notification.set_body (body);
+
             send_notification (null, notification);
         }
     }

=== modified file 'src/daemon/CMakeLists.txt'
--- src/daemon/CMakeLists.txt	2016-06-03 20:27:01 +0000
+++ src/daemon/CMakeLists.txt	2016-08-30 20:17:54 +0000
@@ -9,16 +9,20 @@
 
 vala_precompile (VALA_C ${DAEMON_EXEC_NAME}
     Daemon.vala
-    Core.vala
+    ProcessWatcher.vala
     Process.vala
     IptablesHelper.vala
+    Timer.vala
     SessionManager.vala
     SessionHandler.vala
     Interfaces.vala
+    UserConfig.vala
     Server.vala
     ${CMAKE_SOURCE_DIR}/src/shared/Vars.vala
     ${CMAKE_SOURCE_DIR}/src/shared/Utils.vala
-    ${CMAKE_SOURCE_DIR}/src/shared/PAMControl.vala
+    ${CMAKE_SOURCE_DIR}/src/shared/PAM/Token.vala
+    ${CMAKE_SOURCE_DIR}/src/shared/PAM/Reader.vala
+    ${CMAKE_SOURCE_DIR}/src/shared/PAM/Writer.vala
 PACKAGES
     posix
     accountsservice

=== modified file 'src/daemon/Daemon.vala'
--- src/daemon/Daemon.vala	2016-05-19 19:47:38 +0000
+++ src/daemon/Daemon.vala	2016-08-30 20:17:54 +0000
@@ -45,22 +45,16 @@
 
         public static void on_exit (int signum) {
             if (session_manager != null) {
-                session_manager.current_handler.stop ();
-                session_manager.current_handler.unref ();
+                session_manager.stop ();
             }
 
             terminate ();
         }
 
         public override void activate () {
+            Utils.get_usermanager ().notify["is-loaded"].connect (on_usermanager_loaded);
+            
             loop = new MainLoop ();
-
-            Bus.own_name (BusType.SYSTEM, Vars.PARENTAL_CONTROLS_IFACE, BusNameOwnerFlags.REPLACE,
-                          on_bus_aquired,
-                          () => {},
-                          on_bus_lost);
-            Utils.get_usermanager ().notify["is-loaded"].connect (on_usermanager_loaded);
-
             loop.run ();
         }
 
@@ -68,7 +62,7 @@
             warning ("Could not acquire name: %s\n", name);
         }
 
-        private void on_bus_aquired (DBusConnection connection) {
+        private void on_bus_acquired (DBusConnection connection) {
             try {
                 connection.register_object (Vars.PARENTAL_CONTROLS_OBJECT_PATH, Server.get_default ());
             } catch (IOError e) {
@@ -81,6 +75,11 @@
                 return;
             }
 
+            Bus.own_name (BusType.SYSTEM, Vars.PARENTAL_CONTROLS_IFACE, BusNameOwnerFlags.REPLACE,
+                          on_bus_acquired,
+                          () => {},
+                          on_bus_lost);
+
             session_manager = new SessionManager ();
             session_manager.start ();
         }

=== modified file 'src/daemon/Interfaces.vala'
--- src/daemon/Interfaces.vala	2016-05-18 14:56:00 +0000
+++ src/daemon/Interfaces.vala	2016-08-30 20:17:54 +0000
@@ -19,38 +19,34 @@
  *
  * Authored by: Adam Bieńkowski <[e-mail]>
  */
-
-public struct SessionStruct {
-    string name;
-    uint32 uid;
-    string user;
-    string seat;
-    GLib.ObjectPath object_path;
-}
-
-public struct ActiveSessionStruct {
-    string session_id;
-    GLib.ObjectPath object_path;
-}
-
-[DBus (name = "org.freedesktop.login1.Manager")]
-public interface IManager : Object {
-    public abstract SessionStruct[] list_sessions () throws IOError;
-    public abstract GLib.ObjectPath get_seat (string seat) throws IOError;
-    public signal void session_new (string user, GLib.ObjectPath object_path);
-    public signal void session_removed (string user, GLib.ObjectPath object_path);
-}
-
-[DBus (name = "org.freedesktop.login1.Session")]
-public interface ISession : Object {
-    public abstract string name { owned get; }
-
-    public abstract void lock () throws IOError;
-
-    public signal void unlock ();
-}
-
-[DBus (name = "org.freedesktop.login1.Seat")]
-public interface ISeat : Object {
-    public abstract ActiveSessionStruct active_session { owned get; }
+namespace PC.Daemon {
+    public struct SessionStruct {
+        string name;
+        uint32 uid;
+        string user;
+        string seat;
+        GLib.ObjectPath object_path;
+    }
+
+    public struct SeatStruct {
+        string seat_id;
+        GLib.ObjectPath object_path;
+    }
+
+    [DBus (name = "org.freedesktop.login1.Manager")]
+    public interface IManager : Object {
+        public abstract SessionStruct[] list_sessions () throws IOError;
+        public abstract SeatStruct[] list_seats () throws IOError;
+        public abstract GLib.ObjectPath get_seat (string seat) throws IOError;
+        public signal void session_new (string session, GLib.ObjectPath object_path);
+        public signal void session_removed (string session, GLib.ObjectPath object_path);
+    }
+
+    [DBus (name = "org.freedesktop.login1.Session")]
+    public interface ISession : Object {
+        public abstract bool active { owned get; }
+        public abstract string name { owned get; }
+        public abstract string id { owned get; }
+        public abstract void terminate () throws IOError;
+    }
 }
\ No newline at end of file

=== modified file 'src/daemon/IptablesHelper.vala'
--- src/daemon/IptablesHelper.vala	2016-05-17 13:51:36 +0000
+++ src/daemon/IptablesHelper.vala	2016-08-30 20:17:54 +0000
@@ -20,66 +20,64 @@
  * Authored by: Adam Bieńkowski <[e-mail]>
  */
 
- namespace PC {
+ namespace PC.Daemon {
     public class IptablesHelper : Object {
-        public bool valid = false;
-
         private const string IPTABLES_EXEC = "iptables";
-        private const string HOST_EXEC = "host";
-        private const int ADDRESS_INDEX = 3;
         private const int DPORT = 80;
 
-        private string[] urls;
-
-        public IptablesHelper (string[] urls) {
-            this.urls = urls;
-            valid = Environment.find_program_in_path (IPTABLES_EXEC) != null &&
-                    Environment.find_program_in_path (HOST_EXEC) != null &&
-                    urls.length > 0;
-        }
-
-        public void add_rules () {
-            foreach (string url in urls) {
-                string[] addresses = get_addresses_from_url (url);
+        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;
+        }
+
+        public IptablesHelper (UserConfig config) {
+            this.config = config;
+        }
+
+        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 stop () {
+            remove_rules ();
+            disconnect (changed_signal_id);
+        }
+
+        private void add_rules () {
+            foreach (string url in current_urls) {
+                string[] addresses = get_addresses_from_name (url);
                 foreach (string address in addresses) {
                     process_adress (address, "-A");
                 }
             }        
         }
 
-        private string[] get_addresses_from_url (string url) {
-            string[] result = {};
-
-            string output;
-            int status;
-
+        private string[] get_addresses_from_name (string name) {
+            string[] address_list = {};
+            var resolver = Resolver.get_default ();
             try {
-                GLib.Process.spawn_sync ("/",
-                                    { HOST_EXEC, url },
-                                    Environ.get (),
-                                    SpawnFlags.SEARCH_PATH,
-                                    null,
-                                    out output,
-                                    null,
-                                    out status);
-            } catch (SpawnError e) {
-                warning ("%s\n", e.message);
-            }
-
-            if (status != 0) {
-                return result;
-            }
-
-            foreach (string line in output.split ("\n")) {
-                if (line.contains ("has address")) {
-                    string[] elements = line.split (" ");
-                    if (elements.length >= 3) {
-                        result += elements[ADDRESS_INDEX];
+                var addresses = resolver.lookup_by_name (name, null);
+                foreach (InetAddress address in addresses) {
+                    if (address.get_family () == SocketFamily.IPV4) {
+                        address_list += address.to_string ();
                     }
                 }
+            } catch (Error e) {
+                warning (e.message);
             }
 
-            return result;
+            return address_list;
         }
 
         private void process_adress (string address, string option) {
@@ -97,9 +95,9 @@
             }
         }
 
-        public void reset () {
-            foreach (string url in urls) {
-                string[] addresses = get_addresses_from_url (url);
+        private void remove_rules () {
+            foreach (string url in current_urls) {
+                string[] addresses = get_addresses_from_name (url);
                 foreach (string address in addresses) {
                     process_adress (address, "-D");
                 }

=== renamed file 'src/daemon/Core.vala' => 'src/daemon/ProcessWatcher.vala'
--- src/daemon/Core.vala	2016-05-19 19:54:37 +0000
+++ src/daemon/ProcessWatcher.vala	2016-08-30 20:17:54 +0000
@@ -21,68 +21,42 @@
  */
 
 namespace PC.Daemon {
-    public class Core : GLib.Object, ExecMonitor {
-        public bool valid = true;
-        public KeyFile key_file;
-
-        private Act.User user;
-
-        private string[] targets = {};
-        private bool admin = false;
-
+    public class ProcessWatcher : GLib.Object, ExecMonitor {
+        public UserConfig? config = null;
         private List<string> allowed_executables;
-
         private Polkit.Authority authority;
-        private Server server;
 
-        public Core (Act.User _user, Server _server) {
-            user = _user;
-            server = _server;
+        public ProcessWatcher () {
             allowed_executables = new List<string> ();
+
             try {
                 authority = Polkit.Authority.get_sync ();
             } catch (Error e) {
                 warning ("%s\n", e.message);
             }
-
-            if (user == null) {
-                valid = false;
-                return;
-            }
-
-            key_file = new KeyFile ();
-
-            string conf_path = Utils.build_daemon_conf_path (user);
-            if (conf_path.strip () != "" && FileUtils.test (conf_path, FileTest.EXISTS)) {
-                try {
-                    key_file.load_from_file (conf_path, 0);
-
-                    targets = key_file.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_TARGETS);
-                    admin = key_file.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ADMIN);
-
-                    valid = targets.length > 0;
-                } catch (FileError e) {
-                    warning ("%s\n", e.message);
-                } catch (Error e) {
-                    warning ("%s\n", e.message);
-                }
-            } else {
-                valid = false;
-            }       
+        }
+
+        public void set_config (UserConfig? config) {
+            this.config = config;
+            allowed_executables = new List<string> ();
         }
 
         private void handle_pid (int pid) {
+            if (config == null) {
+                return;
+            }
+
             var process = new Process (pid);
 
-            string command = process.get_command ();
+            string? command = process.get_command ();
             if (command == null || command == "") {
                 return;
             }
 
             string[]? args = {};
             try {
-                bool success = Shell.parse_argv (command, out args);
-                if (!success || args == null || args.length < 1) {
+                Shell.parse_argv (command, out args);
+                if (args == null || args.length < 1) {
                     return;
                 }
             } catch (ShellError e) {
@@ -91,43 +65,44 @@
             }                
 
             string executable = args[0];
-            foreach (string _executable in allowed_executables) {
-                if (_executable == executable) {
-                    allowed_executables.remove (_executable);
-                    return;
-                }
-            }
 
-            if (executable != null && !executable.has_prefix (Path.DIR_SEPARATOR_S)) {
+            if (!executable.has_prefix (Path.DIR_SEPARATOR_S)) {
                 executable = Environment.find_program_in_path (executable);
             }
 
-            if (executable != null && executable != "") {
-                if (executable in targets) {
-                    process.kill ();
-
-                    if (admin && authority != null) {
-                        server.authorize (user.get_user_name (), Vars.PARENTAL_CONTROLS_ACTION_ID);
-                        ulong signal_id = 0;
-                        signal_id = server.authorization_ended.connect ((client_pid) => {
-                            try {
-                                var result = authority.check_authorization_sync (Polkit.UnixProcess.new_for_owner (client_pid, 0, (int)user.get_uid ()),
-                                                                                Vars.PARENTAL_CONTROLS_ACTION_ID,
-                                                                                null,
-                                                                                Polkit.CheckAuthorizationFlags.ALLOW_USER_INTERACTION);
-                                if (result.get_is_authorized ()) {
-                                    allowed_executables.append (args[0]);                                
-                                    server.launch (args);
-                                }   
-                            } catch (Error e) {
-                                warning ("%s\n", e.message);
+            unowned List<string> link = allowed_executables.find_custom (executable, strcmp);
+            if (link != null) {
+                allowed_executables.remove_link (link);
+                return;
+            }
+
+            if (executable != null && executable in config.get_targets ()) {
+                process.kill ();
+
+                var server = Server.get_default ();
+                if (config.get_admin () && authority != null) {
+                    ulong signal_id = 0;
+                    signal_id = server.app_authorization_ended.connect ((client_pid) => {
+                        try {
+                            var unix_user = (Polkit.UnixUser)Polkit.UnixUser.new_for_name (config.username);
+                            var result = authority.check_authorization_sync (Polkit.UnixProcess.new_for_owner (client_pid, 0, unix_user.get_uid ()),
+                                                                            Vars.PARENTAL_CONTROLS_ACTION_ID,
+                                                                            null,
+                                                                            Polkit.CheckAuthorizationFlags.NONE);
+                            if (result.get_is_authorized ()) {
+                                allowed_executables.append (executable);
+                                server.launch (args);
                             }
-
-                            server.disconnect (signal_id);
-                        });
-                    } else {
-                        server.show_app_lock_dialog ();
-                    }
+                        } catch (Error e) {
+                            warning ("%s\n", e.message);
+                        }
+
+                        server.disconnect (signal_id);
+                    });
+
+                    server.app_authorize (config.username, executable, Vars.PARENTAL_CONTROLS_ACTION_ID);
+                } else {
+                    server.show_app_unavailable (executable);
                 }
             }  
         }

=== modified file 'src/daemon/Server.vala'
--- src/daemon/Server.vala	2016-02-25 18:47:22 +0000
+++ src/daemon/Server.vala	2016-08-30 20:17:54 +0000
@@ -21,9 +21,26 @@
  */
 
 namespace PC.Daemon {
+    [DBus (name = "org.freedesktop.DBus")]
+    private interface DBus : Object {
+        [DBus (name = "GetConnectionUnixProcessID")]
+        public abstract uint32 get_connection_unix_process_id (string name) throws IOError;
+        
+        public abstract uint32 get_connection_unix_user (string name) throws IOError;
+    }
+
+    [DBus (name = "org.pantheon.ParentalControls")]
+    public errordomain ParentalControlsError {
+        NOT_AUTHORIZED,
+        NOT_IMPLEMENTED,
+        USER_CONFIG_NOT_VAILD,
+        DBUS_CONNECTION_FAILED
+    }
+
     [DBus (name = "org.pantheon.ParentalControls")]
     public class Server : Object {
         private static Server? instance = null;
+        private DBus? bus_proxy = null;
 
         [DBus (visible = false)]
         public static Server get_default () {
@@ -34,16 +51,205 @@
             return instance;
         }
         
+        protected Server () {
+            try {
+                bus_proxy = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.DBus", "/");
+            } catch (Error e) {
+                warning (e.message);
+                bus_proxy = null;
+            }
+
+            UserConfig.init ();
+        }
+
         [DBus (visible = false)]
-        public signal void authorization_ended (int client_pid);
+        public signal void app_authorization_ended (int client_pid);
 
-        public signal void show_app_lock_dialog ();
-        public signal void authorize (string user, string action_id);
+        public signal void app_authorize (string username, string path, string action_id);
         public signal void launch (string[] args);
-        public signal void send_time_notification (int hours, int minutes);
-
-        public void end_authorization (int client_pid) {
-            authorization_ended (client_pid);
+        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 void end_app_authorization (BusName sender) {
+            uint32 pid = get_pid_from_sender (sender);
+            app_authorization_ended ((int)pid);
+        }
+
+        public void add_restriction_for_user (string input, bool clean, BusName sender) throws ParentalControlsError {
+            if (!get_sender_is_authorized (sender)) {
+                throw new ParentalControlsError.NOT_AUTHORIZED ("Error: sender not authorized");
+            }
+
+            ensure_pam_lightdm_enabled ();
+            
+            var writer = PAM.Writer.new_for_time ();
+            writer.add_restriction_for_user (input, clean);
+        }
+
+        public void remove_restriction_for_user (string username, BusName sender) throws ParentalControlsError {
+            if (!get_sender_is_authorized (sender)) {
+                throw new ParentalControlsError.NOT_AUTHORIZED ("Error: sender not authorized");
+            }
+
+            var writer = PAM.Writer.new_for_time ();
+            writer.remove_restriction_for_user (username);
+        }
+
+        public void lock_dock_icons_for_user (string username, bool lock, BusName sender) throws ParentalControlsError {
+            throw new ParentalControlsError.NOT_IMPLEMENTED ("Error: not implemented");
+        }
+
+        public void set_user_daemon_active (string username, bool active, BusName sender) throws ParentalControlsError {
+            if (!get_sender_is_authorized (sender)) {
+                throw new ParentalControlsError.NOT_AUTHORIZED ("Error: sender not authorized");
+            }
+
+            var config = UserConfig.get_for_username (username, true);
+            if (config == null) {
+                throw new ParentalControlsError.USER_CONFIG_NOT_VAILD ("Error: config for %s is not valid or could not be created".printf (username));
+            }
+
+            config.set_active (active);
+        }
+
+        public void set_user_daemon_targets (string username, string[] targets, BusName sender) throws ParentalControlsError {
+            if (!get_sender_is_authorized (sender)) {
+                throw new ParentalControlsError.NOT_AUTHORIZED ("Error: sender not authorized");
+            }
+
+            var config = UserConfig.get_for_username (username, true);
+            if (config == null) {
+                throw new ParentalControlsError.USER_CONFIG_NOT_VAILD ("Error: config for %s is not valid or could not be created".printf (username));
+            }
+
+            config.set_targets (targets);
+        }
+
+        public void set_user_daemon_block_urls (string username, string[] block_urls, BusName sender) throws ParentalControlsError {
+            if (!get_sender_is_authorized (sender)) {
+                throw new ParentalControlsError.NOT_AUTHORIZED ("Error: sender not authorized");
+            }  
+
+            var config = UserConfig.get_for_username (username, true);
+            if (config == null) {
+                throw new ParentalControlsError.USER_CONFIG_NOT_VAILD ("Error: config for %s is not valid or could not be created".printf (username));
+            }
+
+            config.set_block_urls (block_urls);
+        }
+
+        public void set_user_daemon_admin (string username, bool admin, BusName sender) throws ParentalControlsError {
+            if (!get_sender_is_authorized (sender)) {
+                throw new ParentalControlsError.NOT_AUTHORIZED ("Error: sender not authorized");
+            }
+
+            var config = UserConfig.get_for_username (username, true);
+            if (config == null) {
+                throw new ParentalControlsError.USER_CONFIG_NOT_VAILD ("Error: config for %s is not valid or could not be created".printf (username));
+            }
+
+            config.set_admin (admin);
+        }
+
+        public bool get_user_daemon_active (string username) throws ParentalControlsError {
+            var config = UserConfig.get_for_username (username, false);
+            if (config == null) {
+                throw new ParentalControlsError.USER_CONFIG_NOT_VAILD ("Error: config for %s is not valid or does not exist".printf (username));
+            }
+
+            return config.get_active ();
+        }
+
+        public string[] get_user_daemon_targets (string username) throws ParentalControlsError {
+            var config = UserConfig.get_for_username (username, false);
+            if (config == null) {
+                throw new ParentalControlsError.USER_CONFIG_NOT_VAILD ("Error: config for %s is not valid or does not exist".printf (username));
+            }
+
+            return config.get_targets ();
+        }
+
+        public string[] get_user_daemon_block_urls (string username) throws ParentalControlsError {
+            var config = UserConfig.get_for_username (username, false);
+            if (config == null) {
+                throw new ParentalControlsError.USER_CONFIG_NOT_VAILD ("Error: config for %s is not valid or does not exist".printf (username));
+            }
+
+            return config.get_block_urls ();
+        }
+
+        public bool get_user_daemon_admin (string username) throws ParentalControlsError {
+            var config = UserConfig.get_for_username (username, false);
+            if (config == null) {
+                throw new ParentalControlsError.USER_CONFIG_NOT_VAILD ("Error: config for %s is not valid or does not exist".printf (username));
+            }
+
+            return config.get_admin ();
+        }
+
+        private void ensure_pam_lightdm_enabled () {
+            string path = "/etc/pam.d/lightdm";
+            
+            string contents;
+            try {
+                FileUtils.get_contents (path, out contents);
+            } catch (FileError e) {
+                warning (e.message);
+                return;
+            }
+            
+            string conf_line = "\naccount required pam_time.so";
+            if (conf_line in contents) {
+                return;
+            }
+
+            contents += conf_line;
+
+            try {
+                FileUtils.set_contents (path, contents);
+            } catch (FileError e) {
+                warning ("%s\n", e.message);
+            }
+        }
+
+        private bool get_sender_is_authorized (BusName sender) throws ParentalControlsError {
+            if (bus_proxy == null) {
+                throw new ParentalControlsError.DBUS_CONNECTION_FAILED ("Error: connecting to org.freedesktop.DBus failed.");
+            }
+
+            uint32 user = 0, pid = 0;
+
+            try {
+                pid = get_pid_from_sender (sender);
+                user = bus_proxy.get_connection_unix_user (sender);
+            } catch (Error e) {
+                warning (e.message);
+            }            
+
+            var subject = Polkit.UnixProcess.new_for_owner ((int)pid, 0, (int)user);
+
+            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);
+                return auth_result.get_is_authorized ();     
+            } catch (Error e) {
+                warning (e.message);
+            }
+
+            return false;
+        }
+
+        private uint32 get_pid_from_sender (BusName sender) {
+            uint32 pid = 0;
+
+            try {
+                pid = bus_proxy.get_connection_unix_process_id (sender);
+            } catch (Error e) {
+                warning (e.message);
+            }   
+
+            return pid;
         }
     }
 }
\ 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-08-30 20:17:54 +0000
@@ -22,40 +22,46 @@
 
  namespace PC.Daemon {
     public class SessionHandler : Object {
-        private const int MINUTE_INTERVAL = 60;
-        private const int HOUR_INTERVAL = 3600;
-
-        public Core core;
-        public IptablesHelper iptables_helper;
-
-        private ISession session;
+        private IptablesHelper iptables_helper;
+        private Timer? timer;
+
+        private UserConfig config;
+        public ISession session;
         private Server server;
 
         private bool can_start = true;
 
-        public SessionHandler (ISession _session) {
-            session = _session;
+        public SessionHandler (ISession session) {
+            this.session = session;
             server = Server.get_default ();
-            Utils.set_user_name (session.name);
-
-            core = new Core (Utils.get_current_user (), server);
-
-            try {
-                if (!core.key_file.has_group (Vars.DAEMON_GROUP) || !core.key_file.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ACTIVE)) {
-                    can_start = false;
-                }
-            } catch (Error e) {
-                warning ("%s\n", e.message);
-            }
-
-            string[] block_urls = {};
-            try {
-                block_urls = core.key_file.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_BLOCK_URLS);
-            } catch (KeyFileError e) {
-                warning ("%s\n", e.message);
-            }
-
-            iptables_helper = new IptablesHelper (block_urls);
+
+            config = UserConfig.get_for_username (session.name, false);
+            if (config == null || !config.get_active ()) {
+                can_start = false;
+                return;
+            }
+
+            iptables_helper = new IptablesHelper (config);
+
+            var token = PAM.Reader.get_token_for_user (Vars.PAM_TIME_CONF_PATH, session.name);
+            if (token != null) {
+                timer = new Timer (token);
+                timer.terminate.connect (() => {
+                    try {
+                        session.terminate ();
+                    } catch (IOError e) {
+                        warning (e.message);
+                    }                    
+                });
+            }            
+        }
+
+        public string get_id () {
+            return session.id;
+        }
+
+        public UserConfig get_config () {
+            return config;
         }
 
         public void start () {
@@ -63,142 +69,20 @@
                 return;
             }
 
-            if (core.valid) {
-                core.start.begin ();
-            }
-
-            if (iptables_helper.valid) {
-                iptables_helper.add_rules ();
-            }
-
-            var restricts = PAMControl.get_all_restrictions ();
-            foreach (var restrict in restricts) {
-                if (restrict.user == Utils.get_current_user ().get_user_name ()) {
-                    var current_date = new DateTime.now_local ();
-                    string minute = current_date.get_minute ().to_string ();
-                    if (int.parse (minute) < 10) {
-                        minute = "0" + minute;
-                    }
-
-                    switch (restrict.day_id) {
-                        case Vars.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);
-                                start_loop ((int)((span / GLib.TimeSpan.MINUTE * -1) + 1) - 24 * MINUTE_INTERVAL);
-                            }
-
-                            break;
-                        case Vars.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);
-                                start_loop ((int)((span / GLib.TimeSpan.MINUTE * -1) + 1) - 24 * MINUTE_INTERVAL);
-                            }
-
-                            break;
-                        case Vars.ALL_ID:
-                            int estimated_time = 2400;
-                            if (current_date.get_day_of_week () < 6) {
-                                estimated_time = int.parse (restrict.weekday_hours.split ("-")[1]);
-                            } else if (current_date.get_day_of_week () >= 6) {
-                                estimated_time = int.parse (restrict.weekend_hours.split ("-")[1]);
-                            }
-                            
-                            var span = get_difference_span (estimated_time, current_date);
-                            int minutes = (int)((span / GLib.TimeSpan.MINUTE * -1) + 1) - 24 * MINUTE_INTERVAL;
-                            if (minutes > 0) {
-                                start_loop (minutes);
-                            } else {
-                                lock_session ();
-                            }
-
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            } 
+            if (IptablesHelper.get_can_start ()) {
+                iptables_helper.start ();
+            }
+
+            if (timer != null) {
+                timer.start ();
+            }
         }
 
         public void stop () {
-            core.stop ();
-            iptables_helper.reset ();
-        }
-
-        private TimeSpan get_difference_span (int estimated_time, DateTime current_date) {
-            bool end_day = (estimated_time == 2400 || estimated_time == 0);
-            if (end_day) {
-                estimated_time = 2359;
-            }
-
-            char[] tmp = estimated_time.to_string ().to_utf8 ();
-            int _h, _m;
-            _h = int.parse (tmp[0].to_string () + tmp[1].to_string ());
-            _m = int.parse (tmp[2].to_string () + tmp[3].to_string ());
-
-            var estimated_date = new DateTime.local (current_date.get_year (),
-                                                    current_date.get_month (),
-                                                    current_date.get_day_of_week (),
-                                                    _h, _m, 0);
-
-            var span = current_date.difference (estimated_date);            
-            if (end_day) {
-                span -= GLib.TimeSpan.MINUTE;
-            }
-
-            return span;
-        }
-
-        private int get_estimated_hours (int minutes) {
-            if (minutes >= MINUTE_INTERVAL) {
-                return minutes / MINUTE_INTERVAL;
-            }
-
-            return 0;
-        }
-
-        private void start_loop (int minutes) {
-            int _hours = get_estimated_hours (minutes);
-            int remaining_minutes = minutes - (MINUTE_INTERVAL * _hours);
-            server.send_time_notification (_hours, remaining_minutes);
-
-            schedule_notification (remaining_minutes, 5);
-            schedule_notification (remaining_minutes, 1);
-
-            Timeout.add_seconds (MINUTE_INTERVAL, () => {
-                remaining_minutes--;
-                if (remaining_minutes == 0) {
-                    lock_session ();
-                }
-
-                return (remaining_minutes != 0);
-            });
-
-            Timeout.add_seconds (HOUR_INTERVAL, () => {
-                int hours = get_estimated_hours (minutes);
-                if (hours > 0) {
-                    server.send_time_notification (hours, minutes - (MINUTE_INTERVAL * hours));
-                }   
-
-                return (hours != 0 || minutes != 0);
-            });
-        }
-
-        private void schedule_notification (int remaining_minutes, int minutes) {
-            Timeout.add_seconds ((remaining_minutes - minutes) * MINUTE_INTERVAL, () => {
-                server.send_time_notification (0, minutes);
-
-                return false;
-            });
-        }
-
-        private void lock_session () {
-            try {
-                session.lock ();
-            } catch (IOError e) {
-                warning ("%s\n", e.message);
-            }
-        }          
+            iptables_helper.stop ();
+            if (timer != null) {
+                timer.stop ();
+            }
+        }         
     }
 }
\ No newline at end of file

=== modified file 'src/daemon/SessionManager.vala'
--- src/daemon/SessionManager.vala	2016-05-18 14:56:00 +0000
+++ src/daemon/SessionManager.vala	2016-08-30 20:17:54 +0000
@@ -22,10 +22,12 @@
 
  namespace PC.Daemon {
     public class SessionManager : Object {
-        public SessionHandler? current_handler = null;
-        
+        private SessionHandler? current_handler = null;
         private IManager? manager = null;
         private DBusConnection? conn = null;
+        private ProcessWatcher pwatcher;
+
+        private uint[] signal_ids;
 
         public SessionManager () {
             try {
@@ -34,6 +36,9 @@
             } catch (IOError e) {
                 warning ("%s\n", e.message);
             }
+
+            pwatcher = new ProcessWatcher ();
+            pwatcher.start.begin ();
         }
 
         public void start () {
@@ -44,22 +49,39 @@
             manager.session_new.connect (() => update_session ());
             manager.session_removed.connect (() => update_session ());
 
-            conn.signal_subscribe (null,
-                                Vars.DBUS_PROPERTIES_IFACE,
-                                "PropertiesChanged",
-                                get_current_seat_path (),
-                                null,
-                                0,
-                                () => update_session ());
+            try {
+                foreach (SeatStruct seat_s in manager.list_seats ()) {
+                    signal_ids += conn.signal_subscribe (null,
+                                    Vars.DBUS_PROPERTIES_IFACE,
+                                    "PropertiesChanged",
+                                    seat_s.object_path,
+                                    null,
+                                    0,
+                                    () => update_session ());
+                }
+            } catch (IOError e) {
+                warning (e.message);
+            }
+
             update_session ();
         }
 
+        public void stop () {
+            foreach (uint signal_id in signal_ids) {
+                conn.signal_unsubscribe (signal_id);
+            }
+
+            stop_current_handler ();
+        }
+
         private ISession? get_current_session () {
             try {
-                string? seat_path = get_current_seat_path ();
-                if (seat_path != null) {
-                    ISeat? seat = Bus.get_proxy_sync (BusType.SYSTEM, Vars.LOGIN_IFACE, seat_path);
-                    return Bus.get_proxy_sync (BusType.SYSTEM, Vars.LOGIN_IFACE, seat.active_session.object_path);
+                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);
+                    if (session != null && session.active) {
+                        return session;
+                    }
                 }
             } catch (IOError e) {
                 warning ("%s\n", e.message);
@@ -68,37 +90,30 @@
             return null;         
         }
 
-        private string? get_current_seat_path () {
-            try {
-                string seat_id = "seat0";
-                string? seat_variable = Environment.get_variable ("XDG_SEAT");
-                if (seat_variable != null && seat_variable.has_prefix ("seat")) {
-                    seat_id = seat_variable;
-                }
-
-                return manager.get_seat (seat_id);                
-            } catch (Error e) {
-                warning ("%s\n", e.message);
-            }
-
-            return null;
-        }
-
         private void update_session () {
+            var session = get_current_session ();
+            if (session.id == current_handler.get_id ()) {
+                return;
+            }
+
+            stop_current_handler ();
+
+            if (session != null &&
+                session.name != null &&
+                !(session.name in Vars.DAEMON_IGNORED_USERS)) {
+                current_handler = new SessionHandler (session);
+                current_handler.start ();
+                pwatcher.set_config (current_handler.get_config ());
+            }
+        }
+
+        private void stop_current_handler () {
             if (current_handler != null) {
                 current_handler.stop ();
-                current_handler.unref ();
                 current_handler = null;
             }
 
-            var current_session = get_current_session ();
-            if (current_session != null &&
-                current_session.name != null &&
-                current_session.name.strip () != "" &&
-                !(current_session.name in Vars.DAEMON_IGNORED_USERS)) {
-                current_handler = new SessionHandler (current_session);
-                current_handler.start ();
-            }
+            pwatcher.set_config (null);
         }
     }
 }
\ No newline at end of file

=== added file 'src/daemon/Timer.vala'
--- src/daemon/Timer.vala	1970-01-01 00:00:00 +0000
+++ src/daemon/Timer.vala	2016-08-30 20:17:54 +0000
@@ -0,0 +1,116 @@
+// -*- 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 Timer : Object {
+        private const int MINUTE_INTERVAL = 60;
+        private const int HOUR_INTERVAL = 3600;
+
+        public signal void terminate ();
+
+        private PAM.Token token;
+        private uint[] timeout_ids;
+
+        public Timer (PAM.Token token) {
+            this.token = token;
+        }
+
+        public void start () {
+            var times_info = token.get_times_info ();
+            if (times_info.length () == 0) {
+                return;
+            }
+
+            PAM.TimeInfo? current = null;
+
+            int day_of_week = new DateTime.now_local ().get_day_of_week ();
+            foreach (PAM.TimeInfo info in times_info) {
+                if ((day_of_week < 6 && info.day_type == PAM.DayType.WEEKDAY)
+                    || (day_of_week >= 6 && info.day_type == PAM.DayType.WEEKEND)
+                    || info.day_type == PAM.DayType.ALL) {
+                    current = info;
+                    break;
+                }
+            }
+
+            if (current == null) {
+                return;
+            }
+
+            var span = get_difference_span (current.to);
+            int minutes = ((int)(span / GLib.TimeSpan.MINUTE)).abs ();
+            
+            if (minutes > 0) {
+                start_loop (minutes);
+            } else {
+                terminate ();
+            }  
+
+            timeout_ids += Timeout.add_seconds (HOUR_INTERVAL * 24, () => {
+                start ();
+                return true;
+            });
+        }
+
+        public void stop () {
+            foreach (uint timeout_id in timeout_ids) {
+                GLib.Source.remove (timeout_id);
+            }
+        }
+
+        private TimeSpan get_difference_span (string estimated_time_str) {
+            int hour = int.parse (estimated_time_str.slice (0, 2));
+            int minute = int.parse (estimated_time_str.substring (2));
+
+            if (hour == 24) {
+                hour = 0;
+            }
+
+            var current_date = new DateTime.now_local ();
+            var estimated_date = current_date.add_full (0, 0,
+                                                    (hour < current_date.get_hour ()) ? 1 : 0,
+                                                    hour - current_date.get_hour (),
+                                                    minute - current_date.get_minute (),
+                                                    0);
+            return estimated_date.difference (current_date);
+        }
+
+        private void start_loop (int minutes) {
+            Server.get_default ().show_timeout (minutes / MINUTE_INTERVAL, minutes % MINUTE_INTERVAL);
+            timeout_ids += Timeout.add_seconds (MINUTE_INTERVAL, () => {
+                minutes--;
+                if (minutes == MINUTE_INTERVAL ||
+                    minutes == 10 ||
+                    minutes == 5 ||
+                    minutes == 1) {
+                    Server.get_default ().show_timeout (minutes / MINUTE_INTERVAL, minutes % MINUTE_INTERVAL);
+                }
+
+                if (minutes == 0) {
+                    terminate ();
+                }
+
+                return (minutes > 0);
+            });
+        }   
+    }
+}
\ No newline at end of file

=== added file 'src/daemon/UserConfig.vala'
--- src/daemon/UserConfig.vala	1970-01-01 00:00:00 +0000
+++ src/daemon/UserConfig.vala	2016-08-30 20:17:54 +0000
@@ -0,0 +1,208 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015-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 UserConfig : Object {
+        public string username;
+        public signal void changed ();
+
+        private KeyFile key;
+        private string config_path;
+
+        private static List<UserConfig> config_list;
+
+        public static UserConfig? get_for_username (string username, bool create) {
+            foreach (UserConfig config in config_list) {
+                if (config.username == username) {
+                    return config;
+                }
+            }
+
+            if (create) {
+                return create_for_username (username);    
+            }
+            
+            return null;
+        }
+
+        public static List<UserConfig> get_all () {
+            return config_list.copy ();
+        }
+
+        public static void init () {
+            config_list = new List<UserConfig> ();
+
+            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)) {
+                    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);
+                config_list.append (user_config);
+            }
+        }
+
+        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 ());
+            config_list.append (config);
+            return config;
+        }
+
+        private UserConfig (string config_path, string username, KeyFile key) {
+            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);
+            save ();
+        }
+
+        public void set_targets (string[] targets) {
+            key.set_string_list (Vars.DAEMON_GROUP, Vars.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);
+            save ();
+        }
+
+        public void set_admin (bool admin) {
+            key.set_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ADMIN, admin);
+            save ();
+        }
+
+        public bool get_active () {
+            try {
+                return key.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ACTIVE);
+            } catch (KeyFileError e) {
+                warning (e.message);
+            }
+
+            return false;
+        }
+
+        public string[] get_targets () {
+            try {            
+                return key.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_TARGETS);
+            } catch (KeyFileError e) {
+                warning (e.message);
+            }   
+
+            return {};         
+        }
+
+        public string[] get_block_urls () {
+            try {
+                return key.get_string_list (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_BLOCK_URLS);
+            } catch (KeyFileError e) {
+                warning (e.message);
+            }
+
+            return {};                
+        }
+
+        public bool get_admin () {
+            try {
+                return key.get_boolean (Vars.DAEMON_GROUP, Vars.DAEMON_KEY_ADMIN);
+            } catch (KeyFileError e) {
+                warning (e.message);
+            }
+
+            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);
+            } catch (KeyFileError e) {
+                warning (e.message);
+            } catch (FileError e) {
+                warning (e.message);
+            }
+        }
+
+        private void save () {
+            try {
+                key.save_to_file (config_path);
+            } catch (FileError e) {
+                warning (e.message);
+                return;
+            }
+
+            Server.get_default ().user_config_changed (username);
+            changed ();
+        }
+    }
+}
\ No newline at end of file

=== added directory 'src/shared/PAM'
=== added file 'src/shared/PAM/Reader.vala'
--- src/shared/PAM/Reader.vala	1970-01-01 00:00:00 +0000
+++ src/shared/PAM/Reader.vala	2016-08-30 20:17:54 +0000
@@ -0,0 +1,66 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 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.PAM {
+    public class Reader : Object {
+        public static string get_config (string contents, bool ignore_comments = true) {
+            string config = "";
+
+            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;
+        }
+
+        public static List<Token> get_tokens (string filename) {
+            string contents;
+            try {
+                FileUtils.get_contents (filename, out contents);
+            } catch (FileError e) {
+                warning (e.message);
+                return new List<Token> ();
+            }
+
+            string config = get_config (contents);
+            return Token.parse (config);
+        }
+
+        public static Token? get_token_for_user (string filename, string username) {
+            foreach (Token token in get_tokens (filename)) {
+                if (token.get_user_arg0 () == username) {
+                    return token;
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/shared/PAM/Token.vala'
--- src/shared/PAM/Token.vala	1970-01-01 00:00:00 +0000
+++ src/shared/PAM/Token.vala	2016-08-30 20:17:54 +0000
@@ -0,0 +1,190 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 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.PAM {
+    public enum DayType {
+        UNKNOWN,
+        ALL,
+        WEEKDAY,
+        WEEKEND;
+
+        public static DayType to_enum (string str) {
+            switch (str) {
+                case "Al":
+                    return ALL;
+                case "Wk":
+                    return WEEKDAY;
+                case "Wd":
+                    return WEEKEND;
+                default:
+                    return UNKNOWN;
+            }
+        }
+
+        public string to_string () {
+            switch (this) {
+                case ALL:
+                    return "Al";
+                case WEEKDAY:
+                    return "Wk";
+                case WEEKEND:
+                    return "Wd";
+                default:
+                case UNKNOWN:
+                    return "unknown";                
+            }
+        }
+    }
+
+    public class TimeInfo {
+        public DayType day_type = DayType.UNKNOWN;
+        public string from = "";
+        public string to = "";
+    }
+
+    public class Token : Object {
+        private const int SERVICES_INDEX = 0;
+        private const int TTYS_INDEX = 1;
+        private const int USERS_INDEX = 2;
+        private const int TIMES_INDEX = 3;
+
+        private const string TYPE_SEPARATOR = ";";
+        private const string LIST_SEPARATOR = "|";
+
+        public string[] services;
+        public string[] ttys;
+        public string[] users;
+        public string[] times;
+
+        public static Token? parse_line (string line) {
+            string[] strv = line.split (TYPE_SEPARATOR);
+            if (strv.length != 4) {
+                return null;
+            }
+
+            var token = new Token ();
+            token.services = strv[SERVICES_INDEX].split (LIST_SEPARATOR);
+            token.ttys = strv[TTYS_INDEX].split (LIST_SEPARATOR);
+            token.users = strv[USERS_INDEX].split (LIST_SEPARATOR);
+            token.times = strv[TIMES_INDEX].split (LIST_SEPARATOR);
+            return token;
+        }
+
+        public static List<Token> parse (string str) {
+            var list = new List<Token> ();
+
+            foreach (string line in str.split ("\n")) {
+                var token = parse_line (line);
+                if (token != null) {
+                    list.append (token);
+                }
+            }
+
+            return list;
+        }
+
+        public static string construct_pam_restriction (string[] services, string[] ttys, string users[], string[] times) {
+            string services_str = string.joinv (LIST_SEPARATOR, services);
+            string ttys_str = string.joinv (LIST_SEPARATOR, ttys);
+            string users_str = string.joinv (LIST_SEPARATOR, users);
+            string times_str = string.joinv (LIST_SEPARATOR, times);
+
+            return "%s;%s;%s;%s".printf (services_str, ttys_str, users_str, times_str);
+        }
+
+        public static string construct_pam_restriction_simple (string[] users, string[] times) {
+            return construct_pam_restriction ({ "*" }, { "*" }, users, times);
+        }
+
+        public List<TimeInfo> get_times_info () {
+            var list = new List<TimeInfo> ();
+
+            if (times.length == 0) {
+                return list;
+            }
+
+            foreach (string time in times) {
+                string[] bounds = time.substring (2).split ("-");
+                if (bounds.length < 2) {
+                    continue;
+                }
+
+                var info = new TimeInfo ();
+                info.day_type = DayType.to_enum (time.slice (0, 2));
+                info.from = bounds[0];
+                info.to = bounds[1];
+                
+                list.append (info);
+            }
+
+            return list;
+        }
+
+        public string get_user_arg0 () {
+            if (users.length == 0) {
+                return "";
+            }
+
+            return users[0];
+        }
+
+        public string to_string () {
+            return construct_pam_restriction (services, ttys, users, times);
+        }
+
+        public void get_weekday_hours (out int from, out int to) {
+            if (times.length < 1) {
+                from = 0;
+                to = 0;
+                return;
+            }
+
+            string[] bounds = times[0].substring (2).split ("-");
+            if (bounds.length < 2) {
+                from = 0;
+                to = 0;                
+                return;
+            }
+
+            from = int.parse (bounds[0]);
+            to = int.parse (bounds[1]);
+        }
+
+        public void get_weekend_hours (out int from, out int to) {
+            if (times.length < 2) {
+                from = 0;
+                to = 0;
+                return;
+            }
+
+            string[] bounds = times[1].split ("-");
+            if (bounds.length < 2) {
+                from = 0;
+                to = 0;
+                return;                
+            }
+
+            from = int.parse (bounds[0]);
+            to = int.parse (bounds[1]);
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/shared/PAM/Writer.vala'
--- src/shared/PAM/Writer.vala	1970-01-01 00:00:00 +0000
+++ src/shared/PAM/Writer.vala	2016-08-30 20:17:54 +0000
@@ -0,0 +1,110 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2015 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.PAM {
+    public class Writer : Object {
+        private string filename;
+
+        public static Writer new_for_time () {
+            return new Writer (Vars.PAM_TIME_CONF_PATH);
+        }
+
+        public Writer (string filename) {
+            this.filename = filename;
+        }
+
+        public void add_restriction_for_user (string input, bool clean) {
+            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);
+                    }
+                }   
+            }
+
+            string contents;
+            try {
+                FileUtils.get_contents (filename, out contents);
+            } catch (FileError e) {
+                warning (e.message);
+                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 {
+                builder.append ("\n");
+            }
+
+            builder.append (input);
+            builder.append ("\n");
+            builder.append (Vars.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));
+                }
+            } catch (FileError e) {
+                warning ("%s\n", e.message);
+            }
+        }
+
+        public void remove_restriction_for_user (string username) {
+            string contents;
+            try {
+                FileUtils.get_contents (filename, out contents);
+            } catch (FileError e) {
+                warning (e.message);
+                return;
+            }
+
+            string config = Reader.get_config (contents);
+
+            if (config == "") {
+                return;
+            }
+
+            string buffer = "";
+
+            foreach (string line in config.split ("\n")) {
+                var token = Token.parse_line (line);
+                if (token != null && token.get_user_arg0 () != username) {
+                    buffer += line;
+                }
+            }
+
+            try {
+                FileUtils.set_contents (filename, contents.replace (config, buffer));
+            } catch (FileError e) {
+                warning ("%s\n", e.message);
+            }
+        }        
+    }
+}
\ No newline at end of file

=== removed file 'src/shared/PAMControl.vala'
--- src/shared/PAMControl.vala	2016-02-21 18:52:25 +0000
+++ src/shared/PAMControl.vala	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/*-
- * Copyright (c) 2015 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 {
-    public class PAMRestrictInfo : Object {
-        public string user;
-        public string day_id;
-        public string weekday_hours;
-        public string weekend_hours;  
-        public string from;
-        public string to;
-    }
-
-    public class PAMControl : Object {
-        private static string get_conf_section () {
-            string contents = "";
-            try {
-                FileUtils.get_contents ("/etc/security/time.conf", out contents);
-            } catch (FileError e) {
-                warning ("%s\n", e.message);
-            }
-            
-            try {
-                var regex = new Regex (Vars.PAM_CONF_REGEX);
-
-                if (regex.match (contents)) {
-                    int i = 0;
-                    foreach (string str in regex.split (contents)) {
-                        // Do not replace the contents of the PC plug section
-                        if (i != 1) {
-                            contents = contents.replace (str, "");
-                        }
-
-                        i++;
-                    }
-                } else {
-                    return "";
-                }
-            } catch (RegexError e) {
-                warning ("%s\n", e.message);
-            }
-
-
-            return contents;
-        }
-
-        public static List<PAMRestrictInfo?> get_all_restrictions () {
-            var retval = new List<PAMRestrictInfo?> ();
-            string conf = get_conf_section ();
-
-            foreach (string line in conf.split ("\n")) {
-                if (!line.has_prefix ("#")) {
-                    var restrict_info = new PAMRestrictInfo ();
-                    string[] units = line.split (";");
-                    if (units.length >= 4) {
-                        restrict_info.user = units[2];
-                        string time = units[3];
-                        time = time.replace ("!", "");
-
-                        char[] time_chars = time.to_utf8 ();
-                        string day = time_chars[0].to_string () + time_chars[1].to_string ();
-                        switch (day.down ()) {
-                            case "al":
-                                restrict_info.day_id = "all";
-                                break;
-                            case "wk":
-                                restrict_info.day_id = "weekdays";
-                                break;
-                            case "wd":
-                                restrict_info.day_id = "weekends";
-                                break;
-                            default:
-                                restrict_info.day_id = "";
-                                break;
-                        }
-
-                        string hours = time.replace (day, "");
-                        string[] tmp = {}; 
-                        if ("|" in hours) {
-                            tmp = hours.split ("|");
-                            restrict_info.weekday_hours = tmp[0];
-                            restrict_info.weekend_hours = tmp[1];
-                        } else {
-                            tmp = hours.split ("-");
-                            restrict_info.from = tmp[0];
-                            restrict_info.to = tmp[1];
-                        }
-
-                        retval.append (restrict_info);
-                    }
-                }
-            }
-
-            return retval;
-        }
-
-        public static void try_add_restrict_line (string user_name, string restrict) {
-            if (Utils.get_permission ().allowed) {            
-                Utils.call_cli ({"--user", user_name, "--restrict-pam-line", restrict});
-            }
-        }
-
-        public static void try_remove_user_restrict (string user_name) {
-            if (Utils.get_permission ().allowed) {            
-                Utils.call_cli ({"--user", user_name, "--remove-restrict"});
-            }            
-        }
-    }
-}
\ No newline at end of file

=== modified file 'src/shared/Utils.vala'
--- src/shared/Utils.vala	2016-07-27 16:14:53 +0000
+++ src/shared/Utils.vala	2016-08-30 20:17:54 +0000
@@ -27,11 +27,62 @@
         public abstract void printer_set_users_denied (string printer, string[] users) throws IOError;
     }
 
-    public class Utils : Object {
-        public static Polkit.Permission? permission = null;
-        public static string user_name;
-
+    [DBus (name = "org.pantheon.ParentalControls")]
+    public interface IParentalControls : Object {
+        public abstract async void add_restriction_for_user (string input, bool clean) throws IOError;
+        public abstract async void remove_restriction_for_user (string username) throws IOError;
+        public abstract async void end_app_authorization () throws IOError;
+        public abstract async bool get_user_daemon_active (string username) throws IOError;
+        public abstract async bool get_user_daemon_admin (string username) throws IOError;
+        public abstract async string[] get_user_daemon_block_urls (string username) throws IOError;
+        public abstract async string[] get_user_daemon_targets (string username) throws IOError;
+        public abstract async void lock_dock_icons_for_user (string username, bool lock) throws IOError;
+        public abstract async void set_user_daemon_active (string username, bool active) throws IOError;
+        public abstract async void set_user_daemon_admin (string username, bool admin) throws IOError;
+        public abstract async void set_user_daemon_block_urls (string username, string[] block_urls) throws IOError;
+        public abstract async void set_user_daemon_targets (string username, string[] targets) throws IOError;
+
+        public signal void app_authorize (string username, string path, string action_id);
+        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 class Utils {
+        public class DummyParentalControls : Object, IParentalControls  {
+            public async void add_restriction_for_user (string input, bool clean) throws IOError {}
+            public async void remove_restriction_for_user (string username) throws IOError {}
+            public async void end_app_authorization () throws IOError {}
+            public async bool get_user_daemon_active (string username) throws IOError { return false; }
+            public async bool get_user_daemon_admin (string username) throws IOError { return false; }
+            public async string[] get_user_daemon_block_urls (string username) throws IOError { return {}; }
+            public async string[] get_user_daemon_targets (string username) throws IOError { return {}; }
+            public async void lock_dock_icons_for_user (string username, bool lock) throws IOError {}
+            public async void set_user_daemon_active (string username, bool active) throws IOError {}
+            public async void set_user_daemon_admin (string username, bool admin) throws IOError {}
+            public async void set_user_daemon_block_urls (string username, string[] block_urls) throws IOError {}
+            public async void set_user_daemon_targets (string username, string[] targets) throws IOError {}    
+        }
+
+        private static Polkit.Permission? permission = null;
         private static Act.UserManager? usermanager = null;
+        private static IParentalControls? api = null;
+
+        public static IParentalControls? get_api () {
+            if (api != null) {
+                return api;
+            }
+
+            try {
+                api = Bus.get_proxy_sync (BusType.SYSTEM, Vars.PARENTAL_CONTROLS_IFACE, Vars.PARENTAL_CONTROLS_OBJECT_PATH);
+            } catch (Error e) {
+                critical ("%s, using dummy parental controls backend", e.message);
+                api = new DummyParentalControls ();
+            }
+
+            return api;
+        }
 
         public static Polkit.Permission? get_permission () {
             if (permission != null) {
@@ -39,9 +90,9 @@
             }
 
             try {
-                var user = (Polkit.UnixUser)Polkit.UnixUser.new_for_name (user_name);
+                var user = (Polkit.UnixUser)Polkit.UnixUser.new_for_name (Environment.get_user_name ());
                 permission = new Polkit.Permission.sync (Vars.PARENTAL_CONTROLS_ACTION_ID,
-                                        Polkit.UnixProcess.new_for_owner (Posix.getpid (), 0, user.get_uid ()));
+                                Polkit.UnixProcess.new_for_owner (Posix.getpid (), 0, user.get_uid ()));
                 return permission;
             } catch (Error e) {
                 critical (e.message);
@@ -56,29 +107,6 @@
             return @"<span font_weight=\"bold\" size=\"large\">$escaped_name</span>\n$escaped_comment";
         }
 
-        public static void call_cli (string[] args) {
-            string[] spawn_args = { "pkexec", "pantheon-parental-controls-cli" };
-            foreach (string arg in args) {
-                spawn_args += arg;
-            }
-
-            try {
-                Pid child_pid;
-                Process.spawn_async ("/",
-                                    spawn_args,
-                                    Environ.get (),
-                                    SpawnFlags.SEARCH_PATH | SpawnFlags.DO_NOT_REAP_CHILD,
-                                    null,
-                                    out child_pid);
-                ChildWatch.add (child_pid, (pid, status) => {
-                    Process.close_pid (pid);
-                });
-
-            } catch (SpawnError e) {
-                warning ("%s\n", e.message);
-            }
-        }
-
         public static unowned Act.UserManager? get_usermanager () {
             if (usermanager != null) {
                 return usermanager;
@@ -89,15 +117,24 @@
         }
 
         public static unowned Act.User? get_current_user () {
-            return get_usermanager ().get_user (user_name);
+            return get_usermanager ().get_user (Environment.get_user_name ());
+        }
+
+        public static string remove_comments (string str) {
+            string buffer = "";
+
+            foreach (string line in str.split ("\n")) {
+                if (!line.strip ().has_prefix ("#")) {
+                    buffer += line;
+                    buffer += "\n";
+                }
+            }
+
+            return buffer;
         }
 
         public static string build_daemon_conf_path (Act.User user) {
             return Path.build_filename (user.get_home_dir (), Vars.DAEMON_CONF_DIR);
         }
-
-        public static void set_user_name (string _user_name) {
-            user_name = _user_name;
-        }
     }
 }

=== modified file 'src/shared/Vars.vala'
--- src/shared/Vars.vala	2016-07-27 16:14:53 +0000
+++ src/shared/Vars.vala	2016-08-30 20:17:54 +0000
@@ -41,7 +41,5 @@
     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_TIME_CONF_PATH = "/etc/security/time.conf";
 }
\ No newline at end of file