Fix gsettings_applier arrays processing for machine

dist/gpupdate-remote-policy

@@ -1,4 +0,0 @@
-#%PAM-1.0
-#auth		optional	pam_mount.so
-session		required	pam_mkhomedir.so silent
-#session		optional	pam_mount.so

dist/gpupdate-scripts-run-user.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Run Group Policy scripts for a user
-After=gpupdate-user.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/libexec/gpupdate/scripts_runner --mode USER --action LOGON --user %u
-ExecStop=/usr/libexec/gpupdate/scripts_runner --mode USER --action LOGOFF --user %u
-
-[Install]
-WantedBy=default.target

dist/gpupdate-scripts-run.service

@@ -1,15 +0,0 @@
-[Unit]
-Description=Running Group Policy Scripts
-After=gpupdate.service
-
-[Service]
-Environment=PATH=/bin:/sbin:/usr/bin:/usr/sbin
-UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/libexec/gpupdate/scripts_runner --mode MACHINE --action STARTUP
-ExecStop=/usr/libexec/gpupdate/scripts_runner --mode MACHINE --action SHUTDOWN
-StandardOutput=journal
-
-[Install]
-WantedBy=multi-user.target

dist/gpupdate-user.service

@@ -4,10 +4,13 @@ Description=gpupdate in userspace
 
 # gpupdate on Windows runs once per hour
 [Service]
-Environment=PATH=/bin:/sbin:/usr/bin:/usr/sbin
-UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
-Type=oneshot
-ExecStart=/usr/bin/gpupdate --target USER
+Environment="PATH=/bin:/sbin:/usr/bin:/usr/sbin"
+Type=simple
+RestartSec=3600
+TimeoutSec=3000
+Restart=always
+ExecStart=/usr/sbin/gpoa
 
 [Install]
 WantedBy=default.target
+

dist/gpupdate-user.timer

@@ -1,9 +0,0 @@
-[Unit]
-Description=Run gpupdate-user every hour
-
-[Timer]
-OnStartupSec=1
-OnUnitActiveSec=60min
-
-[Install]
-WantedBy=timers.target

dist/gpupdate.ini

@@ -1,4 +1,4 @@
 [gpoa]
 backend = local
-local-policy-default = default
-local-policy = False
+local-policy = default
+

dist/gpupdate.service

@@ -3,9 +3,11 @@ Description=Group policy update for machine
 After=syslog.target network-online.target sssd.service
 
 [Service]
-Environment=PATH=/bin:/sbin:/usr/bin:/usr/sbin
-UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
-Type=oneshot
+Environment="PATH=/bin:/sbin:/usr/bin:/usr/sbin"
+Type=simple
+RestartSec=3600
+TimeoutSec=3000
+Restart=always
 ExecStart=/usr/bin/gpupdate
 StandardOutput=journal
 

dist/gpupdate.timer

@@ -1,9 +0,0 @@
-[Unit]
-Description=Run gpupdate every hour
-
-[Timer]
-OnStartupSec=1
-OnUnitActiveSec=60min
-
-[Install]
-WantedBy=timers.target

dist/system-policy-gpupdate

@@ -1,6 +1,6 @@
 #%PAM-1.0
 session		[success=2 perm_denied=ignore default=die]	pam_localuser.so
-session		substack	gpupdate-remote-policy
+session		required	pam_mkhomedir.so silent
 session		[default=1]	pam_permit.so
 session		[default=6]	pam_permit.so
 session		[success=1 default=ignore]	pam_succeed_if.so user ingroup users quiet

gpoa/backend/__init__.py

@@ -44,7 +44,7 @@ def backend_factory(dc, username, is_machine, no_domain = False):
         ldata = dict({'domain': domain, "username": username, 'is_machine': is_machine})
         log('D9', ldata)
         try:
-            back = samba_backend(sc, username, domain, is_machine, config.get_local_policy())
+            back = samba_backend(sc, username, domain, is_machine)
         except Exception as exc:
             logdata = dict({'error': str(exc)})
             log('E7', logdata)
@@ -52,7 +52,7 @@ def backend_factory(dc, username, is_machine, no_domain = False):
     if config.get_backend() == 'local' or no_domain:
         log('D8')
         try:
-            back = nodomain_backend(username, is_machine, config.get_local_policy())
+            back = nodomain_backend()
         except Exception as exc:
             logdata = dict({'error': str(exc)})
             log('E8', logdata)

gpoa/backend/nodomain_backend.py

@@ -21,17 +21,17 @@ import os
 
 from .applier_backend import applier_backend
 from storage import registry_factory
-from gpt.gpt import gpt, get_local_default_gpt, get_local_policy_gpt
+from gpt.gpt import gpt, get_local_gpt
 from util.util import (
     get_machine_name
 )
-from util.sid import get_sid
+from util.windows import get_sid
 import util.preg
 from util.logging import slogm
 
 class nodomain_backend(applier_backend):
 
-    def __init__(self, username, is_machine, local_admin):
+    def __init__(self):
         domain = None
         machine_name = get_machine_name()
         machine_sid = get_sid(domain, machine_name, True)
@@ -39,14 +39,10 @@ class nodomain_backend(applier_backend):
         self.storage.set_info('domain', domain)
         self.storage.set_info('machine_name', machine_name)
         self.storage.set_info('machine_sid', machine_sid)
-        self.local_admin = local_admin
 
         # User SID to work with HKCU hive
-        if is_machine:
-            self.sid = machine_sid
-        else:
-            self.sid = get_sid(domain, username)
-        self.username = username
+        self.username = machine_name
+        self.sid = machine_sid
 
     def retrieve_and_store(self):
         '''
@@ -55,9 +51,6 @@ class nodomain_backend(applier_backend):
         # Get policies for machine at first.
         self.storage.wipe_hklm()
         self.storage.wipe_user(self.storage.get_info('machine_sid'))
-        local_policy = get_local_default_gpt(self.sid)
-        local_policy.merge_machine()
-        if self.local_admin:
-            local_admin_policy = get_local_policy_gpt(self.sid)
-            local_admin_policy.merge_machine()
-            local_admin_policy.merge_user()
+        local_policy = get_local_gpt(self.sid)
+        local_policy.merge()
+

gpoa/backend/samba_backend.py

@@ -18,11 +18,11 @@
 
 import os
 # Facility to determine GPTs for user
-from samba.gpclass import check_safe_path
+from samba.gpclass import check_safe_path, check_refresh_gpo_list
 
 from .applier_backend import applier_backend
 from storage import cache_factory, registry_factory
-from gpt.gpt import gpt, get_local_default_gpt, get_local_policy_gpt
+from gpt.gpt import gpt, get_local_gpt
 from util.util import (
     get_machine_name,
     is_machine_name
@@ -31,14 +31,13 @@ from util.kerberos import (
       machine_kinit
     , machine_kdestroy
 )
-from util.sid import get_sid
+from util.windows import get_sid
 import util.preg
 from util.logging import log
 
 class samba_backend(applier_backend):
-    __user_policy_mode_key = 'Software\\Policies\\Microsoft\\Windows\\System\\UserPolicyMode'
 
-    def __init__(self, sambacreds, username, domain, is_machine, local_admin):
+    def __init__(self, sambacreds, username, domain, is_machine):
         self.cache_path = '/var/cache/gpupdate/creds/krb5cc_{}'.format(os.getpid())
         self.__kinit_successful = machine_kinit(self.cache_path)
         if not self.__kinit_successful:
@@ -49,7 +48,7 @@ class samba_backend(applier_backend):
         machine_sid = get_sid(domain, machine_name, is_machine)
         self.storage.set_info('machine_name', machine_name)
         self.storage.set_info('machine_sid', machine_sid)
-        self.local_admin = local_admin
+
         # User SID to work with HKCU hive
         self.username = username
         self._is_machine_username = is_machine
@@ -72,22 +71,6 @@ class samba_backend(applier_backend):
         if self.__kinit_successful:
             machine_kdestroy()
 
-    def get_policy_mode(self):
-        '''
-        Get UserPolicyMode parameter value in order to determine if it
-        is possible to work with user's part of GPT. This value is
-        checked only if working for user's SID.
-        '''
-        upm = self.storage.get_hklm_entry(self.__user_policy_mode_key)
-        if upm and upm.data:
-            upm = int(upm.data)
-            if upm < 0 or upm > 2:
-                upm = 0
-        else:
-            upm = 0
-
-        return upm
-
     def retrieve_and_store(self):
         '''
         Retrieve settings and strore it in a database
@@ -99,21 +82,19 @@ class samba_backend(applier_backend):
         except Exception as exc:
             log('F2')
             raise exc
-
-        if self._is_machine_username:
-            self.storage.wipe_hklm()
-            self.storage.wipe_user(self.storage.get_info('machine_sid'))
-            for gptobj in machine_gpts:
-                try:
-                    gptobj.merge_machine()
-                except Exception as exc:
-                    logdata = dict()
-                    logdata['msg'] = str(exc)
-                    log('E26', logdata)
+        self.storage.wipe_hklm()
+        self.storage.wipe_user(self.storage.get_info('machine_sid'))
+        for gptobj in machine_gpts:
+            try:
+                gptobj.merge()
+            except Exception as exc:
+                logdata = dict()
+                logdata['msg'] = str(exc)
+                log('E26', logdata)
 
         # Load user GPT values in case user's name specified
         # This is a buggy implementation and should be tested more
-        else:
+        if not self._is_machine_username:
             user_gpts = list()
             try:
                 user_gpts = self._get_gpts(self.username, self.sid)
@@ -121,30 +102,13 @@ class samba_backend(applier_backend):
                 log('F3')
                 raise exc
             self.storage.wipe_user(self.sid)
-
-            # Merge user settings if UserPolicyMode set accordingly
-            # and user settings (for HKCU) are exist.
-            policy_mode = self.get_policy_mode()
-            logdata = dict({'mode': upm2str(policy_mode), 'sid': self.sid})
-            log('D152', logdata)
-
-            if policy_mode < 2:
-                for gptobj in user_gpts:
-                    try:
-                        gptobj.merge_user()
-                    except Exception as exc:
-                        logdata = dict()
-                        logdata['msg'] = str(exc)
-                        log('E27', logdata)
-
-            if policy_mode > 0:
-                for gptobj in machine_gpts:
-                    try:
-                        gptobj.merge_user()
-                    except Exception as exc:
-                        logdata = dict()
-                        logdata['msg'] = str(exc)
-                        log('E63', logdata)
+            for gptobj in user_gpts:
+                try:
+                    gptobj.merge()
+                except Exception as exc:
+                    logdata = dict()
+                    logdata['msg'] = str(exc)
+                    log('E27', logdata)
 
     def _check_sysvol_present(self, gpo):
         '''
@@ -176,23 +140,8 @@ class samba_backend(applier_backend):
                 obj.set_name(gpo.display_name)
                 gpts.append(obj)
             else:
-                if self.local_admin:
-                    gpts.append(get_local_policy_gpt(sid))
                 if 'Local Policy' == gpo.name:
-                    gpts.append(get_local_default_gpt(sid))
+                    gpts.append(get_local_gpt(sid))
 
         return gpts
 
-def upm2str(upm_num):
-    '''
-    Translate UserPolicyMode to string.
-    '''
-    result = 'Not configured'
-
-    if upm_num in [1, '1']:
-        result = 'Replace'
-
-    if upm_num in [2, '2']:
-        result = 'Merge'
-
-    return result

gpoa/frontend/appliers/control.py

@@ -19,7 +19,7 @@
 import subprocess
 import threading
 import logging
-from util.logging import slogm, log
+from util.logging import slogm
 
 def control_subst(preg_name):
     '''
@@ -55,12 +55,10 @@ class control:
         values = list()
 
         popen_call = ['/usr/sbin/control', self.control_name, 'list']
-        with subprocess.Popen(popen_call, stdout=subprocess.PIPE, stderr=subprocess.PIPE) as proc:
+        with subprocess.Popen(popen_call, stdout=subprocess.PIPE) as proc:
             values = proc.stdout.readline().decode('utf-8').split()
-            valErr = proc.stderr.readline().decode('utf-8')
-            if valErr:
-                raise ValueError(valErr)
             proc.wait()
+
         return values
 
     def _map_control_status(self, int_status):
@@ -70,11 +68,7 @@ class control:
         try:
             str_status = self.possible_values[int_status]
         except IndexError as exc:
-            logdata = dict()
-            logdata['control'] = self.control_name
-            logdata['value from'] = self.possible_values
-            logdata['by index'] = int_status
-            log('E41', )
+            logging.error(slogm('Error getting control ({}) value from {} by index {}'.format(self.control_name, self.possible_values, int_status)))
             str_status = None
 
         return str_status
@@ -99,30 +93,20 @@ class control:
         if type(self.control_value) == int:
             status = self._map_control_status(self.control_value)
             if status == None:
-                logdata = dict()
-                logdata['control'] = self.control_name
-                logdata['inpossible values'] = self.self.control_value
-                log('E42', logdata)
+                logging.error(slogm('\'{}\' is not in possible values for control {}'.format(self.control_value, self.control_name)))
                 return
         elif type(self.control_value) == str:
             if self.control_value not in self.possible_values:
-                logdata = dict()
-                logdata['control'] = self.control_name
-                logdata['inpossible values'] = self.self.control_value
-                log('E59', logdata)
+                logging.error(slogm('\'{}\' is not in possible values for control {}'.format(self.control_value, self.control_name)))
                 return
             status = self.control_value
-        logdata = dict()
-        logdata['control'] = self.control_name
-        logdata['status'] = status
-        log('D68', logdata)
+
+        logging.debug(slogm('Setting control {} to {}'.format(self.control_name, status)))
 
         try:
             popen_call = ['/usr/sbin/control', self.control_name, status]
             with subprocess.Popen(popen_call, stdout=subprocess.PIPE) as proc:
                 proc.wait()
         except:
-            logdata = dict()
-            logdata['control'] = self.control_name
-            logdata['status'] = status
-            log('E43', logdata)
+            logging.error(slogm('Unable to set {} to {}'.format(self.control_name, status)))
+

gpoa/frontend/appliers/folder.py

@@ -27,25 +27,24 @@ from gpt.folders import (
 from util.windows import expand_windows_var
 
 def remove_dir_tree(path, delete_files=False, delete_folder=False, delete_sub_folders=False):
-    content = list()
     for entry in path.iterdir():
-        content.append(entry)
-        if entry.is_file() and delete_files:
+        if entry.is_file():
             entry.unlink()
-            content.remove(entry)
-        if entry.is_dir() and delete_sub_folders:
-            content.remove(entry)
-            remove_dir_tree(entry, delete_files, delete_folder, delete_sub_folders)
-    if delete_folder and not content:
+        if entry.is_dir():
+            if delete_sub_folders:
+                remove_dir_tree(entry,
+                    delete_files,
+                    delete_folder,
+                    delete_sub_folders)
+
+    if delete_folder:
         path.rmdir()
 
-
 def str2bool(boolstr):
-    if boolstr.lower() in ['true', 'yes', '1']:
+    if boolstr.lower in ['true', 'yes', '1']:
         return True
     return False
 
-
 class Folder:
     def __init__(self, folder_object, username):
         self.folder_path = Path(expand_windows_var(folder_object.path, username).replace('\\', '/'))
@@ -58,11 +57,10 @@ class Folder:
         self.folder_path.mkdir(parents=True, exist_ok=True)
 
     def _delete_action(self):
-        if self.folder_path.exists():
-            remove_dir_tree(self.folder_path,
-                self.delete_files,
-                self.delete_folder,
-                self.delete_sub_folders)
+        remove_dir_tree(self.folder_path,
+            self.delete_files,
+            self.delete_folders,
+            self.delete_sub_folders)
 
     def act(self):
         if self.action == FileAction.CREATE:

gpoa/frontend/appliers/gsettings.py

@@ -21,7 +21,7 @@ import os
 import logging
 from gi.repository import Gio, GLib
 
-from util.logging import slogm, log
+from util.logging import slogm
 
 class system_gsetting:
     def __init__(self, schema, path, value, lock, helper_function=None):
@@ -59,27 +59,21 @@ class system_gsettings:
         self.override_file_path = override_file_path
 
     def append(self, schema, path, data, lock, helper):
-        if check_existing_gsettings(schema, path):
-            self.gsettings.append(system_gsetting(schema, path, data, lock, helper))
-        else:
-            logdata = dict()
-            logdata['schema'] = schema
-            logdata['path'] = path
-            logdata['data'] = data
-            logdata['lock'] = lock
-            log('D150', logdata)
+        self.gsettings.append(system_gsetting(schema, path, data, lock, helper))
+
+    def pop(self):
+        self.gsettings.pop()
 
     def apply(self):
         config = configparser.ConfigParser()
 
         for gsetting in self.gsettings:
-            logdata = dict()
-            logdata['gsetting.schema'] = gsetting.schema
-            logdata['gsetting.path'] = gsetting.path
-            logdata['gsetting.value'] = gsetting.value
-            logdata['gsetting.lock'] = gsetting.lock
             settings = Gio.Settings(schema=gsetting.schema)
-            log('D89', logdata)
+            logging.debug(slogm('Applying machine setting {}.{} to {} {}'.format(gsetting.schema,
+                                                                                 gsetting.path,
+                                                                                 gsetting.value,
+                                                                                 gsetting.value,
+                                                                                 'locked' if gsetting.lock else 'unlocked')))
             gsetting.apply(settings, config, self.locks)
 
         with open(self.override_file_path, 'w') as f:
@@ -123,38 +117,6 @@ def glib_value(schema, path, value, settings):
     # Build the new value with the determined type
     return glib_map(value, glib_value_type)
 
-def check_existing_gsettings (schema, path):
-    source = Gio.SettingsSchemaSource.get_default()
-    sourceSchema = (source.lookup(schema, False))
-    if bool(sourceSchema) and sourceSchema.has_key(path):
-        return True
-    else:
-        return False
-
-class user_gsettings:
-    def __init__(self):
-        self.gsettings = list()
-
-    def append(self, schema, path, value, helper=None):
-        if check_existing_gsettings(schema, path):
-            self.gsettings.append(user_gsetting(schema, path, value, helper))
-        else:
-            logdata = dict()
-            logdata['schema'] = schema
-            logdata['path'] = path
-            logdata['data'] = value
-            log('D151', logdata)
-
-    def apply(self):
-        for gsetting in self.gsettings:
-            logdata = dict()
-            logdata['gsetting.schema'] = gsetting.schema
-            logdata['gsetting.path'] = gsetting.path
-            logdata['gsetting.value'] = gsetting.value
-            log('D85', logdata)
-            gsetting.apply()
-
-
 class user_gsetting:
     def __init__(self, schema, path, value, helper_function=None):
         self.schema = schema

gpoa/frontend/appliers/polkit.py

@@ -20,7 +20,7 @@ import os
 import jinja2
 import logging
 
-from util.logging import slogm, log
+from util.logging import slogm
 
 class polkit:
     __template_path = '/usr/share/gpupdate/templates'
@@ -46,13 +46,7 @@ class polkit:
             with open(self.outfile, 'w') as f:
                 f.write(text)
 
-            logdata = dict()
-            logdata['file'] = self.outfile
-            logdata['arguments'] = self.args
-            log('D77', logdata)
+            logging.debug(slogm('Generated file {} with arguments {}'.format(self.outfile, self.args)))
         except Exception as exc:
-            logdata = dict()
-            logdata['file'] = self.outfile
-            logdata['arguments'] = self.args
-            log('E44', logdata)
+            logging.error(slogm('Unable to generate file {} from {}'.format(self.outfile, self.infilename)))
 

gpoa/frontend/appliers/systemd.py

@@ -19,7 +19,7 @@
 import dbus
 import logging
 
-from util.logging import slogm, log
+from util.logging import slogm
 
 class systemd_unit:
     def __init__(self, unit_name, state):
@@ -39,9 +39,7 @@ class systemd_unit:
             self.manager.UnmaskUnitFiles([self.unit_name], dbus.Boolean(False))
             self.manager.EnableUnitFiles([self.unit_name], dbus.Boolean(False), dbus.Boolean(True))
             self.manager.StartUnit(self.unit_name, 'replace')
-            logdata = dict()
-            logdata['unit'] = self.unit_name
-            log('I6', logdata)
+            logging.info(slogm('Starting systemd unit: {}'.format(self.unit_name)))
 
             # In case the service has 'RestartSec' property set it
             # switches to 'activating (auto-restart)' state instead of
@@ -49,23 +47,17 @@ class systemd_unit:
             service_state = self._get_state()
 
             if not service_state in ['active', 'activating']:
-                logdata = dict()
-                logdata['unit'] = self.unit_name
-                log('E46', logdata)
+                logging.error(slogm('Unable to start systemd unit {}'.format(self.unit_name)))
         else:
             self.manager.StopUnit(self.unit_name, 'replace')
             self.manager.DisableUnitFiles([self.unit_name], dbus.Boolean(False))
             self.manager.MaskUnitFiles([self.unit_name], dbus.Boolean(False), dbus.Boolean(True))
-            logdata = dict()
-            logdata['unit'] = self.unit_name
-            log('I6', logdata)
+            logging.info(slogm('Stopping systemd unit: {}'.format(self.unit_name)))
 
             service_state = self._get_state()
 
             if not service_state in ['stopped']:
-                logdata = dict()
-                logdata['unit'] = self.unit_name
-                log('E46', logdata)
+                logging.error(slogm('Unable to stop systemd unit {}'.format(self.unit_name)))
 
     def _get_state(self):
         '''

gpoa/frontend/chromium_applier.py

@@ -24,8 +24,9 @@ from .applier_frontend import (
 import logging
 import json
 import os
-from util.logging import slogm, log
-from util.util import is_machine_name, get_homedir, mk_homedir_path
+
+from util.logging import slogm
+from util.util import is_machine_name
 
 class chromium_applier(applier_frontend):
     __module_name = 'ChromiumApplier'
@@ -56,7 +57,7 @@ class chromium_applier(applier_frontend):
 
     def get_hkcu_string_entry(self, hive_subkey):
         query_str = '{}\\{}'.format(self.__registry_branch, hive_subkey)
-        return self.storage.get_hkcu_entry(self.sid, query_str)
+        return self.storage.get_hkcu_entry(sid, query_str)
 
     def get_hklm_string_entry_default(self, hive_subkey, default):
         '''
@@ -82,10 +83,7 @@ class chromium_applier(applier_frontend):
     def set_policy(self, name, obj):
         if obj:
             self.policies[name] = obj
-            logdata = dict()
-            logdata['name'] = name
-            logdata['set to'] = obj
-            log('I8', logdata)
+            logging.info(slogm('Chromium policy \'{}\' set to {}'.format(name, obj)))
 
     def set_user_policy(self, name, obj):
         '''
@@ -93,34 +91,26 @@ class chromium_applier(applier_frontend):
         a good practice and used mostly by various malware.
         '''
         if not self._is_machine_name:
-            prefdir = os.path.join(get_homedir(self.username), self.__user_settings)
+            prefdir = os.path.join(util.get_homedir(self.username), self.__user_settings)
             os.makedirs(prefdir, exist_ok=True)
 
             prefpath = os.path.join(prefdir, 'Preferences')
-            mk_homedir_path(self.username, self.__user_settings)
+            util.mk_homedir_path(self.username, self.__user_settings)
             settings = dict()
             try:
                 with open(prefpath, 'r') as f:
                     settings = json.load(f)
             except FileNotFoundError as exc:
-                logdata = dict()
-                logdata['prefpath'] = prefpath
-                log('E51', logdata)
+                logging.error(slogm('Chromium preferences file {} does not exist at the moment'.format(prefpath)))
             except:
-                logdata = dict()
-                logdata['username'] = self.username
-                log('E51', logdata)
+                logging.error(slogm('Error during attempt to read Chromium preferences for user {}'.format(self.username)))
 
             if obj:
                 settings[name] = obj
 
                 with open(prefpath, 'w') as f:
                     json.dump(settings, f)
-                logdata = dict()
-                logdata['user'] = self.username
-                logdata['name'] = name
-                logdata['set to'] = obj
-                log('I9', logdata)
+                logging.info(slogm('Set user ({}) property \'{}\' to {}'.format(self.username, name, obj)))
 
     def get_home_page(self, hkcu=False):
         response = self.get_hklm_string_entry('HomepageLocation')
@@ -140,9 +130,7 @@ class chromium_applier(applier_frontend):
         os.makedirs(self.__managed_policies_path, exist_ok=True)
         with open(destfile, 'w') as f:
             json.dump(self.policies, f)
-            logdata = dict()
-            logdata['destfile'] = destfile
-            log('D97', logdata)
+            logging.debug(slogm('Wrote Chromium preferences to {}'.format(destfile)))
 
     def user_apply(self):
         '''
@@ -155,10 +143,10 @@ class chromium_applier(applier_frontend):
         All actual job done here.
         '''
         if self.__module_enabled:
-            log('D95')
+            logging.debug(slogm('Running Chromium applier for machine'))
             self.machine_apply()
         else:
-            log('D96')
+            logging.debug(slogm('Chromium applier for machine will not be started'))
         #if not self._is_machine_name:
         #    logging.debug('Running user applier for Chromium')
         #    self.user_apply()

gpoa/frontend/cifs_applier.py

@@ -29,7 +29,7 @@ from .applier_frontend import (
 )
 from gpt.drives import json2drive
 from util.util import get_homedir
-from util.logging import slogm, log
+from util.logging import slogm
 
 def storage_get_drives(storage, sid):
     drives = storage.get_drives(sid)
@@ -157,8 +157,8 @@ class cifs_applier_user(applier_frontend):
 
     def admin_context_apply(self):
         if self.__module_enabled:
-            log('D146')
+            logging.debug(slogm('Running CIFS applier for user in administrator context'))
             self.__admin_context_apply()
         else:
-            log('D147')
+            logging.debug(slogm('CIFS applier for user in administrator context will not be started'))
 

gpoa/frontend/control_applier.py

@@ -21,7 +21,7 @@ from .applier_frontend import (
     , check_enabled
 )
 from .appliers.control import control
-from util.logging import slogm, log
+from util.logging import slogm
 
 import logging
 
@@ -46,27 +46,12 @@ class control_applier(applier_frontend):
             valuename = setting.hive_key.rpartition('\\')[2]
             try:
                 self.controls.append(control(valuename, int(setting.data)))
-                logdata = dict()
-                logdata['control'] = valuename
-                logdata['value'] = setting.data
-                log('I3', logdata)
+                logging.info(slogm('Working with control {}'.format(valuename)))
             except ValueError as exc:
-                try:
-                    ctl = control(valuename, setting.data)
-                except Exception as exc:
-                    logdata = {'Exception': exc}
-                    log('I3', logdata)
-                    continue
-                self.controls.append(ctl)
-                logdata = dict()
-                logdata['control'] = valuename
-                logdata['with string value'] = setting.data
-                log('I3', logdata)
+                self.controls.append(control(valuename, setting.data))
+                logging.info(slogm('Working with control {} with string value'.format(valuename)))
             except Exception as exc:
-                logdata = dict()
-                logdata['control'] = valuename
-                logdata['exc'] = exc
-                log('E39', logdata)
+                logging.info(slogm('Unable to work with control {}: {}'.format(valuename, exc)))
         #for e in polfile.pol_file.entries:
         #    print('{}:{}:{}:{}:{}'.format(e.type, e.data, e.valuename, e.keyname))
         for cont in self.controls:
@@ -77,7 +62,8 @@ class control_applier(applier_frontend):
         Trigger control facility invocation.
         '''
         if self.__module_enabled:
-            log('D67')
+            logging.debug(slogm('Running Control applier for machine'))
             self.run()
         else:
-            log('E40')
+            logging.debug(slogm('Control applier for machine will not be started'))
+

gpoa/frontend/cups_applier.py

@@ -28,7 +28,7 @@ from .applier_frontend import (
 )
 from gpt.printers import json2printer
 from util.rpm import is_rpm_installed
-from util.logging import slogm, log
+from util.logging import slogm
 
 def storage_get_printers(storage, sid):
     '''
@@ -79,7 +79,7 @@ class cups_applier(applier_frontend):
 
     def run(self):
         if not is_rpm_installed('cups'):
-            log('W9')
+            logging.warning(slogm('CUPS is not installed: no printer settings will be deployed'))
             return
 
         self.cups_connection = cups.Connection()
@@ -94,10 +94,10 @@ class cups_applier(applier_frontend):
         Perform configuration of printer which is assigned to computer.
         '''
         if self.__module_enabled:
-            log('D113')
+            logging.debug(slogm('Running CUPS applier for machine'))
             self.run()
         else:
-            log('D114')
+            logging.debug(slogm('CUPS applier for machine will not be started'))
 
 class cups_applier_user(applier_frontend):
     __module_name = 'CUPSApplierUser'
@@ -123,7 +123,7 @@ class cups_applier_user(applier_frontend):
 
     def run(self):
         if not is_rpm_installed('cups'):
-            log('W9')
+            logging.warning(slogm('CUPS is not installed: no printer settings will be deployed'))
             return
 
         self.cups_connection = cups.Connection()
@@ -138,8 +138,8 @@ class cups_applier_user(applier_frontend):
         Perform printer configuration assigned for user.
         '''
         if self.__module_enabled:
-            log('D115')
+            logging.debug(slogm('Running CUPS applier for user in administrator context'))
             self.run()
         else:
-            log('D116')
+            logging.debug(slogm('CUPS applier for user in administrator context will not be started'))
 

gpoa/frontend/envvar_applier.py

@@ -21,7 +21,7 @@ from .applier_frontend import (
     , check_enabled
 )
 from .appliers.envvar import Envvar
-from util.logging import slogm, log
+from util.logging import slogm
 
 import logging
 
@@ -38,11 +38,11 @@ class envvar_applier(applier_frontend):
 
     def apply(self):
         if self.__module_enabled:
-            log('D134')
+            logging.debug(slogm('Running Envvar applier for machine'))
             ev = Envvar(self.envvars, 'root')
             ev.act()
         else:
-            log('D135')
+            logging.debug(slogm('Envvar applier for machine will not be started'))
 
 class envvar_applier_user(applier_frontend):
     __module_name = 'EnvvarsApplierUser'
@@ -61,9 +61,9 @@ class envvar_applier_user(applier_frontend):
 
     def user_context_apply(self):
         if self.__module_enabled:
-            log('D136')
+            logging.debug(slogm('Running Envvar applier for user in user context'))
             ev = Envvar(self.envvars, self.username)
             ev.act()
         else:
-            log('D137')
+            logging.debug(slogm('Envvar applier for user in user context will not be started'))
 

gpoa/frontend/firefox_applier.py

@@ -34,8 +34,8 @@ from .applier_frontend import (
       applier_frontend
     , check_enabled
 )
-from util.logging import slogm, log
-from util.util import is_machine_name, get_homedir
+from util.logging import slogm
+from util.util import is_machine_name
 
 class firefox_applier(applier_frontend):
     __module_name = 'FirefoxApplier'
@@ -63,7 +63,7 @@ class firefox_applier(applier_frontend):
         '''
         Get directory names of Firefox profiles for specified username.
         '''
-        profiles_ini = os.path.join(get_homedir(self.username), self.__user_settings_dir, 'profiles.ini')
+        profiles_ini = os.path.join(util.get_homedir(self.username), self.__user_settings_dir, 'profiles.ini')
         config = configparser.ConfigParser()
         config.read(profiles_ini)
 
@@ -98,10 +98,7 @@ class firefox_applier(applier_frontend):
         '''
         if obj:
             self.policies[name] = obj
-            logdata = dict()
-            logdata['name'] = name
-            logdata['set to'] = obj
-            log('I7', logdata)
+            logging.info(slogm('Firefox policy \'{}\' set to {}'.format(name, obj)))
 
     def get_home_page(self):
         '''
@@ -139,10 +136,7 @@ class firefox_applier(applier_frontend):
         obj = self.get_boolean_config(name)
         if obj is not None:
             self.policies[name] = obj
-            logdata = dict()
-            logdata['name'] = name
-            logdata['set to'] = obj
-            log('I7', logdata)
+            logging.info(slogm('Firefox policy \'{}\' set to {}'.format(name, obj)))
 
     def machine_apply(self):
         '''
@@ -189,34 +183,27 @@ class firefox_applier(applier_frontend):
         os.makedirs(self.__firefox_installdir1, exist_ok=True)
         with open(destfile, 'w') as f:
             json.dump(self.policies_json, f)
-            logdata = dict()
-            logdata['destfile'] = destfile
-            log('D91', logdata)
+            logging.debug(slogm('Wrote Firefox preferences to {}'.format(destfile)))
 
         destfile = os.path.join(self.__firefox_installdir2, 'policies.json')
         os.makedirs(self.__firefox_installdir2, exist_ok=True)
         with open(destfile, 'w') as f:
             json.dump(self.policies_json, f)
-            logdata = dict()
-            logdata['destfile'] = destfile
-            log('D91', logdata)
+            logging.debug(slogm('Wrote Firefox preferences to {}'.format(destfile)))
 
     def user_apply(self):
         profiles = self.get_profiles()
 
-        profiledir = os.path.join(get_homedir(self.username), self.__user_settings_dir)
+        profiledir = os.path.join(util.get_homedir(self.username), self.__user_settings_dir)
         for profile in profiles:
-            logdata = dict()
-            logdata['profiledir'] = profiledir
-            logdata['profile'] = profile
-            log('D92', logdata)
+            logging.debug(slogm('Found Firefox profile in {}/{}'.format(profiledir, profile)))
 
     def apply(self):
         if self.__module_enabled:
-            log('D93')
+            logging.debug(slogm('Running Firefox applier for machine'))
             self.machine_apply()
         else:
-            log('D94')
+            logging.debug(slogm('Firefox applier for machine will not be started'))
         #if not self._is_machine_name:
         #    logging.debug('Running user applier for Firefox')
         #    self.user_apply()

gpoa/frontend/firewall_applier.py

@@ -20,7 +20,7 @@
 import logging
 import subprocess
 
-from util.logging import slogm, log
+from util.logging import slogm
 from .applier_frontend import (
       applier_frontend
     , check_enabled
@@ -52,14 +52,14 @@ class firewall_applier(applier_frontend):
 
     def apply(self):
         if self.__module_enabled:
-            log('D117')
+            logging.debug(slogm('Running Firewall applier for machine'))
             if '1' == self.firewall_enabled:
-                log('D118')
+                logging.debug(slogm('Firewall is enabled'))
                 self.run()
             else:
-                log('D119')
+                logging.debug(slogm('Firewall is disabled, settings will be reset'))
                 proc = subprocess.Popen(self.__firewall_reset_cmd)
                 proc.wait()
         else:
-            log('D120')
+            logging.debug(slogm('Firewall applier will not be started'))
 

gpoa/frontend/folder_applier.py

@@ -23,9 +23,8 @@ from .applier_frontend import (
     , check_enabled
 )
 from .appliers.folder import Folder
-from util.logging import slogm, log
-from util.windows import expand_windows_var
-import re
+from util.logging import slogm
+
 import logging
 
 class folder_applier(applier_frontend):
@@ -41,17 +40,12 @@ class folder_applier(applier_frontend):
 
     def apply(self):
         if self.__module_enabled:
-            log('D107')
+            logging.debug(slogm('Running Folder applier for machine'))
             for directory_obj in self.folders:
-                check = expand_windows_var(directory_obj.path).replace('\\', '/')
-                win_var = re.findall(r'%.+?%', check)
-                drive = re.findall(r'^[a-z A-Z]\:',check)
-                if drive or win_var:
-                    continue
                 fld = Folder(directory_obj)
                 fld.action()
         else:
-            log('D108')
+            logging.debug(slogm('Folder applier for machine will not be started'))
 
 class folder_applier_user(applier_frontend):
     __module_name = 'FoldersApplierUser'
@@ -71,25 +65,20 @@ class folder_applier_user(applier_frontend):
 
     def run(self):
         for directory_obj in self.folders:
-            check = expand_windows_var(directory_obj.path, self.username).replace('\\', '/')
-            win_var = re.findall(r'%.+?%', check)
-            drive = re.findall(r'^[a-z A-Z]\:',check)
-            if drive or win_var:
-                continue
             fld = Folder(directory_obj, self.username)
             fld.act()
 
     def admin_context_apply(self):
         if self.__module_enabled:
-            log('D109')
+            logging.debug(slogm('Running Folder applier for user in administrator context'))
             self.run()
         else:
-            log('D110')
+            logging.debug(slogm('Folder applier for user in administrator context will not be started'))
 
     def user_context_apply(self):
         if self.__module_enabled:
-            log('D111')
+            logging.debug(slogm('Running Folder applier for user in user context'))
             self.run()
         else:
-            log('D112')
+            logging.debug(slogm('Folder applier for user administrator context will not be started'))
 

gpoa/frontend/frontend_manager.py

@@ -51,12 +51,7 @@ from .envvar_applier import (
       envvar_applier
     , envvar_applier_user
 )
-from .scripts_applier import (
-      scripts_applier
-    , scripts_applier_user
-)
-
-from util.sid import get_sid
+from util.windows import get_sid
 from util.users import (
     is_root,
     get_process_user,
@@ -116,13 +111,6 @@ class frontend_manager:
         self.file_cache = fs_file_cache('file_cache')
 
         self.machine_appliers = dict()
-        self.user_appliers = dict()
-        if is_machine:
-            self._init_machine_appliers()
-        else:
-            self._init_user_appliers()
-
-    def _init_machine_appliers(self):
         self.machine_appliers['control'] = control_applier(self.storage)
         self.machine_appliers['polkit'] = polkit_applier(self.storage)
         self.machine_appliers['systemd'] = systemd_applier(self.storage)
@@ -136,11 +124,10 @@ class frontend_manager:
         self.machine_appliers['package'] = package_applier(self.storage)
         self.machine_appliers['ntp'] = ntp_applier(self.storage)
         self.machine_appliers['envvar'] = envvar_applier(self.storage, self.sid)
-        self.machine_appliers['scripts'] = scripts_applier(self.storage, self.sid)
 
-    def _init_user_appliers(self):
         # User appliers are expected to work with user-writable
         # files and settings, mostly in $HOME.
+        self.user_appliers = dict()
         self.user_appliers['shortcuts'] = shortcut_applier_user(self.storage, self.sid, self.username)
         self.user_appliers['folders'] = folder_applier_user(self.storage, self.sid, self.username)
         self.user_appliers['gsettings'] = gsettings_applier_user(self.storage, self.file_cache, self.sid, self.username)
@@ -154,7 +141,6 @@ class frontend_manager:
         self.user_appliers['package'] = package_applier_user(self.storage, self.sid, self.username)
         self.user_appliers['polkit'] = polkit_applier_user(self.storage, self.sid, self.username)
         self.user_appliers['envvar'] = envvar_applier_user(self.storage, self.sid, self.username)
-        self.user_appliers['scripts'] = scripts_applier_user(self.storage, self.sid, self.username)
 
     def machine_apply(self):
         '''

gpoa/frontend/gsettings_applier.py

@@ -33,9 +33,9 @@ from .applier_frontend import (
 )
 from .appliers.gsettings import (
     system_gsettings,
-    user_gsettings
+    user_gsetting
 )
-from util.logging import slogm ,log
+from util.logging import slogm
 
 def uri_fetch(schema, path, value, cache):
     '''
@@ -49,7 +49,7 @@ def uri_fetch(schema, path, value, cache):
     try:
         retval = cache.get(value)
         logdata['dst'] = retval
-        log('D90', logdata)
+        logging.debug(slogm('Getting cached file for URI: {}'.format(logdata)))
     except Exception as exc:
         pass
 
@@ -62,7 +62,6 @@ class gsettings_applier(applier_frontend):
     __registry_branch = 'Software\\BaseALT\\Policies\\GSettings\\'
     __registry_locks_branch = 'Software\\BaseALT\\Policies\\GSettingsLocks\\'
     __wallpaper_entry = 'Software\\BaseALT\\Policies\\GSettings\\org.mate.background.picture-filename'
-    __vino_authentication_methods_entry = 'Software\\BaseALT\\Policies\\GSettings\\org.gnome.Vino.authentication-methods'
     __global_schema = '/usr/share/glib-2.0/schemas'
     __override_priority_file = 'zzz_policy.gschema.override'
     __override_old_file = '0_policy.gschema.override'
@@ -79,6 +78,7 @@ class gsettings_applier(applier_frontend):
         self.override_old_file = os.path.join(self.__global_schema, self.__override_old_file)
         self.gsettings = system_gsettings(self.override_file)
         self.locks = dict()
+        self.dictArr = dict()
         self.__module_enabled = check_enabled(
               self.storage
             , self.__module_name
@@ -91,7 +91,7 @@ class gsettings_applier(applier_frontend):
         except Exception as exc:
             logdata = dict()
             logdata['exception'] = str(exc)
-            log('D145', logdata)
+            logging.debug(slogm('Unable to cache specified URI for machine: {}'.format(logdata)))
 
     def uri_fetch_helper(self, schema, path, value):
         return uri_fetch(schema, path, value, self.file_cache)
@@ -103,7 +103,7 @@ class gsettings_applier(applier_frontend):
 
         # Cleanup settings from previous run
         if os.path.exists(self.override_file):
-            log('D82')
+            logging.debug(slogm('Removing GSettings policy file from previous run'))
             os.remove(self.override_file)
 
         # Get all configured gsettings locks
@@ -114,19 +114,33 @@ class gsettings_applier(applier_frontend):
         # Calculate all configured gsettings
         for setting in self.gsettings_keys:
             helper = None
-            valuename = setting.hive_key.rpartition('\\')[2]
+            valuename = setting.valuename
             rp = valuename.rpartition('.')
             schema = rp[0]
             path = rp[2]
             data = setting.data
-            lock = bool(self.locks[valuename]) if valuename in self.locks else None
+
             if setting.hive_key.lower() == self.__wallpaper_entry.lower():
                 self.update_file_cache(setting.data)
                 helper = self.uri_fetch_helper
-            elif setting.hive_key.lower() == self.__vino_authentication_methods_entry.lower():
-                data = [setting.data]
-            self.gsettings.append(schema, path, data, lock, helper)
+            # Registry branch ends with back slash.
+            # If keyname starts with same prefix, it would be array
+            elif setting.keyname.lower().startswith(self.__registry_branch.lower()):
+                valuenameArr = setting.keyname.rpartition('\\')[2]
+                if valuenameArr:
+                    valuename = valuenameArr
+                    rpArr = valuename.rpartition('.')
+                    schema = rpArr[0]
+                    path = rpArr[2]
+                    if self.dictArr and path in self.dictArr.keys():
+                        self.dictArr[path].append(setting.data)
+                        self.gsettings.pop()
+                    else:
+                        self.dictArr[path] = [setting.data,]
+                    data = self.dictArr[path]
 
+            lock = bool(self.locks[valuename]) if valuename in self.locks else None
+            self.gsettings.append(schema, path, data, lock, helper)
         # Create GSettings policy with highest available priority
         self.gsettings.apply()
 
@@ -134,20 +148,20 @@ class gsettings_applier(applier_frontend):
         try:
             proc = subprocess.run(args=['/usr/bin/glib-compile-schemas', self.__global_schema], capture_output=True, check=True)
         except Exception as exc:
-            log('E48')
+            logging.debug(slogm('Error recompiling global GSettings schemas'))
 
         # Update desktop configuration system backend
         try:
             proc = subprocess.run(args=['/usr/bin/dconf', "update"], capture_output=True, check=True)
         except Exception as exc:
-            log('E49')
+            logging.debug(slogm('Error update desktop configuration system backend'))
 
     def apply(self):
         if self.__module_enabled:
-            log('D80')
+            logging.debug(slogm('Running GSettings applier for machine'))
             self.run()
         else:
-            log('D81')
+            logging.debug(slogm('GSettings applier for machine will not be started'))
 
 class GSettingsMapping:
     def __init__(self, hive_key, gsettings_schema, gsettings_key):
@@ -165,7 +179,7 @@ class GSettingsMapping:
             logdata['hive_key'] = self.hive_key
             logdata['gsettings_schema'] = self.gsettings_schema
             logdata['gsettings_key'] = self.gsettings_key
-            log('W6', logdata)
+            logging.warning(slogm('Unable to resolve GSettings parameter {}.{}'.format(self.gsettings_schema, self.gsettings_key)))
 
     def preg2gsettings(self):
         '''
@@ -186,7 +200,6 @@ class gsettings_applier_user(applier_frontend):
     __module_enabled = True
     __registry_branch = 'Software\\BaseALT\\Policies\\GSettings\\'
     __wallpaper_entry = 'Software\\BaseALT\\Policies\\GSettings\\org.mate.background.picture-filename'
-    __vino_authentication_methods_entry = 'Software\\BaseALT\\Policies\\GSettings\\org.gnome.Vino.authentication-methods'
 
     def __init__(self, storage, file_cache, sid, username):
         self.storage = storage
@@ -195,10 +208,10 @@ class gsettings_applier_user(applier_frontend):
         self.username = username
         gsettings_filter = '{}%'.format(self.__registry_branch)
         self.gsettings_keys = self.storage.filter_hkcu_entries(self.sid, gsettings_filter)
-        self.gsettings = user_gsettings()
-        self.__module_enabled = check_enabled(self.storage, self.__module_name, self.__module_experimental)
+        self.gsettings = list()
+        self.__module_enabled = check_enabled(self.storage, self.__module_name, self.__module_enabled)
         self.__windows_mapping_enabled = check_windows_mapping_enabled(self.storage)
-
+        self.dictArr = dict()
         self.__windows_settings = dict()
         self.windows_settings = list()
         mapping = [
@@ -237,13 +250,10 @@ class gsettings_applier_user(applier_frontend):
         for setting_key in self.__windows_settings.keys():
             value = self.storage.get_hkcu_entry(self.sid, setting_key)
             if value:
-                logdata = dict()
-                logdata['setting_key'] = setting_key
-                logdata['value.data'] = value.data
-                log('D86', logdata)
+                logging.debug(slogm('Found GSettings windows mapping {} to {}'.format(setting_key, value.data)))
                 mapping = self.__windows_settings[setting_key]
                 try:
-                    self.gsettings.append(mapping.gsettings_schema, mapping.gsettings_key, value.data)
+                    self.gsettings.append(user_gsetting(mapping.gsettings_schema, mapping.gsettings_key, value.data))
                 except Exception as exc:
                     print(exc)
 
@@ -261,10 +271,10 @@ class gsettings_applier_user(applier_frontend):
 
         # Calculate all mapped gsettings if mapping enabled
         if self.__windows_mapping_enabled:
-            log('D83')
+            logging.debug(slogm('Mapping Windows policies to GSettings policies'))
             self.windows_mapping_append()
         else:
-            log('D84')
+            logging.debug(slogm('GSettings windows policies mapping not enabled'))
 
         # Calculate all configured gsettings
         for setting in self.gsettings_keys:
@@ -272,21 +282,34 @@ class gsettings_applier_user(applier_frontend):
             rp = valuename.rpartition('.')
             schema = rp[0]
             path = rp[2]
-            data = setting.data
             helper = self.uri_fetch_helper if setting.hive_key.lower() == self.__wallpaper_entry.lower() else None
-            if setting.hive_key.lower() == self.__vino_authentication_methods_entry.lower():
-                data = [setting.data]
-            self.gsettings.append(schema, path, data, helper)
+            if valuename == setting.data:
+                valuenameArr = setting.keyname.rpartition('\\')[2]
+                rpArr = valuenameArr.rpartition('.')
+                schema = rpArr[0]
+                path = rpArr[2]
+                if self.dictArr and path in self.dictArr.keys():
+                    self.dictArr[path].append(setting.data)
+                    self.gsettings.pop()
+                else:
+                    self.dictArr[path] = [setting.data,]
+                self.gsettings.append(user_gsetting(schema, path, self.dictArr[path], helper))
+                continue
+            self.gsettings.append(user_gsetting(schema, path, setting.data, helper))
 
         # Create GSettings policy with highest available priority
-        self.gsettings.apply()
+        for gsetting in self.gsettings:
+            logging.debug(slogm('Applying user setting {}.{} to {}'.format(gsetting.schema,
+                                                                           gsetting.path,
+                                                                           gsetting.value)))
+            gsetting.apply()
 
     def user_context_apply(self):
         if self.__module_enabled:
-            log('D87')
+            logging.debug(slogm('Running GSettings applier for user in user context'))
             self.run()
         else:
-            log('D88')
+            logging.debug(slogm('GSettings applier for user in user context will not be started'))
 
     def admin_context_apply(self):
         # Cache files on remote locations
@@ -298,6 +321,5 @@ class gsettings_applier_user(applier_frontend):
         except Exception as exc:
             logdata = dict()
             logdata['exception'] = str(exc)
-            log('E50', logdata)
-
+            logging.debug(slogm('Unable to cache specified URI for user: {}'.format(logdata)))
 

gpoa/frontend/ntp_applier.py

@@ -26,7 +26,7 @@ from .applier_frontend import (
       applier_frontend
     , check_enabled
 )
-from util.logging import slogm, log
+from util.logging import slogm
 
 
 class NTPServerType(Enum):
@@ -77,24 +77,20 @@ class ntp_applier(applier_frontend):
         srv = None
         if server:
             srv = server.data.rpartition(',')[0]
-            logdata = dict()
-            logdata['srv'] = srv
-            log('D122', logdata)
+            logging.debug(slogm('NTP server is configured to {}'.format(srv)))
 
         start_command = ['/usr/bin/systemctl', 'start', 'chronyd']
         chrony_set_server = ['/usr/bin/chronyc', 'add', 'server', srv]
         chrony_disconnect_all = ['/usr/bin/chronyc', 'offline']
         chrony_connect = ['/usr/bin/chronyc', 'online', srv]
 
-        log('D123')
+        logging.debug(slogm('Starting Chrony daemon'))
 
         proc = subprocess.Popen(start_command)
         proc.wait()
 
         if srv:
-            logdata = dict()
-            logdata['srv'] = srv
-            log('D124', logdata)
+            logging.debug(slogm('Setting reference NTP server to {}'.format(srv)))
 
             proc = subprocess.Popen(chrony_disconnect_all)
             proc.wait()
@@ -107,7 +103,9 @@ class ntp_applier(applier_frontend):
 
     def _stop_chrony_client(self):
         stop_command = ['/usr/bin/systemctl', 'stop', 'chronyd']
-        log('D125')
+
+        logging.debug(slogm('Stopping Chrony daemon'))
+
         proc = subprocess.Popen(stop_command)
         proc.wait()
 
@@ -118,34 +116,32 @@ class ntp_applier(applier_frontend):
         ntp_client_enabled = self.storage.get_hklm_entry(self.ntp_client_enabled)
 
         if NTPServerType.NTP.value != server_type.data:
-            logdata = dict()
-            logdata['server_type'] = server_type
-            log('W10', logdata)
+            logging.warning(slogm('Unsupported NTP server type: {}'.format(server_type)))
         else:
-            log('D126')
+            logging.debug(slogm('Configuring NTP server...'))
             if '1' == ntp_server_enabled.data:
-                log('D127')
+                logging.debug(slogm('NTP server is enabled'))
                 self._start_chrony_client(server_address)
                 self._chrony_as_server()
             elif '0' == ntp_server_enabled.data:
-                log('D128')
+                logging.debug(slogm('NTP server is disabled'))
                 self._chrony_as_client()
             else:
-                log('D129')
+                logging.debug(slogm('NTP server is not configured'))
 
             if '1' == ntp_client_enabled.data:
-                log('D130')
+                logging.debug(slogm('NTP client is enabled'))
                 self._start_chrony_client()
             elif '0' == ntp_client_enabled.data:
-                log('D131')
+                logging.debug(slogm('NTP client is disabled'))
                 self._stop_chrony_client()
             else:
-                log('D132')
+                logging.debug(slogm('NTP client is not configured'))
 
     def apply(self):
         if self.__module_enabled:
-            log('D121')
+            logging.debug(slogm('Running NTP applier for machine'))
             self.run()
         else:
-            log('D133')
+            logging.debug(slogm('NTP applier for machine will not be started'))
 

gpoa/frontend/package_applier.py

@@ -17,8 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import subprocess
-from util.logging import slogm, log
+from util.logging import slogm
 from util.rpm import (
       update
     , install_rpm
@@ -36,7 +35,6 @@ class package_applier(applier_frontend):
     __module_enabled = False
     __install_key_name = 'Install'
     __remove_key_name = 'Remove'
-    __sync_key_name = 'Sync'
     __hklm_branch = 'Software\\BaseALT\\Policies\\Packages'
 
     def __init__(self, storage):
@@ -44,49 +42,37 @@ class package_applier(applier_frontend):
  
         install_branch = '{}\\{}%'.format(self.__hklm_branch, self.__install_key_name)
         remove_branch = '{}\\{}%'.format(self.__hklm_branch, self.__remove_key_name)
-        sync_branch = '{}\\{}%'.format(self.__hklm_branch, self.__sync_key_name)
-        self.fulcmd = list()
-        self.fulcmd.append('/usr/libexec/gpupdate/pkcon_runner')
-        self.fulcmd.append('--loglevel')
-        logger = logging.getLogger()
-        self.fulcmd.append(str(logger.level))
+
         self.install_packages_setting = self.storage.filter_hklm_entries(install_branch)
         self.remove_packages_setting = self.storage.filter_hklm_entries(remove_branch)
-        self.sync_packages_setting = self.storage.filter_hklm_entries(sync_branch)
-        self.flagSync = True
 
         self.__module_enabled = check_enabled(
               self.storage
             , self.__module_name
             , self.__module_experimental
         )
-    def run(self):
-        for flag in self.sync_packages_setting:
-            if flag.data:
-                self.flagSync = bool(int(flag.data))
 
+    def run(self):
         if 0 < self.install_packages_setting.count() or 0 < self.remove_packages_setting.count():
-            if self.flagSync:
+            update()
+            for package in self.install_packages_setting:
                 try:
-                    subprocess.check_call(self.fulcmd)
+                    install_rpm(package.data)
                 except Exception as exc:
-                    logdata = dict()
-                    logdata['msg'] = str(exc)
-                    log('E55', logdata)
-            else:
+                    logging.error(exc)
+
+            for package in self.remove_packages_setting:
                 try:
-                    subprocess.Popen(self.fulcmd,close_fds=False)
+                    remove_rpm(package.data)
                 except Exception as exc:
-                    logdata = dict()
-                    logdata['msg'] = str(exc)
-                    log('E61', logdata)
+                    logging.error(exc)
 
     def apply(self):
         if self.__module_enabled:
-            log('D138')
+            logging.debug(slogm('Running Package applier for machine'))
             self.run()
         else:
-            log('D139')
+            logging.debug(slogm('Package applier for machine will not be started'))
 
 
 class package_applier_user(applier_frontend):
@@ -95,29 +81,18 @@ class package_applier_user(applier_frontend):
     __module_enabled = False
     __install_key_name = 'Install'
     __remove_key_name = 'Remove'
-    __sync_key_name = 'Sync'
     __hkcu_branch = 'Software\\BaseALT\\Policies\\Packages'
 
     def __init__(self, storage, sid, username):
         self.storage = storage
         self.sid = sid
         self.username = username
-        self.fulcmd = list()
-        self.fulcmd.append('/usr/libexec/gpupdate/pkcon_runner')
-        self.fulcmd.append('--sid')
-        self.fulcmd.append(self.sid)
-        self.fulcmd.append('--loglevel')
-        logger = logging.getLogger()
-        self.fulcmd.append(str(logger.level))
 
         install_branch = '{}\\{}%'.format(self.__hkcu_branch, self.__install_key_name)
         remove_branch = '{}\\{}%'.format(self.__hkcu_branch, self.__remove_key_name)
-        sync_branch = '{}\\{}%'.format(self.__hkcu_branch, self.__sync_key_name)
 
         self.install_packages_setting = self.storage.filter_hkcu_entries(self.sid, install_branch)
         self.remove_packages_setting = self.storage.filter_hkcu_entries(self.sid, remove_branch)
-        self.sync_packages_setting = self.storage.filter_hkcu_entries(self.sid, sync_branch)
-        self.flagSync = False
 
         self.__module_enabled = check_enabled(self.storage, self.__module_name, self.__module_enabled)
 
@@ -128,25 +103,19 @@ class package_applier_user(applier_frontend):
         pass
 
     def run(self):
-        for flag in self.sync_packages_setting:
-            if flag.data:
-                self.flagSync = bool(int(flag.data))
-
         if 0 < self.install_packages_setting.count() or 0 < self.remove_packages_setting.count():
-            if self.flagSync:
+            update()
+            for package in self.install_packages_setting:
                 try:
-                    subprocess.check_call(self.fulcmd)
+                    install_rpm(package.data)
                 except Exception as exc:
-                    logdata = dict()
-                    logdata['msg'] = str(exc)
-                    log('E60', logdata)
-            else:
+                    logging.debug(exc)
+
+            for package in self.remove_packages_setting:
                 try:
-                    subprocess.Popen(self.fulcmd,close_fds=False)
+                    remove_rpm(package.data)
                 except Exception as exc:
-                    logdata = dict()
-                    logdata['msg'] = str(exc)
-                    log('E62', logdata)
+                    logging.debug(exc)
 
     def admin_context_apply(self):
         '''
@@ -154,8 +123,8 @@ class package_applier_user(applier_frontend):
         which computer he uses to log into system.
         '''
         if self.__module_enabled:
-            log('D140')
+            logging.debug(slogm('Running Package applier for user in administrator context'))
             self.run()
         else:
-            log('D141')
+            logging.debug(slogm('Package applier for user in administrator context will not be started'))
 

gpoa/frontend/polkit_applier.py

@@ -21,7 +21,7 @@ from .applier_frontend import (
     , check_enabled
 )
 from .appliers.polkit import polkit
-from util.logging import slogm, log
+from util.logging import slogm
 
 import logging
 
@@ -41,12 +41,10 @@ class polkit_applier(applier_frontend):
         template_file = self.__polkit_map[self.__deny_all][0]
         template_vars = self.__polkit_map[self.__deny_all][1]
         if deny_all:
-            logdata = dict()
-            logdata['Deny_All'] = deny_all.data
-            log('D69', logdata)
+            logging.debug(slogm('Deny_All setting found: {}'.format(deny_all.data)))
             self.__polkit_map[self.__deny_all][1]['Deny_All'] = deny_all.data
         else:
-            log('D71')
+            logging.debug(slogm('Deny_All setting not found'))
         self.policies = []
         self.policies.append(polkit(template_file, template_vars))
         self.__module_enabled = check_enabled(
@@ -60,11 +58,11 @@ class polkit_applier(applier_frontend):
         Trigger control facility invocation.
         '''
         if self.__module_enabled:
-            log('D73')
+            logging.debug(slogm('Running Polkit applier for machine'))
             for policy in self.policies:
                 policy.generate()
         else:
-            log('D75')
+            logging.debug(slogm('Polkit applier for machine will not be started'))
 
 class polkit_applier_user(applier_frontend):
     __module_name = 'PolkitApplierUser'
@@ -85,14 +83,11 @@ class polkit_applier_user(applier_frontend):
         template_file = self.__polkit_map[self.__deny_all][0]
         template_vars = self.__polkit_map[self.__deny_all][1]
         if deny_all:
-            logdata = dict()
-            logdata['user'] = self.username
-            logdata['Deny_All'] = deny_all.data
-            log('D70', logdata)
+            logging.debug(slogm('Deny_All setting for user {} found: {}'.format(self.username, deny_all.data)))
             self.__polkit_map[self.__deny_all][1]['Deny_All'] = deny_all.data
             self.__polkit_map[self.__deny_all][1]['User'] = self.username
         else:
-            log('D72')
+            logging.debug(slogm('Deny_All setting not found'))
         self.policies = []
         self.policies.append(polkit(template_file, template_vars, self.username))
         self.__module_enabled = check_enabled(
@@ -109,10 +104,9 @@ class polkit_applier_user(applier_frontend):
         Trigger control facility invocation.
         '''
         if self.__module_enabled:
-            log('D74')
+            logging.debug(slogm('Running Polkit applier for user in administrator context'))
             for policy in self.policies:
                 policy.generate()
         else:
-            log('D76')
-
+            logging.debug(slogm('Polkit applier for user in administrator context will not be started'))
 

gpoa/frontend/scripts_applier.py

@@ -1,159 +0,0 @@
-#
-# GPOA - GPO Applier for Linux
-#
-# Copyright (C) 2019-2022 BaseALT Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import shutil
-from pathlib import Path
-import pysss_nss_idmap
-
-from django.template import base
-from util.logging import log
-from .appliers.folder import remove_dir_tree
-from .applier_frontend import (
-      applier_frontend
-    , check_enabled
-)
-
-class scripts_applier(applier_frontend):
-    __module_name = 'ScriptsApplier'
-    __module_experimental = True
-    __module_enabled = False
-    __cache_scripts = '/var/cache/gpupdate_scripts_cache/machine/'
-
-    def __init__(self, storage, sid):
-        self.storage = storage
-        self.sid = sid
-        self.startup_scripts = self.storage.get_scripts(self.sid, 'STARTUP')
-        self.shutdown_scripts = self.storage.get_scripts(self.sid, 'SHUTDOWN')
-        self.folder_path = Path(self.__cache_scripts)
-        self.__module_enabled = check_enabled(self.storage
-            , self.__module_name
-            , self.__module_experimental
-        )
-
-    def cleaning_cache(self):
-        log('D160')
-        try:
-            remove_dir_tree(self.folder_path, True, True, True,)
-        except FileNotFoundError as exc:
-            log('D154')
-        except Exception as exc:
-            logdata = dict()
-            logdata['exc'] = exc
-            log('E64', logdata)
-
-    def filling_cache(self):
-        '''
-        Creating and updating folder directories for scripts and copying them
-        '''
-        self.folder_path.mkdir(parents=True, exist_ok=True)
-        for ts in self.startup_scripts:
-            script_path = os.path.join(self.__cache_scripts, 'STARTUP')
-            install_script(ts, script_path, '700')
-        for ts in self.shutdown_scripts:
-            script_path = os.path.join(self.__cache_scripts, 'SHUTDOWN')
-            install_script(ts, script_path, '700')
-
-    def run(self):
-        self.filling_cache()
-
-    def apply(self):
-        self.cleaning_cache()
-        if self.__module_enabled:
-            log('D156')
-            self.run()
-        else:
-            log('D157')
-
-class scripts_applier_user(applier_frontend):
-    __module_name = 'ScriptsApplierUser'
-    __module_experimental = True
-    __module_enabled = False
-    __cache_scripts = '/var/cache/gpupdate_scripts_cache/users/'
-
-    def __init__(self, storage, sid, username):
-        self.storage = storage
-        self.sid = sid
-        self.logon_scripts = self.storage.get_scripts(self.sid, 'LOGON')
-        self.logoff_scripts = self.storage.get_scripts(self.sid, 'LOGOFF')
-        self.username = username
-        self.folder_path = Path(self.__cache_scripts + self.username)
-        self.__module_enabled = check_enabled(self.storage
-            , self.__module_name
-            , self.__module_experimental
-        )
-        self.filling_cache()
-
-    def cleaning_cache(self):
-        log('D161')
-        try:
-            remove_dir_tree(self.folder_path, True, True, True,)
-        except FileNotFoundError as exc:
-            log('D155')
-        except Exception as exc:
-            logdata = dict()
-            logdata['exc'] = exc
-            log('E65', logdata)
-
-    def filling_cache(self):
-        '''
-        Creating and updating folder directories for scripts and copying them
-        '''
-        self.folder_path.mkdir(parents=True, exist_ok=True)
-
-        for ts in self.logon_scripts:
-            script_path = os.path.join(self.__cache_scripts, self.username, 'LOGON')
-            install_script(ts, script_path, '755')
-        for ts in self.logoff_scripts:
-            script_path = os.path.join(self.__cache_scripts, self.username, 'LOGOFF')
-            install_script(ts, script_path, '755')
-
-    def user_context_apply(self):
-        pass
-
-    def run(self):
-        self.filling_cache()
-
-    def admin_context_apply(self):
-        self.cleaning_cache()
-        if self.__module_enabled:
-            log('D158')
-            self.run()
-        else:
-            log('D159')
-
-def install_script(storage_script_entry, script_dir, access_permissions):
-    '''
-    Copy scripts to specific directories and
-    if given arguments
-    create directories for them and copy them there
-    '''
-    dir_cr = Path(script_dir)
-    dir_cr.mkdir(parents=True, exist_ok=True)
-    script_name = str(int(storage_script_entry.number)).zfill(5) + '_' + os.path.basename(storage_script_entry.path)
-    script_file = os.path.join(script_dir, script_name)
-    shutil.copyfile(storage_script_entry.path, script_file)
-
-    os.chmod(script_file, int(access_permissions, base = 8))
-    if storage_script_entry.arg:
-        dir_path = script_dir + '/' + script_name + '.arg'
-        dir_arg = Path(dir_path)
-        dir_arg.mkdir(parents=True, exist_ok=True)
-        file_arg = open(dir_path + '/arg', 'w')
-        file_arg.write(storage_script_entry.arg)
-        file_arg.close()

gpoa/frontend/shortcut_applier.py

@@ -25,7 +25,7 @@ from .applier_frontend import (
 )
 from gpt.shortcuts import json2sc
 from util.windows import expand_windows_var
-from util.logging import slogm, log
+from util.logging import slogm
 from util.util import (
         get_homedir,
         homedir_exists
@@ -55,10 +55,8 @@ def apply_shortcut(shortcut, username=None):
     dest_abspath = shortcut.dest
     if not dest_abspath.startswith('/') and not dest_abspath.startswith('%'):
         dest_abspath = '%HOME%/' + dest_abspath
-    logdata = dict()
-    logdata['shortcut'] = dest_abspath
-    logdata['for'] = username
-    log('D105', logdata)
+
+    logging.debug(slogm('Try to expand path for shortcut: {} for {}'.format(dest_abspath, username)))
     dest_abspath = expand_windows_var(dest_abspath, username).replace('\\', '/') + '.desktop'
 
     # Check that we're working for user, not on global system level
@@ -68,33 +66,21 @@ def apply_shortcut(shortcut, username=None):
         if dest_abspath.startswith(get_homedir(username)):
             # Don't try to operate on non-existent directory
             if not homedir_exists(username):
-                logdata = dict()
-                logdata['user'] = username
-                logdata['dest_abspath'] = dest_abspath
-                log('W7', logdata)
+                logging.warning(slogm('No home directory exists for user {}: will not apply link {}'.format(username, dest_abspath)))
                 return None
         else:
-            logdata = dict()
-            logdata['user'] = username
-            logdata['bad path'] = dest_abspath
-            log('W8', logdata)
+            logging.warning(slogm('User\'s shortcut not placed to home directory for {}: bad path {}'.format(username, dest_abspath)))
             return None
 
     if '%' in dest_abspath:
-        logdata = dict()
-        logdata['dest_abspath'] = dest_abspath
-        log('E53', logdata)
+        logging.debug(slogm('Fail for applying shortcut to file with \'%\': {}'.format(dest_abspath)))
         return None
 
     if not dest_abspath.startswith('/'):
-        logdata = dict()
-        logdata['dest_abspath'] = dest_abspath
-        log('E54', logdata)
+        logging.debug(slogm('Fail for applying shortcut to not absolute path \'%\': {}'.format(dest_abspath)))
         return None
-    logdata = dict()
-    logdata['file'] = dest_abspath
-    logdata['with_action'] = shortcut.action
-    log('D106', logdata)
+
+    logging.debug(slogm('Applying shortcut file to {} with action {}'.format(dest_abspath, shortcut.action)))
     shortcut.apply_desktop(dest_abspath)
 
 class shortcut_applier(applier_frontend):
@@ -122,16 +108,14 @@ class shortcut_applier(applier_frontend):
                 # /usr/local/share/applications
                 subprocess.check_call(['/usr/bin/update-desktop-database'])
         else:
-            logdata = dict()
-            logdata['machine_sid'] = self.storage.get_info('machine_sid')
-            log('D100', logdata)
+            logging.debug(slogm('No shortcuts to process for {}'.format(self.storage.get_info('machine_sid'))))
 
     def apply(self):
         if self.__module_enabled:
-            log('D98')
+            logging.debug(slogm('Running Shortcut applier for machine'))
             self.run()
         else:
-            log('D99')
+            logging.debug(slogm('Shortcut applier for machine will not be started'))
 
 class shortcut_applier_user(applier_frontend):
     __module_name = 'ShortcutsApplierUser'
@@ -153,21 +137,19 @@ class shortcut_applier_user(applier_frontend):
                 if not in_usercontext and not sc.is_usercontext():
                     apply_shortcut(sc, self.username)
         else:
-            logdata = dict()
-            logdata['sid'] = self.sid
-            log('D100', logdata)
+            logging.debug(slogm('No shortcuts to process for {}'.format(self.sid)))
 
     def user_context_apply(self):
         if self.__module_enabled:
-            log('D101')
+            logging.debug(slogm('Running Shortcut applier for user in user context'))
             self.run(True)
         else:
-            log('D102')
+            logging.debug(slogm('Shortcut applier for user in user context will not be started'))
 
     def admin_context_apply(self):
         if self.__module_enabled:
-            log('D103')
+            logging.debug(slogm('Running Shortcut applier for user in administrator context'))
             self.run(False)
         else:
-            log('D104')
+            logging.debug(slogm('Shortcut applier for user in administrator context will not be started'))
 

gpoa/frontend/systemd_applier.py

@@ -21,7 +21,7 @@ from .applier_frontend import (
     , check_enabled
 )
 from .appliers.systemd import systemd_unit
-from util.logging import slogm, log
+from util.logging import slogm
 
 import logging
 
@@ -46,31 +46,24 @@ class systemd_applier(applier_frontend):
             valuename = setting.hive_key.rpartition('\\')[2]
             try:
                 self.units.append(systemd_unit(valuename, int(setting.data)))
-                logdata = dict()
-                logdata['unit'] = format(valuename)
-                log('I4', logdata)
+                logging.info(slogm('Working with systemd unit {}'.format(valuename)))
             except Exception as exc:
-                logdata = dict()
-                logdata['unit'] = format(valuename)
-                logdata['exc'] = exc
-                log('I5', logdata)
+                logging.info(slogm('Unable to work with systemd unit {}: {}'.format(valuename, exc)))
         for unit in self.units:
             try:
                 unit.apply()
             except:
-                logdata = dict()
-                logdata['unit'] = unit.unit_name
-                log('E45', logdata)
+                logging.error(slogm('Failed applying unit {}'.format(unit.unit_name)))
 
     def apply(self):
         '''
         Trigger control facility invocation.
         '''
         if self.__module_enabled:
-            log('D78')
+            logging.debug(slogm('Running systemd applier for machine'))
             self.run()
         else:
-            log('D79')
+            logging.debug(slogm('systemd applier for machine will not be started'))
 
 class systemd_applier_user(applier_frontend):
     __module_name = 'SystemdApplierUser'

gpoa/gpt/folders.py

@@ -50,7 +50,7 @@ def folder_int2bool(val):
     if type(value) == str:
         value = int(value)
 
-    if value == 1:
+    if value == 0:
         return True
 
     return False

gpoa/gpt/gpt.py

@@ -64,17 +64,13 @@ from .tasks import (
       read_tasks
     , merge_tasks
 )
-from .scriptsini import (
-      read_scripts
-    , merge_scripts
-)
+
 import util
 import util.preg
 from util.paths import (
-    local_policy_default_path,
+    local_policy_path,
     cache_dir,
-    local_policy_default_cache,
-    local_policy_path
+    local_policy_cache
 )
 from util.logging import log
 
@@ -91,7 +87,6 @@ class FileType(Enum):
     INIFILES = 'inifiles.xml'
     SERVICES = 'services.xml'
     PRINTERS = 'printers.xml'
-    SCRIPTS = 'scripts.ini'
 
 def get_preftype(path_to_file):
     fpath = Path(path_to_file)
@@ -117,7 +112,6 @@ def pref_parsers():
     parsers[FileType.INIFILES] = read_inifiles
     parsers[FileType.SERVICES] = read_services
     parsers[FileType.PRINTERS] = read_printers
-    parsers[FileType.SCRIPTS] = read_scripts
 
     return parsers
 
@@ -138,7 +132,6 @@ def pref_mergers():
     mergers[FileType.INIFILES] = merge_inifiles
     mergers[FileType.SERVICES] = merge_services
     mergers[FileType.PRINTERS] = merge_printers
-    mergers[FileType.SCRIPTS] = merge_scripts
 
     return mergers
 
@@ -147,19 +140,20 @@ def get_merger(preference_type):
     return mergers[preference_type]
 
 class gpt:
+    __user_policy_mode_key = 'Software\\Policies\\Microsoft\\Windows\\System\\UserPolicyMode'
+
     def __init__(self, gpt_path, sid):
         self.path = gpt_path
         self.sid = sid
         self.storage = registry_factory('registry')
         self.name = ''
+
         self.guid = self.path.rpartition('/')[2]
         if 'default' == self.guid:
             self.guid = 'Local Policy'
 
         self._machine_path = find_dir(self.path, 'Machine')
         self._user_path = find_dir(self.path, 'User')
-        self._scripts_machine_path = find_dir(self._machine_path, 'Scripts')
-        self._scripts_user_path = find_dir(self._user_path, 'Scripts')
 
         self.settings_list = [
               'shortcuts'
@@ -171,7 +165,6 @@ class gpt:
             , 'inifiles'
             , 'services'
             , 'scheduledtasks'
-            , 'scripts'
         ]
         self.settings = dict()
         self.settings['machine'] = dict()
@@ -188,67 +181,76 @@ class gpt:
             log('D23', ulogdata)
             self.settings['user'][setting] = user_preffile
 
-        self.settings['machine']['scripts'] = find_file(self._scripts_machine_path, 'scripts.ini')
-        self.settings['user']['scripts'] = find_file(self._scripts_user_path, 'scripts.ini')
-
-
     def set_name(self, name):
         '''
         Set human-readable GPT name.
         '''
         self.name = name
 
-    def merge_machine(self):
+    def get_policy_mode(self):
         '''
-        Merge machine settings to storage.
+        Get UserPolicyMode parameter value in order to determine if it
+        is possible to work with user's part of GPT. This value is
+        checked only if working for user's SID.
         '''
-        try:
-            # Merge machine policies to registry if possible
-            if self.settings['machine']['regpol']:
-                mlogdata = dict({'polfile': self.settings['machine']['regpol']})
-                log('D34', mlogdata)
-                util.preg.merge_polfile(self.settings['machine']['regpol'], policy_name=self.name)
-            # Merge machine preferences to registry if possible
-            for preference_name, preference_path in self.settings['machine'].items():
-                if preference_path:
-                    preference_type = get_preftype(preference_path)
-                    logdata = dict({'pref': preference_type.value, 'sid': self.sid})
-                    log('D28', logdata)
-                    preference_parser = get_parser(preference_type)
-                    preference_merger = get_merger(preference_type)
-                    preference_objects = preference_parser(preference_path)
-                    preference_merger(self.storage, self.sid, preference_objects, self.name)
-        except Exception as exc:
-            logdata = dict()
-            logdata['gpt'] = self.name
-            logdata['msg'] = str(exc)
-            log('E28', logdata)
+        upm = self.storage.get_hklm_entry(self.__user_policy_mode_key)
+        if not upm:
+            upm = 0
+        upm = int(upm)
+        if 0 > upm or 2 > upm:
+            upm = 0
 
-    def merge_user(self):
+        return upm
+
+    def merge(self):
         '''
-        Merge user settings to storage.
+        Merge machine and user (if sid provided) settings to storage.
         '''
-        try:
-            # Merge user policies to registry if possible
-            if self.settings['user']['regpol']:
-                mulogdata = dict({'polfile': self.settings['user']['regpol']})
-                log('D35', mulogdata)
-                util.preg.merge_polfile(self.settings['user']['regpol'], sid=self.sid, policy_name=self.name)
-            # Merge user preferences to registry if possible
-            for preference_name, preference_path in self.settings['user'].items():
-                if preference_path:
-                    preference_type = get_preftype(preference_path)
-                    logdata = dict({'pref': preference_type.value, 'sid': self.sid})
-                    log('D29', logdata)
-                    preference_parser = get_parser(preference_type)
-                    preference_merger = get_merger(preference_type)
-                    preference_objects = preference_parser(preference_path)
-                    preference_merger(self.storage, self.sid, preference_objects, self.name)
-        except Exception as exc:
-            logdata = dict()
-            logdata['gpt'] = self.name
-            logdata['msg'] = str(exc)
-            log('E29', logdata)
+        if self.sid == self.storage.get_info('machine_sid'):
+            try:
+                # Merge machine settings to registry if possible
+                for preference_name, preference_path in self.settings['machine'].items():
+                    if preference_path:
+                        preference_type = get_preftype(preference_path)
+                        logdata = dict({'pref': preference_type.value, 'sid': self.sid})
+                        log('D28', logdata)
+                        preference_parser = get_parser(preference_type)
+                        preference_merger = get_merger(preference_type)
+                        preference_objects = preference_parser(preference_path)
+                        preference_merger(self.storage, self.sid, preference_objects, self.name)
+                if self.settings['user']['regpol']:
+                    mulogdata = dict({'polfile': self.settings['machine']['regpol']})
+                    log('D35', mulogdata)
+                    util.preg.merge_polfile(self.settings['user']['regpol'], sid=self.sid, policy_name=self.name)
+                if self.settings['machine']['regpol']:
+                    mlogdata = dict({'polfile': self.settings['machine']['regpol']})
+                    log('D34', mlogdata)
+                    util.preg.merge_polfile(self.settings['machine']['regpol'], policy_name=self.name)
+            except Exception as exc:
+                logdata = dict()
+                logdata['gpt'] = self.name
+                logdata['msg'] = str(exc)
+                log('E28', logdata)
+        else:
+            # Merge user settings if UserPolicyMode set accordingly
+            # and user settings (for HKCU) are exist.
+            policy_mode = upm2str(self.get_policy_mode())
+            if 'Merge' == policy_mode or 'Not configured' == policy_mode:
+                try:
+                    for preference_name, preference_path in self.settings['user'].items():
+                        if preference_path:
+                            preference_type = get_preftype(preference_path)
+                            logdata = dict({'pref': preference_type.value, 'sid': self.sid})
+                            log('D29', logdata)
+                            preference_parser = get_parser(preference_type)
+                            preference_merger = get_merger(preference_type)
+                            preference_objects = preference_parser(preference_path)
+                            preference_merger(self.storage, self.sid, preference_objects, self.name)
+                except Exception as exc:
+                    logdata = dict()
+                    logdata['gpt'] = self.name
+                    logdata['msg'] = str(exc)
+                    log('E29', logdata)
 
 def find_dir(search_path, name):
     '''
@@ -324,7 +326,7 @@ def lp2gpt():
     '''
     Convert local-policy to full-featured GPT.
     '''
-    lppath = os.path.join(local_policy_default_path(), 'Machine/Registry.pol.xml')
+    lppath = os.path.join(local_policy_path(), 'Machine/Registry.pol.xml')
 
     # Load settings from XML PolFile
     polparser = GPPolParser()
@@ -332,37 +334,34 @@ def lp2gpt():
     polparser.pol_file = polfile
 
     # Create target default policy directory if missing
-    destdir = os.path.join(local_policy_default_cache(), 'Machine')
+    destdir = os.path.join(local_policy_cache(), 'Machine')
     os.makedirs(destdir, exist_ok=True)
 
     # Write PReg
     polparser.write_binary(os.path.join(destdir, 'Registry.pol'))
 
-def get_local_default_gpt(sid):
+def get_local_gpt(sid):
     '''
     Convert default policy to GPT and create object out of it.
     '''
     log('D25')
     lp2gpt()
-    local_policy_default = gpt(str(local_policy_default_cache()), sid)
-    local_policy_default.set_name('Local Policy')
+    local_policy = gpt(str(local_policy_cache()), sid)
+    local_policy.set_name('Local Policy')
 
-    return local_policy_default
-
-def get_local_policy_gpt(sid):
-    '''
-    Create object out of local_policy_gpt.
-    '''
-    try:
-        path_lp = local_policy_path()
-        logdata = dict()
-        logdata['path'] = path_lp
-        log('D162', logdata)
-        local_policy = gpt(path_lp, sid)
-        local_policy.set_name('Alt local administrator policy')
-    except Exception as exc:
-        logdata = dict()
-        logdata['exc'] = exc
-        log('D163', logdata)
-        return None
     return local_policy
+
+def upm2str(upm_num):
+    '''
+    Translate UserPolicyMode to string.
+    '''
+    result = 'Not configured'
+
+    if upm_num in [1, '1']:
+        result = 'Replace'
+
+    if upm_num in [2, '2']:
+        result = 'Merge'
+
+    return result
+

gpoa/gpt/scriptsini.py

@@ -1,145 +0,0 @@
-#
-# GPOA - GPO Applier for Linux
-#
-# Copyright (C) 2019-2020 BaseALT Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import configparser
-import os
-
-
-def read_scripts(scripts_file):
-    scripts = Scripts_lists()
-
-    logon_scripts = dict()
-    logoff_scripts = dict()
-    startup_scripts = dict()
-    shutdown_scripts = dict()
-
-    config = configparser.ConfigParser()
-    config.read(scripts_file, encoding = 'utf-16')
-    scripts_file_dir = os.path.dirname(scripts_file)
-
-    actions = config.sections()
-
-    for act in actions:
-        act_upper = act.upper()
-        if act_upper == 'LOGON':
-            section_scripts = logon_scripts
-        elif act_upper == 'LOGOFF':
-            section_scripts = logoff_scripts
-        elif act_upper == 'STARTUP':
-            section_scripts = startup_scripts
-        elif act_upper == 'SHUTDOWN':
-            section_scripts = shutdown_scripts
-        else:
-            continue
-
-        for key in config[act]:
-            key_lower = key.lower()
-            key_split = key_lower.split('cmdline')
-            if len(key_split) > 1 and not key_split[1]:
-                if key_split[0].isdigit():
-                    key_index = int(key_split[0])
-                    section_scripts[key_index] = Script(act, scripts_file_dir, config[act][key])
-            key_split = key_lower.split('parameters')
-            if len(key_split) > 1 and not key_split[1]:
-                if key_split[0].isdigit():
-                    key_index = int(key_split[0])
-                    section_scripts[key_index].set_args(config[act][key])
-    if logon_scripts:
-        for i in sorted(logon_scripts.keys()):
-            scripts.add_script(act_upper, logon_scripts[i])
-
-    if logoff_scripts:
-        for i in sorted(logoff_scripts.keys()):
-            scripts.add_script(act_upper, logoff_scripts[i])
-
-    if startup_scripts:
-        for i in sorted(startup_scripts.keys()):
-            scripts.add_script(act_upper, startup_scripts[i])
-
-    if shutdown_scripts:
-        for i in sorted(shutdown_scripts.keys()):
-            scripts.add_script(act_upper, shutdown_scripts[i])
-
-
-    return scripts
-
-def merge_scripts(storage, sid, scripts_objects, policy_name):
-    for script in scripts_objects.get_logon_scripts():
-        storage.add_script(sid, script, policy_name)
-    for script in scripts_objects.get_logoff_scripts():
-        storage.add_script(sid, script, policy_name)
-    for script in scripts_objects.get_startup_scripts():
-        storage.add_script(sid, script, policy_name)
-    for script in scripts_objects.get_shutdown_scripts():
-        storage.add_script(sid, script, policy_name)
-
-class Scripts_lists:
-    def __init__ (self):
-        self.__logon_scripts = list()
-        self.__logoff_scripts = list()
-        self.__startup_scripts = list()
-        self.__shutdown_scripts = list()
-
-    def get_logon_scripts(self):
-        return self.__logon_scripts
-    def get_logoff_scripts(self):
-        return self.__logoff_scripts
-    def get_startup_scripts(self):
-        return self.__startup_scripts
-    def get_shutdown_scripts(self):
-        return self.__shutdown_scripts
-
-    def add_script(self, action, script):
-        if action == 'LOGON':
-            self.get_logon_scripts().append(script)
-        elif action == 'LOGOFF':
-            self.get_logoff_scripts().append(script)
-        elif action == 'STARTUP':
-            self.get_startup_scripts().append(script)
-        elif action == 'SHUTDOWN':
-            self.get_shutdown_scripts().append(script)
-
-
-class Script:
-    __logon_counter = 0
-    __logoff_counter = 0
-    __startup_counter = 0
-    __shutdown_counter = 0
-
-    def __init__(self, action, script_dir, script_filename):
-        action_upper = action.upper()
-        self.action = action_upper
-        self.path = os.path.join(script_dir, action_upper, script_filename.upper())
-        self.args = None
-
-        if action_upper == 'LOGON':
-            self.number = Script.__logon_counter
-            Script.__logon_counter += 1
-        elif action_upper == 'LOGOFF':
-            self.number = Script.__logoff_counter
-            Script.__logoff_counter += 1
-        elif action_upper == 'STARTUP':
-            self.number = Script.__startup_counter
-            Script.__startup_counter += 1
-        elif action_upper == 'SHUTDOWN':
-            self.number = Script.__shutdown_counter
-            Script.__shutdown_counter += 1
-
-    def set_args(self, args):
-        self.args = args
-

gpoa/gpt/services.py

@@ -50,7 +50,7 @@ class service:
         self.serviceaction = None
 
     def set_clsid(self, clsid):
-        self.guid = clsid
+        self.guid = uid
 
     def set_usercontext(self, usercontext=False):
         ctx = False

gpoa/gpupdate

@@ -47,47 +47,33 @@ from util.logging import log
 class file_runner:
     _gpoa_exe = '/usr/sbin/gpoa'
 
-    def __init__(self, loglevel, username=None):
+    def __init__(self, username=None):
         self._user = username
-        self._loglevel = loglevel
 
     def run(self):
         '''
         Call gpoa utility to generate scripts
         '''
         gpoa_cmd = [self._gpoa_exe]
-        if self._loglevel != None:
-            gpoa_cmd += ["--loglevel", str(self._loglevel)]
         if self._user:
             gpoa_cmd += [self._user]
 
-        subprocess.check_output(gpoa_cmd)
+        output = subprocess.call(gpoa_cmd)
+        sys.exit(output)
 
 def parse_cli_arguments():
     '''
     Command line argument parser
     '''
-    argparser = argparse.ArgumentParser(description='Update group policies for computer and the specified user')
+    argparser = argparse.ArgumentParser(description='Update group policies for the specified user')
     argparser.add_argument('-u',
         '--user',
         default=None,
         help='Name of the user for GPO update')
-    argparser.add_argument('-t',
-        '--target',
+    argparser.add_argument('--target',
         default=None,
-        type=str.upper,
-        choices=["ALL", "USER", "COMPUTER"],
+        type=str,
         help='Specify if it is needed to update user\'s or computer\'s policies')
-    argparser.add_argument('-l',
-        '--loglevel',
-        type=int,
-        default=5,
-        help='Set logging verbosity level')
-    argparser.add_argument('-s',
-        '--system',
-        action='store_true',
-        default=None,
-        help='Run gpoa directly in system mode')
 
     return argparser.parse_args()
 
@@ -97,14 +83,13 @@ def runner_factory(args, target):
     factors taken into account.
     '''
     username = None
-    target = target.upper()
     if is_root():
         # Only root may specify any username to update.
         try:
             if args.user:
                 username = pwd.getpwnam(args.user).pw_name
             else:
-                target = 'COMPUTER'
+                target = 'Computer'
         except:
             username = None
             logdata = dict({'username': args.user})
@@ -114,45 +99,30 @@ def runner_factory(args, target):
         # itself (os.getusername()).
         username = pwd.getpwuid(os.getuid()).pw_name
         if args.user != username:
-            logdata = dict({'username': username})
+            logdata = dict({'username': args.user})
             log('W2', logdata)
 
-    if args.system:
-        return try_directly(username, target, args.loglevel)
-    else:
-        return try_by_oddjob(username, target)
-
-def try_by_oddjob(username, target):
-    '''
-    Run group policies applying by oddjob service
-    '''
     if is_oddjobd_gpupdate_accessible():
         log('D13')
         computer_runner = None
         user_runner = None
-        if target == 'ALL' or target == 'COMPUTER':
+        if target == 'All' or target == 'Computer':
             computer_runner = dbus_runner()
         if username:
-            if target == 'ALL' or target == 'USER':
+            if target == 'All' or target == 'User':
                 user_runner = dbus_runner(username)
         return (computer_runner, user_runner)
     else:
         log('W3')
 
-    return None
-
-def try_directly(username, target, loglevel):
-    '''
-    Run group policies applying directly
-    '''
     if is_root():
         log('D14')
         computer_runner = None
         user_runner = None
-        if target == 'ALL' or target == 'COMPUTER':
-            computer_runner = file_runner(loglevel)
-        if target == 'ALL' or target == 'USER':
-            user_runner = file_runner(loglevel, username)
+        if target == 'All' or target == 'Computer':
+            computer_runner = file_runner()
+        if target == 'All' or target == 'User':
+            user_runner = file_runner(username)
         return (computer_runner, user_runner)
     else:
         log('E1')
@@ -164,7 +134,7 @@ def main():
     locale.bindtextdomain('gpoa', '/usr/lib/python3/site-packages/gpoa/locale')
     gettext.bindtextdomain('gpoa', '/usr/lib/python3/site-packages/gpoa/locale')
     gettext.textdomain('gpoa')
-    set_loglevel(args.loglevel)
+    set_loglevel(0)
     gpo_appliers = runner_factory(args, process_target(args.target))
 
     if gpo_appliers:

gpoa/gpupdate-setup

@@ -27,8 +27,8 @@ from util.util import (
       runcmd
     , get_backends
     , get_default_policy_name
-    , get_policy_default_entries
-    , get_policy_default_variants
+    , get_policy_entries
+    , get_policy_variants
 )
 from util.config import GPConfig
 from util.paths import get_custom_policy_dir
@@ -45,14 +45,13 @@ def parse_arguments():
     '''
     Parse CLI arguments.
     '''
-    config = GPConfig()
     parser = argparse.ArgumentParser(prog='gpupdate-setup')
     subparsers = parser.add_subparsers(dest='action',
         metavar='action',
         help='Group Policy management actions (default action is status)')
 
     parser_list = subparsers.add_parser('list',
-        help='List avalable types of local default policy')
+        help='List avalable types of local policy')
     parser_list = subparsers.add_parser('list-backends',
         help='Show list of available backends')
     parser_status = subparsers.add_parser('status',
@@ -62,21 +61,17 @@ def parse_arguments():
 
     parser_disable = subparsers.add_parser('disable',
         help='Disable Group Policy subsystem')
-    parser_update = subparsers.add_parser('update',
-        help='Update state')
+
     parser_write = subparsers.add_parser('write',
         help='Operate on Group Policies (enable or disable)')
     parser_set_backend = subparsers.add_parser('set-backend',
         help='Set or change currently active backend')
     parser_default = subparsers.add_parser('default-policy',
         help='Show name of default policy')
-    parser_active = subparsers.add_parser('local-policy',
-        help='Show name of default policy enabled')
+    parser_active = subparsers.add_parser('active-policy',
+        help='Show name of policy enabled')
     parser_active_backend = subparsers.add_parser('active-backend',
         help='Show currently configured backend')
-    parser_local_policy = subparsers.add_parser('local-policy',
-        help='Show current local policy without arg and set with arg')
-
 
     parser_set_backend.add_argument('backend',
         default='samba',
@@ -86,21 +81,13 @@ def parse_arguments():
         choices=['local', 'samba'],
         help='Backend (source of settings) name')
 
-    parser_local_policy.add_argument('state',
-        default=None,
-        type=str,
-        nargs='?',
-        const='state',
-        choices=['True', 'False'],
-        help='Set local-policy state')
-
     parser_write.add_argument('status',
         choices=['enable', 'disable'],
         help='Enable or disable Group Policies')
-    parser_write.add_argument('localdefaultpolicy',
+    parser_write.add_argument('localpolicy',
         default=None,
         nargs='?',
-        help='Name of local default policy to enable')
+        help='Name of local policy to enable')
     parser_write.add_argument('backend',
         default='samba',
         type=str,
@@ -109,40 +96,19 @@ def parse_arguments():
         choices=['local', 'samba'],
         help='Backend (source of settings) name')
 
-    parser_enable.add_argument('--local-policy-default',
+    parser_enable.add_argument('--local-policy',
         default=None,
-        help='Name of local default policy to enable')
+        help='Name of local policy to enable')
     parser_enable.add_argument('--backend',
         default='samba',
         type=str,
         choices=['local', 'samba'],
         help='Backend (source of settings) name')
 
-    parser_enable.add_argument('--local-policy',
-        default='False',
-        type=str,
-        choices=['True', 'False'],
-        help='Administration of local policies')
-
-
-    parser_update.add_argument('--local-policy-default',
-        default=None,
-        help='Name of local default policy to enable')
-    
-    parser_update.add_argument('--local-policy',
-        default=str(get_local_policy()),
-        help='State of local policies')
-    parser_update.add_argument('--backend',
-        default=get_active_backend(),
-        type=str,
-        choices=['local', 'samba'],
-        help='Backend (source of settings) name')
-
-
     return parser.parse_args()
 
 def validate_policy_name(policy_name):
-    return policy_name in [os.path.basename(d) for d in get_policy_default_variants()]
+    return policy_name in [os.path.basename(d) for d in get_policy_variants()]
 
 def is_unit_enabled(unit_name, unit_global=False):
     '''
@@ -179,21 +145,17 @@ def get_status():
 
     return False
 
-def get_active_policy_default_name():
+def get_active_policy_name():
     '''
-    Show the name of an active Local default Policy template
+    Show the name of an active Local Policy template
     '''
     config = GPConfig()
-    return os.path.basename(config.get_local_policy_default_template())
+    return os.path.basename(config.get_local_policy_template())
 
 def get_active_backend():
     config = GPConfig()
     return config.get_backend()
 
-def get_local_policy():
-    config = GPConfig()
-    return config.get_local_policy()
-
 def rollback_on_error(command_name):
     '''
     Disable group policy services in case command returns error code
@@ -211,11 +173,7 @@ def disable_gp():
     cmd_set_local_policy = ['/usr/sbin/control', 'system-policy', 'local']
     cmd_disable_gpupdate_service = ['/bin/systemctl', 'disable', 'gpupdate.service']
     cmd_disable_gpupdate_user_service = ['/bin/systemctl', '--global', 'disable', 'gpupdate-user.service']
-    cmd_disable_gpupdate_timer = ['/bin/systemctl', 'disable', 'gpupdate.timer']
-    cmd_disable_gpupdate_user_timer = ['/bin/systemctl', '--global', 'disable', 'gpupdate-user.timer']
     cmd_control_system_auth = ['/usr/sbin/control', 'system-auth']
-    cmd_disable_gpupdate_scripts_service = ['/bin/systemctl', 'disable', 'gpupdate-scripts-run.service']
-    cmd_disable_gpupdate_scripts_user_service = ['/bin/systemctl', '--global', 'disable', 'gpupdate-scripts-run-user.service']
 
     config = GPConfig()
 
@@ -231,15 +189,10 @@ def disable_gp():
         runcmd(cmd_set_local_policy)
     runcmd(cmd_disable_gpupdate_service)
     runcmd(cmd_disable_gpupdate_user_service)
-    runcmd(cmd_disable_gpupdate_timer)
-    runcmd(cmd_disable_gpupdate_user_timer)
-    runcmd(cmd_disable_gpupdate_scripts_service)
-    runcmd(cmd_disable_gpupdate_scripts_user_service)
-    config.set_local_policy_default_template()
+    config.set_local_policy_template()
     config.set_backend()
-    config.set_local_policy('False')
 
-def enable_gp(policy_name, backend_type, local_policy=False):
+def enable_gp(policy_name, backend_type):
     '''
     Consistently enable group policy services
     '''
@@ -247,10 +200,6 @@ def enable_gp(policy_name, backend_type, local_policy=False):
     cmd_gpoa_nodomain = ['/usr/sbin/gpoa', '--nodomain', '--loglevel', '5']
     cmd_enable_gpupdate_service = ['/bin/systemctl', 'enable', 'gpupdate.service']
     cmd_enable_gpupdate_user_service = ['/bin/systemctl', '--global', 'enable', 'gpupdate-user.service']
-    cmd_enable_gpupdate_timer = ['/bin/systemctl', 'enable', 'gpupdate.timer']
-    cmd_enable_gpupdate_user_timer = ['/bin/systemctl', '--global', 'enable', 'gpupdate-user.timer']
-    cmd_enable_gpupdate_scripts_service = ['/bin/systemctl', 'enable', 'gpupdate-scripts-run.service']
-    cmd_enable_gpupdate_user_scripts_service = ['/bin/systemctl', '--global', 'enable', 'gpupdate-scripts-run-user.service']
 
     config = GPConfig()
 
@@ -264,9 +213,8 @@ def enable_gp(policy_name, backend_type, local_policy=False):
             target_policy_name = policy_name
     print (target_policy_name)
 
-    config.set_local_policy_default_template(target_policy_name)
+    config.set_local_policy_template(target_policy_name)
     config.set_backend(backend_type)
-    config.set_local_policy(local_policy)
 
     # Enable oddjobd_gpupdate in PAM config
     if not rollback_on_error(cmd_set_gpupdate_policy):
@@ -287,37 +235,11 @@ def enable_gp(policy_name, backend_type, local_policy=False):
         disable_gp()
         return
 
-        # Enable gpupdate-scripts-run.service
-    if not rollback_on_error(cmd_enable_gpupdate_scripts_service):
-        return
-    if not is_unit_enabled('gpupdate-scripts-run.service'):
-        disable_gp()
-        return
-    # Enable gpupdate-scripts-run-user.service for all users
-    if not rollback_on_error(cmd_enable_gpupdate_user_scripts_service):
-        return
-    if not is_unit_enabled('gpupdate-scripts-run-user.service', unit_global=True):
-        disable_gp()
-        return
-
-    # Enable gpupdate.timer
-    if not rollback_on_error(cmd_enable_gpupdate_timer):
-        return
-    if not is_unit_enabled('gpupdate.timer'):
-        disable_gp()
-        return
-    # Enable gpupdate-setup.timer for all users
-    if not rollback_on_error(cmd_enable_gpupdate_user_timer):
-        return
-    if not is_unit_enabled('gpupdate-user.timer', unit_global=True):
-        disable_gp()
-        return
-
 def act_list():
     '''
     Show list of available templates of Local Policy
     '''
-    for entry in get_policy_default_variants():
+    for entry in get_policy_variants():
         print(entry.rpartition('/')[2])
 
 def act_list_backends():
@@ -350,25 +272,17 @@ def act_write(status, localpolicy, backend):
     if status == 'disable' or status == '#f':
         disable_gp()
 
-def act_enable(localpolicy, backend, local_policy):
+def act_enable(localpolicy, backend):
     '''
     Enable group policy services
     '''
-    enable_gp(localpolicy, backend, local_policy)
+    enable_gp(localpolicy, backend)
 
-def act_update(localpolicy, backend, local_policy):
+def act_active_policy():
     '''
-    Enable group policy services
+    Print active Local Policy template name to stdout
     '''
-    enable_gp(localpolicy, backend, local_policy)
-
-
-
-def act_active_policy_default():
-    '''
-    Print active Local default Policy template name to stdout
-    '''
-    print(get_active_policy_default_name())
+    print(get_active_policy_name())
 
 def act_active_backend():
     '''
@@ -382,16 +296,6 @@ def act_default_policy():
     '''
     print(get_default_policy_name())
 
-def act_local_policy(state):
-    '''
-    Print and set currently local_policy.
-    '''
-    if state:
-        config = GPConfig()
-        config.set_local_policy(state)
-
-    print(get_local_policy())
-
 def main():
     arguments = parse_arguments()
 
@@ -402,26 +306,19 @@ def main():
     action['set-backend'] = act_set_backend
     action['write'] = act_write
     action['enable'] = act_enable
-    action['update'] = act_update
     action['disable'] = disable_gp
-    action['active-policy'] = act_active_policy_default
+    action['active-policy'] = act_active_policy
     action['active-backend'] = act_active_backend
     action['default-policy'] = act_default_policy
-    action['local-policy'] = act_local_policy
 
     if arguments.action == None:
         action['status']()
-    elif arguments.action == 'update':
-        if get_status():
-            action[arguments.action](arguments.local_policy_default, arguments.backend, arguments.local_policy)
     elif arguments.action == 'enable':
-        action[arguments.action](arguments.local_policy_default, arguments.backend, arguments.local_policy)
+        action[arguments.action](arguments.local_policy, arguments.backend)
     elif arguments.action == 'write':
-        action[arguments.action](arguments.status, arguments.localdefaultpolicy, arguments.backend)
+        action[arguments.action](arguments.status, arguments.localpolicy, arguments.backend)
     elif arguments.action == 'set-backend':
         action[arguments.action](arguments.backend)
-    elif arguments.action == 'local-admin':
-        action[arguments.action](arguments.state)
     else:
         action[arguments.action]()
 

gpoa/locale/ru_RU/LC_MESSAGES/gpoa.po

@@ -41,27 +41,6 @@ msgstr "Получен объект групповой политики"
 msgid "Unknown info code"
 msgstr "Неизвестный код информационного сообщения"
 
-msgid "Working with control"
-msgstr "Применение настроек control"
-
-msgid "Working with systemd"
-msgstr "Работа с systemd"
-
-msgid "Unable to work with systemd unit"
-msgstr "Невозможно создать оъект для unit systemd"
-
-msgid "Starting systemd unit"
-msgstr "Запуск unit systemd"
-
-msgid "Firefox policy"
-msgstr "Политика Firefox"
-
-msgid "Chromium policy"
-msgstr "Политика Chromium"
-
-msgid "Set user property to"
-msgstr "Установка свойств  для пользователя"
-
 # Error
 msgid "Insufficient permissions to run gpupdate"
 msgstr "Недостаточно прав для запуска gpupdate"
@@ -153,86 +132,6 @@ msgstr "Ошибка слияния пользовательской части
 msgid "Unknown error code"
 msgstr "Неизвестный код ошибки"
 
-msgid "Unable to work with control"
-msgstr "Не удалось применить настройки control"
-
-msgid "Control applier for machine will not be started"
-msgstr "Приминение Control для машины не удалось"
-
-msgid "Error getting control"
-msgstr "Ошибка установки control"
-
-msgid "Is not in possible values for control"
-msgstr "Не входит в возможные значения для control"
-
-msgid "Unable to set"
-msgstr "Невозможно установить"
-
-msgid "Unable to generate file"
-msgstr "Невозможно создать файл"
-
-msgid "Failed applying unit"
-msgstr "Не удалось применить настройки"
-
-msgid "Unable to start systemd unit"
-msgstr "Невозможно запустить systemd unit"
-
-msgid "Unable to cache specified URI"
-msgstr "Невозможно кэшировать указанный URI"
-
-msgid "Unable to cache specified URI for machine"
-msgstr "Невозможно кэшировать указанный URI для компьютера"
-
-msgid "Error recompiling global GSettings schemas"
-msgstr "Ошибка перекомпиляции глобальных GSettings schemas"
-
-msgid "Error update configuration dconf"
-msgstr "Ошибка обновления конфигурации dconf"
-
-msgid "Unable to cache specified URI for user"
-msgstr "Невозможно кэшировать указанный URI для пользователя"
-
-msgid "Chromium preferences file does not exist at the moment"
-msgstr "Файл настроек Chromium в данный момент не существует"
-
-msgid "Error during attempt to read Chromium preferences for user"
-msgstr "Ошибка при попытке прочитать настройки Chromium для пользователя"
-
-msgid "Fail for applying shortcut to file with %"
-msgstr "Не удалось применить ярлык к файлу с %"
-
-msgid "Fail for applying shortcut to not absolute path"
-msgstr "Не удалось применить ярлык к не абсолютному пути"
-
-msgid "Error running pkcon_runner sync for machine"
-msgstr "Ошибка при запуске pkcon_runner синхронно для компьютера"
-
-msgid "Package install error"
-msgstr "Ошибка установки пакета"
-
-msgid "Package remove error"
-msgstr "Ошибка удаления пакета"
-
-msgid "Error running pkcon_runner sync for user"
-msgstr "Ошибка при запуске pkcon_runner синхронно для пользователя"
-
-msgid "Error running pkcon_runner async for machine"
-msgstr "Ошибка при запуске pkcon_runner асинхронно для компьютера"
-
-msgid "Error running pkcon_runner async for user"
-msgstr "Ошибка при запуске pkcon_runner асинхронно для пользователя"
-
-msgid "Error merging user GPT (from machine GPO)"
-msgstr "Ошибка слияния пользовательской групповой политики (машинная часть)"
-
-msgid "Error cleaning directory for machine"
-msgstr "Ошибка очистки каталога для машины"
-
-msgid "Error cleaning directory for user"
-msgstr "Ошибка очистки каталога для пользователя"
-
-# Error_end
-
 # Debug
 msgid "The GPOA process was started for user"
 msgstr "Произведён запуск GPOA для обновления политик пользователя"
@@ -396,311 +295,6 @@ msgstr "Сохранение информации о переменных окр
 msgid "Unknown debug code"
 msgstr "Неизвестный отладочный код"
 
-msgid "Running Control applier for machine"
-msgstr "Начато применение Control для машины"
-
-msgid "Setting control"
-msgstr "Установка control"
-
-msgid "Deny_All setting found"
-msgstr "Deny_All настройка найдена"
-
-msgid "Deny_All setting for user"
-msgstr "Deny_All настройка для пользователя"
-
-msgid "Deny_All setting not found"
-msgstr "Deny_All настройка не найдена"
-
-msgid "Deny_All setting not found for user"
-msgstr "Deny_All настройка не найдена для пользователя"
-
-msgid "Running Polkit applier for machine"
-msgstr "Начато применение настроек Polkit для машины"
-
-msgid "Running Polkit applier for user in administrator context"
-msgstr "Начато применение настроек Polkit пользователя в контексте администратора"
-
-msgid "Polkit applier for machine will not be started"
-msgstr "Polkit для машины не запускается"
-
-msgid "Polkit applier for user in administrator context will not be started"
-msgstr "Polkit для пользователя в контексте администратора не запускается"
-
-msgid "Generated file"
-msgstr "Созданный файл"
-
-msgid "Running systemd applier for machine"
-msgstr "Начато применение настроек systemd для машины"
-
-msgid "Running systemd applier for machine will not be started"
-msgstr "Применение настроек systemd для машины не удалось"
-
-msgid "Running GSettings applier for machine"
-msgstr "Запуск применение настроек GSettings для машины"
-
-msgid "GSettings applier for machine will not be started"
-msgstr "Применение настроек GSettings для машины не удалось"
-
-msgid "Removing GSettings policy file from previous run"
-msgstr "Удаление файла политики GSettings от предыдущего запуска"
-
-msgid "Mapping Windows policies to GSettings policies"
-msgstr "Сопоставление политик Windows с политиками GSettings"
-
-msgid "GSettings windows policies mapping not enabled"
-msgstr "Сопоставление политик Windows GSettings не включено"
-
-msgid "Applying user setting"
-msgstr "Применение пользовательских настроек"
-
-msgid "Found GSettings windows mapping"
-msgstr "Найдены соответствия настроек windows-GSettings"
-
-msgid "Running GSettings applier for user in user context"
-msgstr "Запуск применение настроек GSettings в контексте пользователя"
-
-msgid "GSettings applier for user in user context will not be started"
-msgstr "GSettings в контексте пользователя не запускается"
-
-msgid "Applying machine setting"
-msgstr "Применение настроек машины"
-
-msgid "Path not resolved as UNC URI"
-msgstr "Путь не разрешен"
-
-msgid "Getting cached file for URI"
-msgstr "Получение кешированного файла для URI"
-
-msgid "Wrote Firefox preferences to"
-msgstr "Настройки Firefox записаны в"
-
-msgid "Found Firefox profile in"
-msgstr "Найден профиль Firefox в"
-
-msgid "Running Firefox applier for machine"
-msgstr "Запуск применение настроек Firefox для машины"
-
-msgid "Firefox applier for machine will not be started"
-msgstr "Применение настроек Firefox для компьютера не запускается"
-
-msgid "Running Chromium applier for machine"
-msgstr "Запуск применение настроек Chromium для машины"
-
-msgid "Chromium applier for machine will not be started"
-msgstr "Применение настроек Chromium для компьютера не запускается"
-
-msgid "Wrote Chromium preferences to"
-msgstr "Настройки Chromium записаны в"
-
-msgid "Running Shortcut applier for machine"
-msgstr "Запуск применение ярлыков для машины"
-
-msgid "Shortcut applier for machine will not be started"
-msgstr "Применение ярлыков для компьютера не запускается"
-
-msgid "No shortcuts to process for"
-msgstr "Нет ярлыков для обработки"
-
-msgid "Running Shortcut applier for user in user context"
-msgstr "Запуск применение ярлыков  в контексте пользователя"
-
-msgid "Shortcut applier for user in user context will not be started"
-msgstr "Применение ярлыков в контексте пользователя не запускается"
-
-msgid "Running Shortcut applier for user in administrator context"
-msgstr "Запуск применение ярлыков в контексте администратора"
-
-msgid "Shortcut applier for user in administrator context will not be started"
-msgstr "Применение ярлыков в контексте администратора не запускается"
-
-msgid "Try to expand path for shortcut"
-msgstr "Попытка расширить путь для ярлыка"
-
-msgid "Applying shortcut file to"
-msgstr "Применение ярлыка к файлу"
-
-msgid "Running Folder applier for machine"
-msgstr "Запуск применение папок для машины"
-
-msgid "Folder applier for machine will not be started"
-msgstr "Применение папок для машины не запускается"
-
-msgid "Running Folder applier for user in administrator context"
-msgstr "Запуск применение папок для пользователя в контексте администратора"
-
-msgid "Folder applier for user in administrator context will not be started"
-msgstr "Применение папок для пользователя в контексте администратора не запускается"
-
-msgid "Running Folder applier for user in user context"
-msgstr "Запуск применение папок для пользователя в контексте пользователя"
-
-msgid "Folder applier for user in user context will not be started"
-msgstr "Применение папок для пользователя в контексте пользователя не запускается"
-
-msgid "Running CUPS applier for machine"
-msgstr "Запуск применение настроек CUPS для машины"
-
-msgid "CUPS applier for machine will not be started"
-msgstr "Применение настроек CUPS для машины не запускается"
-
-msgid "Running CUPS applier for user in administrator context"
-msgstr "Запуск применение настроек CUPS для пользователя в контексте администратора"
-
-msgid "CUPS applier for user in administrator context will not be started"
-msgstr "Применение настроек CUPS для пользователя в контексте администратора не запускается"
-
-msgid "Running Firewall applier for machine"
-msgstr "Запуск применение настроек Firewall для машины"
-
-msgid "Firewall is enabled"
-msgstr "Firewall включен"
-
-msgid "Firewall is disabled, settings will be reset"
-msgstr "Firewall отключен, настройки будут сброшены"
-
-msgid "Firewall applier will not be started"
-msgstr "Применение настроек Firewall не запускается"
-
-msgid "Running NTP applier for machine"
-msgstr "Запуск применение настроек NTP для машины"
-
-msgid "NTP server is configured to"
-msgstr "Сервер NTP настроен на"
-
-msgid "Starting Chrony daemon"
-msgstr "Запуск демона Chrony"
-
-msgid "Setting reference NTP server to"
-msgstr "Установка эталонного сервера NTP на"
-
-msgid "Stopping Chrony daemon"
-msgstr "Остановка демона Chrony"
-
-msgid "Configuring NTP server..."
-msgstr "Настройка NTP-сервера ..."
-
-msgid "NTP server is enabled"
-msgstr "Сервер NTP включен"
-
-msgid "NTP server is disabled"
-msgstr "NTP сервер отключен"
-
-msgid "NTP server is not configured"
-msgstr "NTP сервер не настроен"
-
-msgid "NTP client is enabled"
-msgstr "Клиент NTP включен"
-
-msgid "NTP client is disabled"
-msgstr "Клиент NTP отключен"
-
-msgid "NTP client is not configured"
-msgstr "NTP клиент не настроен"
-
-msgid "NTP applier for machine will not be started"
-msgstr "Применение настроек NTP для машины не запускается"
-
-msgid "Running Envvar applier for machine"
-msgstr "Запуск применение настроек Envvar для машины"
-
-msgid "Envvar applier for machine will not be started"
-msgstr "Применение настроек Envvar для машины не запускается"
-
-msgid "Running Envvar applier for user in user context"
-msgstr "Запуск применение настроек Envvar для пользователя в контексте пользователя"
-
-msgid "Envvar applier for user in user context will not be started"
-msgstr "Применение настроек Envvar для пользователя в контексте пользователя не запускается"
-
-msgid "Running Package applier for machine"
-msgstr "Запуск установки пакетов для машины"
-
-msgid "Package applier for machine will not be started"
-msgstr "Применение установки пакетов для машины не запускается"
-
-msgid "Running Package applier for user in administrator context"
-msgstr "Запуск установки пакетов для пользователя в контексте администратора"
-
-msgid "Package applier for user in administrator context will not be started"
-msgstr "Применение установки пакетов для пользователя в контексте администратора не запускается"
-
-msgid "Running pkcon_runner to install and remove packages"
-msgstr "Запуск pkcon_runner для установки и удаления пакетов"
-
-msgid "Run apt-get update"
-msgstr "Запускаем apt-get update"
-
-msgid "Error run apt-get update"
-msgstr "Ошибка запуска apt-get update"
-
-msgid "Run user context applier with dropped privileges"
-msgstr "Запуск из контекста пользователя с удаленными привилегиями"
-
-msgid "Run forked process with droped privileges"
-msgstr "Запустить разветвленный процесс с удаленными привилегиями"
-
-msgid "Found connection by org.freedesktop.DBus.GetConnectionUnixProcessID"
-msgstr "Найдено соединение org.freedesktop.DBus.GetConnectionUnixProcessID"
-
-msgid "Kill dbus-daemon and dconf-service in user context"
-msgstr "Остановка dbus-daemon и dconf-service в контексте пользователя"
-
-msgid "Running CIFS applier for user in administrator context"
-msgstr "Запуск применение настроек CIFS для пользователя в контексте администратора"
-
-msgid "CIFS applier for user in administrator context will not be started"
-msgstr "Применение настроек CIFS для пользователя в контексте администратора не запускается"
-
-msgid "Installing the package"
-msgstr "Установка пакета"
-
-msgid "Removing a package"
-msgstr "Удаление пакета"
-
-msgid "Failed to found gsettings for machine"
-msgstr "Не удалось найти настройки gsettings для машины"
-
-msgid "Failed to found user gsettings"
-msgstr "Не удалось найти настройки gsettings пользователя"
-
-msgid "Configure user Group Policy loopback processing mode"
-msgstr "Настройка режима обработки замыкания пользовательской групповой политики"
-
-msgid "Saving information about script"
-msgstr "Сохранение информации о скрипте"
-
-msgid "No machine scripts directory to clean up"
-msgstr "Нет каталога машинных скриптов для очистки"
-
-msgid "No user scripts directory to clean up"
-msgstr "Нет каталога пользовательских скриптов для очистки"
-
-msgid "Prepare Scripts applier for machine"
-msgstr "Подготовка к применению машинных скриптов"
-
-msgid "Scripts applier for machine will not be started"
-msgstr "Применение машинных скриптов не запускается"
-
-msgid "Prepare Scripts applier for user in user context"
-msgstr "Подготовка к применению скриптов пользователя в его контексте"
-
-msgid "Scripts applier for user in user context will not be started"
-msgstr "Применение скриптов пользователя в его контексте не запускается"
-
-msgid "Clean machine scripts directory"
-msgstr "Очистка каталога машинных скриптов"
-
-msgid "Clean user scripts directory"
-msgstr "Очистка каталога пользовательских скриптов"
-
-msgid "Create object from local_policy_gpt"
-msgstr "Создание объекта из local_policy_gpt"
-
-msgid "Failed to create object for local_policy_gpt"
-msgstr "Не удалось создать объект для local_policy_gpt"
-
-# Debug_end
-
 # Warning
 msgid "Unable to perform gpupdate for non-existent user, will update machine settings"
 msgstr "Невозможно запустить gpupdate для несуществующего пользователя, будут обновлены настройки машины"
@@ -721,21 +315,6 @@ msgstr "Пакет ADP не установлен, плагин не будет
 msgid "Unknown warning code"
 msgstr "Неизвестный код предупреждения"
 
-msgid "Unable to resolve GSettings parameter"
-msgstr "Не удалось установить параметр GSettings"
-
-msgid "No home directory exists for user"
-msgstr "Для пользователя не существует домашнего каталога"
-
-msgid "User's shortcut not placed to home directory"
-msgstr "Ярлык пользователя не помещен в домашний каталог"
-
-msgid "CUPS is not installed: no printer settings will be deployed"
-msgstr "CUPS не установлен: настройки принтера не будут развернуты"
-
-msgid "Unsupported NTP server type"
-msgstr "Неподдерживаемый тип сервера NTP"
-
 # Fatal
 msgid "Unable to refresh GPO list"
 msgstr "Невозможно обновить список объектов групповых политик"

gpoa/messages/__init__.py

@@ -23,13 +23,6 @@ def info_code(code):
     info_ids = dict()
     info_ids[1] = 'Got GPO list for username'
     info_ids[2] = 'Got GPO'
-    info_ids[3] = 'Working with control'
-    info_ids[4] = 'Working with systemd'
-    info_ids[5] = 'Unable to work with systemd unit'
-    info_ids[6] = 'Starting systemd unit'
-    info_ids[7] = 'Firefox policy'
-    info_ids[8] = 'Chromium policy'
-    info_ids[9] = 'Set user property to'
 
     return info_ids.get(code, 'Unknown info code')
 
@@ -73,34 +66,6 @@ def error_code(code):
     error_ids[36] = 'Error getting cached file for URI'
     error_ids[37] = 'Error caching file URIs'
     error_ids[38] = 'Unable to cache specified URI'
-    error_ids[39] = 'Unable to work with control'
-    error_ids[40] = 'Control applier for machine will not be started'
-    error_ids[41] = 'Error getting control'
-    error_ids[42] = 'Is not in possible values for control'
-    error_ids[43] = 'Unable to set'
-    error_ids[44] = 'Unable to generate file'
-    error_ids[45] = 'Failed applying unit'
-    error_ids[46] = 'Unable to start systemd unit'
-    error_ids[47] = 'Unable to cache specified URI for machine'
-    error_ids[48] = 'Error recompiling global GSettings schemas'
-    error_ids[49] = 'Error update configuration dconf'
-    error_ids[50] = 'Unable to cache specified URI for user'
-    error_ids[51] = 'Chromium preferences file does not exist at the moment'
-    error_ids[52] = 'Error during attempt to read Chromium preferences for user'
-    error_ids[53] = 'Fail for applying shortcut to file with \'%\''
-    error_ids[54] = 'Fail for applying shortcut to not absolute path'
-    error_ids[55] = 'Error running pkcon_runner sync for machine'
-    error_ids[56] = 'Error run apt-get update'
-    error_ids[57] = 'Package install error'
-    error_ids[58] = 'Package remove error'
-    error_ids[59] = 'Is not in possible values for control'
-    error_ids[60] = 'Error running pkcon_runner sync for user'
-    error_ids[61] = 'Error running pkcon_runner async for machine'
-    error_ids[62] = 'Error running pkcon_runner async for user'
-    error_ids[63] = 'Error merging user GPT (from machine GPO)'
-    error_ids[64] = 'Error to cleanup directory for machine'
-    error_ids[65] = 'Error to cleanup directory for user'
-
 
     return error_ids.get(code, 'Unknown error code')
 
@@ -172,103 +137,6 @@ def debug_code(code):
     debug_ids[64] = 'Delete HKCU branch key'
     debug_ids[65] = 'Delete HKLM branch key error'
     debug_ids[66] = 'Delete HKCU branch key error'
-    debug_ids[67] = 'Running Control applier for machine'
-    debug_ids[68] = 'Setting control'
-    debug_ids[69] = 'Deny_All setting found'
-    debug_ids[70] = 'Deny_All setting for user'
-    debug_ids[71] = 'Deny_All setting not found'
-    debug_ids[72] = 'Deny_All setting not found for user'
-    debug_ids[73] = 'Running Polkit applier for machine'
-    debug_ids[74] = 'Running Polkit applier for user in administrator context'
-    debug_ids[75] = 'Polkit applier for machine will not be started'
-    debug_ids[76] = 'Polkit applier for user in administrator context will not be started'
-    debug_ids[77] = 'Generated file'
-    debug_ids[78] = 'Running systemd applier for machine'
-    debug_ids[79] = 'Running systemd applier for machine will not be started'
-    debug_ids[80] = 'Running GSettings applier for machine'
-    debug_ids[81] = 'GSettings applier for machine will not be started'
-    debug_ids[82] = 'Removing GSettings policy file from previous run'
-    debug_ids[83] = 'Mapping Windows policies to GSettings policies'
-    debug_ids[84] = 'GSettings windows policies mapping not enabled'
-    debug_ids[85] = 'Applying user setting'
-    debug_ids[86] = 'Found GSettings windows mapping'
-    debug_ids[87] = 'Running GSettings applier for user in user context'
-    debug_ids[88] = 'GSettings applier for user in user context will not be started'
-    debug_ids[89] = 'Applying machine setting'
-    debug_ids[90] = 'Getting cached file for URI'
-    debug_ids[91] = 'Wrote Firefox preferences to'
-    debug_ids[92] = 'Found Firefox profile in'
-    debug_ids[93] = 'Running Firefox applier for machine'
-    debug_ids[94] = 'Firefox applier for machine will not be started'
-    debug_ids[95] = 'Running Chromium applier for machine'
-    debug_ids[96] = 'Chromium applier for machine will not be started'
-    debug_ids[97] = 'Wrote Chromium preferences to'
-    debug_ids[98] = 'Running Shortcut applier for machine'
-    debug_ids[99] = 'Shortcut applier for machine will not be started'
-    debug_ids[100] = 'No shortcuts to process for'
-    debug_ids[101] = 'Running Shortcut applier for user in user context'
-    debug_ids[102] = 'Shortcut applier for user in user context will not be started'
-    debug_ids[103] = 'Running Shortcut applier for user in administrator context'
-    debug_ids[104] = 'Shortcut applier for user in administrator context will not be started'
-    debug_ids[105] = 'Try to expand path for shortcut'
-    debug_ids[106] = 'Applying shortcut file to'
-    debug_ids[107] = 'Running Folder applier for machine'
-    debug_ids[108] = 'Folder applier for machine will not be started'
-    debug_ids[109] = 'Running Folder applier for user in administrator context'
-    debug_ids[110] = 'Folder applier for user in administrator context will not be started'
-    debug_ids[111] = 'Running Folder applier for user in user context'
-    debug_ids[112] = 'Folder applier for user in user context will not be started'
-    debug_ids[113] = 'Running CUPS applier for machine'
-    debug_ids[114] = 'CUPS applier for machine will not be started'
-    debug_ids[115] = 'Running CUPS applier for user in administrator context'
-    debug_ids[116] = 'CUPS applier for user in administrator context will not be started'
-    debug_ids[117] = 'Running Firewall applier for machine'
-    debug_ids[118] = 'Firewall is enabled'
-    debug_ids[119] = 'Firewall is disabled, settings will be reset'
-    debug_ids[120] = 'Firewall applier will not be started'
-    debug_ids[121] = 'Running NTP applier for machine'
-    debug_ids[122] = 'NTP server is configured to'
-    debug_ids[123] = 'Starting Chrony daemon'
-    debug_ids[124] = 'Setting reference NTP server to'
-    debug_ids[125] = 'Stopping Chrony daemon'
-    debug_ids[126] = 'Configuring NTP server...'
-    debug_ids[127] = 'NTP server is enabled'
-    debug_ids[128] = 'NTP server is disabled'
-    debug_ids[129] = 'NTP server is not configured'
-    debug_ids[130] = 'NTP client is enabled'
-    debug_ids[131] = 'NTP client is disabled'
-    debug_ids[132] = 'NTP client is not configured'
-    debug_ids[133] = 'NTP applier for machine will not be started'
-    debug_ids[134] = 'Running Envvar applier for machine'
-    debug_ids[135] = 'Envvar applier for machine will not be started'
-    debug_ids[136] = 'Running Envvar applier for user in user context'
-    debug_ids[137] = 'Envvar applier for user in user context will not be started'
-    debug_ids[138] = 'Running Package applier for machine'
-    debug_ids[139] = 'Package applier for machine will not be started'
-    debug_ids[140] = 'Running Package applier for user in administrator context'
-    debug_ids[141] = 'Package applier for user in administrator context will not be started'
-    debug_ids[142] = 'Running pkcon_runner to install and remove packages'
-    debug_ids[143] = 'Run apt-get update'
-    debug_ids[144] = 'Unable to cache specified URI'
-    debug_ids[145] = 'Unable to cache specified URI for machine'
-    debug_ids[146] = 'Running CIFS applier for user in administrator context'
-    debug_ids[147] = 'CIFS applier for user in administrator context will not be started'
-    debug_ids[148] = 'Installing the package'
-    debug_ids[149] = 'Removing a package'
-    debug_ids[150] = 'Failed to found gsettings for machine'
-    debug_ids[151] = 'Failed to found user gsettings'
-    debug_ids[152] = 'Configure user Group Policy loopback processing mode'
-    debug_ids[153] = 'Saving information about script'
-    debug_ids[154] = 'No machine scripts directory to clean up'
-    debug_ids[155] = 'No user scripts directory to clean up'
-    debug_ids[156] = 'Prepare Scripts applier for machine'
-    debug_ids[157] = 'Scripts applier for machine will not be started'
-    debug_ids[158] = 'Prepare Scripts applier for user in user context'
-    debug_ids[159] = 'Scripts applier for user in user context will not be started'
-    debug_ids[160] = 'Clean machine scripts directory'
-    debug_ids[161] = 'Clean user scripts directory'
-    debug_ids[162] = 'Create object from local_policy_gpt'
-    debug_ids[163] = 'Failed to create object for local_policy_gpt'
 
     return debug_ids.get(code, 'Unknown debug code')
 
@@ -285,12 +153,6 @@ def warning_code(code):
     warning_ids[3] = 'oddjobd is inaccessible'
     warning_ids[4] = 'No SYSVOL entry assigned to GPO'
     warning_ids[5] = 'ADP package is not installed - plugin will not be initialized'
-    warning_ids[6] = 'Unable to resolve GSettings parameter'
-    warning_ids[7] = 'No home directory exists for user'
-    warning_ids[8] = 'User\'s shortcut not placed to home directory'
-    warning_ids[9] = 'CUPS is not installed: no printer settings will be deployed'
-    warning_ids[10] = 'Unsupported NTP server type'
-    warning_ids[11] = 'Unable to refresh GPO list'
 
     return warning_ids.get(code, 'Unknown warning code')
 

gpoa/pkcon_runner

@@ -1,150 +0,0 @@
-#!/usr/bin/python3
-#
-# GPOA - GPO Applier for Linux
-#
-# Copyright (C) 2019-2020 BaseALT Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import rpm
-import subprocess
-from gpoa.storage import registry_factory
-import logging
-from util.logging import log
-import argparse
-import gettext
-import locale
-from messages import message_with_code
-from util.arguments import (
-    set_loglevel
-)
-
-
-def is_rpm_installed(rpm_name):
-    '''
-    Check if the package named 'rpm_name' is installed
-    '''
-    ts = rpm.TransactionSet()
-    pm = ts.dbMatch('name', rpm_name)
-    if pm.count() > 0:
-        return True
-
-    return False
-
-class Pkcon_applier:
-
-    def __init__(self, sid = None):
-        self.__install_key_name = 'Install'
-        self.__remove_key_name = 'Remove'
-        self.__hkcu_branch = 'Software\\BaseALT\\Policies\\Packages'
-        self.__hklm_branch = 'Software\\BaseALT\\Policies\\Packages'
-        self.__install_command = ['/usr/bin/pkcon', '-y', 'install']
-        self.__remove_command = ['/usr/bin/pkcon', '-y', 'remove']
-        self.__reinstall_command = ['/usr/bin/pkcon', '-y', 'reinstall']
-        self.install_packages = set()
-        self.remove_packages = set()
-        self.storage = registry_factory('registry')
-        if sid:
-            install_branch_user = '{}\\{}%'.format(self.__hkcu_branch, self.__install_key_name)
-            remove_branch_user = '{}\\{}%'.format(self.__hkcu_branch, self.__remove_key_name)
-            self.install_packages_setting = self.storage.filter_hkcu_entries(sid, install_branch_user)
-            self.remove_packages_setting = self.storage.filter_hkcu_entries(sid, remove_branch_user)
-        else:
-            install_branch = '{}\\{}%'.format(self.__hklm_branch, self.__install_key_name)
-            remove_branch = '{}\\{}%'.format(self.__hklm_branch, self.__remove_key_name)
-            self.install_packages_setting = self.storage.filter_hklm_entries(install_branch)
-            self.remove_packages_setting = self.storage.filter_hklm_entries(remove_branch)
-        for package in self.install_packages_setting:
-            if not is_rpm_installed(package.data):
-                self.install_packages.add(package.data)
-        for package in self.remove_packages_setting:
-            if package.data in self.install_packages:
-                self.install_packages.remove(package.data)
-            if is_rpm_installed(package.data):
-                self.remove_packages.add(package.data)
-
-    def apply(self):
-        log('D142')
-        self.update()
-        for package in self.remove_packages:
-            try:
-                logdata = dict()
-                logdata['name'] = package
-                log('D149', logdata)
-                self.remove_pkg(package)
-            except Exception as exc:
-                logdata = dict()
-                logdata['exc'] = exc
-                log('E58', logdata)
-
-        for package in self.install_packages:
-           try:
-                logdata = dict()
-                logdata['name'] = package
-                log('D148', logdata)
-                self.install_pkg(package)
-           except Exception as exc:
-                logdata = dict()
-                logdata['exc'] = exc
-                log('E57', logdata)
-
-
-    def install_pkg(self, package_name):
-        fullcmd = list(self.__install_command)
-        fullcmd.append(package_name)
-        return subprocess.check_output(fullcmd)
-
-    def reinstall_pkg(self, package_name):
-        pass
-
-    def remove_pkg(self, package_name):
-        fullcmd = self.__remove_command
-        fullcmd.append(package_name)
-        return subprocess.check_output(fullcmd)
-
-    def update(self):
-        '''
-        Update APT-RPM database.
-        '''
-        try:
-            res =  subprocess.check_output(['/usr/bin/apt-get', 'update'], encoding='utf-8')
-            msg =  str(res).split('\n')
-            logdata = dict()
-            for mslog in msg:
-                ms =  str(mslog).split(' ')
-                if ms:
-                    logdata = {ms[0]: ms[1:-1]}
-                log('D143', logdata)
-        except Exception as exc:
-            logdata = dict()
-            logdata['msg'] = exc
-            log('E56',logdata)
-
-if __name__ == '__main__':
-    locale.bindtextdomain('gpoa', '/usr/lib/python3/site-packages/gpoa/locale')
-    gettext.bindtextdomain('gpoa', '/usr/lib/python3/site-packages/gpoa/locale')
-    gettext.textdomain('gpoa')
-    logger = logging.getLogger()
-    parser = argparse.ArgumentParser(description='Package applier')
-    parser.add_argument('--sid', type = str, help = 'sid', nargs = '?', default = None)
-    parser.add_argument('--loglevel', type = int, help = 'loglevel', nargs = '?', default = 30)
-
-    args = parser.parse_args()
-    logger.setLevel(args.loglevel)
-    if args.sid:
-        applier = Pkcon_applier(args.sid)
-    else:
-        applier = Pkcon_applier()
-    applier.apply()
-

gpoa/scripts_runner

@@ -1,124 +0,0 @@
-#!/usr/bin/python3
-#
-# GPOA - GPO Applier for Linux
-#
-# Copyright (C) 2019-2022 BaseALT Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import subprocess
-import argparse
-import os
-from pathlib import Path
-
-class Scripts_runner:
-    '''
-    A class for an object that iterates over directories with scripts
-    in the desired sequence and launches them
-    '''
-    def __init__(self, work_mode = None,  user_name = None, action = None):
-        self.dir_scripts_machine = '/var/cache/gpupdate_scripts_cache/machine/'
-        self.dir_scripts_users = '/var/cache/gpupdate_scripts_cache/users/'
-        self.user_name = user_name
-        self.list_with_all_commands = list()
-        stack_dir = None
-        if work_mode and work_mode.upper() == 'MACHINE':
-            stack_dir = self.machine_runner_fill()
-        elif work_mode and work_mode.upper() == 'USER':
-            stack_dir = self.user_runner_fill()
-        else:
-            print('Invalid arguments entered')
-            return
-        if action:
-            self.action = action.upper()
-        else:
-            print('Action needed')
-            return
-
-        self.find_action(stack_dir)
-        for it_cmd in self.list_with_all_commands:
-            print(self.run_cmd_subprocess(it_cmd))
-
-    def user_runner_fill(self):
-        return self.get_stack_dir(self.dir_scripts_users + self.user_name)
-
-    def machine_runner_fill(self):
-        return self.get_stack_dir(self.dir_scripts_machine)
-
-    def get_stack_dir(self, path_dir):
-        stack_dir = list()
-        try:
-            dir_script = Path(path_dir)
-            for it_dir in dir_script.iterdir():
-                stack_dir.append(str(it_dir))
-            return stack_dir
-        except Exception as exc:
-            print(exc)
-            return None
-
-    def find_action(self, stack_dir):
-        if not stack_dir:
-            return
-        list_tmp = list()
-        while stack_dir:
-            path_turn = stack_dir.pop()
-            basename = os.path.basename(path_turn)
-            if basename == self.action:
-                list_tmp = self.get_stack_dir(path_turn)
-        if list_tmp:
-            self.fill_list_cmd(list_tmp)
-
-
-    def fill_list_cmd(self, list_tmp):
-        list_tmp = sorted(list_tmp)
-        for file_in_task_dir in list_tmp:
-            suffix = os.path.basename(file_in_task_dir)[-4:]
-            if suffix == '.arg':
-                try:
-                    arg = self.read_args(file_in_task_dir)
-                    for it_arg in arg.split():
-                        self.list_with_all_commands[-1].append(it_arg)
-                except Exception as exc:
-                    print('Argument read for {}: {}'.format(self.list_with_all_commands.pop(), exc))
-            else:
-                cmd = list()
-                cmd.append(file_in_task_dir)
-                self.list_with_all_commands.append(cmd)
-
-
-    def read_args(self, path):
-        with open(path + '/arg') as f:
-            args = f.readlines()
-        return args[0]
-
-    def run_cmd_subprocess(self, cmd):
-        try:
-            res = subprocess.check_output(cmd, encoding='utf-8')
-            return 'Script output: {}'.format(res)
-        except Exception as exc:
-            return exc
-
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Scripts runner')
-    parser.add_argument('--mode', type = str, help = 'MACHINE or USER', nargs = '?', default = None)
-    parser.add_argument('--user', type = str, help = 'User name ', nargs = '?', default = None)
-    parser.add_argument('--action', type = str, help = 'MACHINE : [STARTUP or SHUTDOWN], USER : [LOGON or LOGOFF]', nargs = '?', default = None)
-
-    args = parser.parse_args()
-    try:
-        Scripts_runner(args.mode, args.user, args.action)
-    except Exception as exc:
-        print(exc)

gpoa/storage/fs_file_cache.py

@@ -50,7 +50,7 @@ class fs_file_cache:
                 file_path))
         except Exception as exc:
             logdata = dict({'exception': str(exc)})
-            log('D144', logdata)
+            log('E38', logdata)
             raise exc
 
         if not destdir.exists():

gpoa/storage/record_types.py

@@ -174,27 +174,3 @@ class envvar_entry(object):
 
         return fields
 
-class script_entry(object):
-    '''
-    Object mapping representing scripts.ini
-    '''
-    def __init__(self, sid, scrobj, policy_name):
-        self.sid = sid
-        self.policy_name = policy_name
-        self.action = scrobj.action
-        self.number = scrobj.number
-        self.path = scrobj.path
-        self.arg = scrobj.args
-
-    def update_fields(self):
-        '''
-        Return list of fields to update
-        '''
-        fields = dict()
-        fields['policy_name'] = self.policy_name
-        fields['action'] = self.action
-        fields['number'] = self.number
-        fields['path'] = self.path
-        fields['arg'] = self.arg
-
-        return fields

gpoa/storage/sqlite_registry.py

@@ -44,7 +44,6 @@ from .record_types import (
     , drive_entry
     , folder_entry
     , envvar_entry
-    , script_entry
 )
 
 class sqlite_registry(registry):
@@ -144,18 +143,6 @@ class sqlite_registry(registry):
             , Column('value', String)
             , UniqueConstraint('sid', 'name')
         )
-        self.__scripts = Table(
-              'Scripts'
-            , self.__metadata
-            , Column('id', Integer, primary_key=True)
-            , Column('sid', String)
-            , Column('policy_name', String)
-            , Column('number', String)
-            , Column('action', String)
-            , Column('path', String)
-            , Column('arg', String)
-            , UniqueConstraint('sid', 'path', 'arg')
-        )
         self.__metadata.create_all(self.db_cnt)
         Session = sessionmaker(bind=self.db_cnt)
         self.db_session = Session()
@@ -168,7 +155,6 @@ class sqlite_registry(registry):
             mapper(drive_entry, self.__drives)
             mapper(folder_entry, self.__folders)
             mapper(envvar_entry, self.__envvars)
-            mapper(script_entry, self.__scripts)
         except:
             pass
             #logging.error('Error creating mapper')
@@ -379,21 +365,6 @@ class sqlite_registry(registry):
                 .filter(envvar_entry.name == ev_entry.name)
                 .update(ev_entry.update_fields()))
             self.db_session.commit()
-    def add_script(self, sid, scrobj, policy_name):
-        scr_entry = script_entry(sid, scrobj, policy_name)
-        logdata = dict()
-        logdata['script path'] = scrobj.path
-        logdata['sid'] = sid
-        log('D153', logdata)
-        try:
-            self._add(scr_entry)
-        except Exception as exc:
-            (self
-                ._filter_sid_obj(script_entry, sid)
-                .filter(script_entry.path == scr_entry.path)
-                .update(scr_entry.update_fields()))
-            self.db_session.commit()
-
 
     def _filter_sid_obj(self, row_object, sid):
         res = (self
@@ -426,19 +397,6 @@ class sqlite_registry(registry):
     def get_envvars(self, sid):
         return self._filter_sid_list(envvar_entry, sid)
 
-    def _filter_scripts_list(self, row_object, sid, action):
-        res = (self
-            .db_session
-            .query(row_object)
-            .filter(row_object.sid == sid)
-            .filter(row_object.action == action)
-            .order_by(row_object.id)
-            .all())
-        return res
-
-    def get_scripts(self, sid, action):
-        return self._filter_scripts_list(script_entry, sid, action)
-
     def get_hkcu_entry(self, sid, hive_key):
         res = (self
             .db_session
@@ -488,7 +446,6 @@ class sqlite_registry(registry):
         self._wipe_sid(ad_shortcut, sid)
         self._wipe_sid(printer_entry, sid)
         self._wipe_sid(drive_entry, sid)
-        self._wipe_sid(script_entry, sid)
 
     def _wipe_sid(self, row_object, sid):
         (self

gpoa/templates/autofs_auto.j2

@@ -16,5 +16,5 @@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #}
-{{ home_dir }}/net	{{ mount_file }}	-t 120  --browse
+{{ home_dir }}/net	{{ mount_file }}	-t 120
 

gpoa/util/arguments.py

@@ -64,15 +64,18 @@ def process_target(target_name=None):
     The target may be 'All', 'Computer' or 'User'. This function
     determines which one was specified.
     '''
+    target = 'All'
 
-    target = "All"
-    if target_name:
-        target = target_name
+    if target_name == 'Computer':
+        target = 'Computer'
+
+    if target_name == 'User':
+        target = 'User'
 
     logdata = dict({'target': target})
     logging.debug(slogm(message_with_code('D10'), logdata))
 
-    return target.upper()
+    return target
 
 class ExitCodeUpdater(IntEnum):
     '''

gpoa/util/config.py

@@ -18,7 +18,6 @@
 
 
 from configparser import ConfigParser
-from os import stat
 
 from .util import (
       get_backends
@@ -61,35 +60,22 @@ class GPConfig:
             if 'dc' in self.full_config['samba']:
                 return self.full_config['samba']['dc']
 
-    def get_local_policy_default_template(self):
+    def get_local_policy_template(self):
         '''
         Fetch the name of chosen Local Policy template from
         configuration file.
         '''
         if 'gpoa' in self.full_config:
             if 'local-policy' in self.full_config['gpoa']:
-                return self.full_config['gpoa']['local-policy-default']
+                return self.full_config['gpoa']['local-policy']
 
         return get_default_policy_name()
 
-    def set_local_policy_default_template(self, template_name='default'):
-        self.full_config['gpoa']['local-policy-default'] = template_name
+    def set_local_policy_template(self, template_name='default'):
+        self.full_config['gpoa']['local-policy'] = template_name
         self.write_config()
 
     def write_config(self):
         with open(self.__config_path, 'w') as config_file:
             self.full_config.write(config_file)
 
-    def get_local_policy(self):
-        '''
-        Get local-admin states from the config file.
-        '''
-        if 'gpoa' in self.full_config:
-            if 'local-admin' in self.full_config['gpoa']:
-                    if self.full_config['gpoa']['local-policy'] in [1 , '1', 'True', True , 'true']:
-                        return True
-        return False
-
-    def set_local_policy(self, state='False'):
-        self.full_config['gpoa']['local-policy'] = state
-        self.write_config()

gpoa/util/dbus.py

@@ -58,8 +58,8 @@ class dbus_runner:
                         self._object_path,
                         self._interface_name,
                         'gpupdatefor',
-                        's',
-                        [self.username],
+                        (username),
+                        (dbus.String(self.username)),
                         timeout=self._synchronous_timeout)
                     print_dbus_result(result)
                 except dbus.exceptions.DBusException as exc:
@@ -74,7 +74,7 @@ class dbus_runner:
                         self._interface_name,
                         'gpupdate',
                         None,
-                        [],
+                        (),
                         timeout=self._synchronous_timeout)
                     print_dbus_result(result)
                 except dbus.exceptions.DBusException as exc:
@@ -91,7 +91,7 @@ class dbus_runner:
                     None,
                     # The following positional parameter is called "args".
                     # There is no official documentation for it.
-                    [],
+                    (),
                     timeout=self._synchronous_timeout)
                 print_dbus_result(result)
             except dbus.exceptions.DBusException as exc:
@@ -168,7 +168,7 @@ def print_dbus_result(result):
     log('D12', logdata)
 
     for line in message:
-        if line: print(str(line))
+        print(str(line))
 
 
 class dbus_session:

gpoa/util/logging.py

@@ -49,8 +49,16 @@ class slogm(object):
     def __str__(self):
         now = str(datetime.datetime.now().isoformat(sep=' ', timespec='milliseconds'))
         args = dict()
+        #args.update(dict({'timestamp': now, 'message': str(self.message)}))
         args.update(self.kwargs)
-        result = '{}|{}|{}'.format(now, self.message, args)
+
+        kwa = dict()
+        try:
+            kwa = encoder().encode(args)
+        except Exception as exc:
+            pass
+
+        result = '{}|{}|{}'.format(now, self.message, kwa)
 
         return result
 

gpoa/util/paths.py

@@ -30,24 +30,24 @@ def get_custom_policy_dir():
     '''
     Returns path pointing to Custom Policy directory.
     '''
-    return '/etc/local-policy-default'
+    return '/etc/local-policy'
 
-def local_policy_default_path(default_template_name="default"):
+def local_policy_path(default_template_name="default"):
     '''
     Returns path pointing to Local Policy template directory.
     '''
-    local_policy_dir = '/usr/share/local-policy-default'
+    local_policy_dir = '/usr/share/local-policy'
 
     config = GPConfig()
-    local_policy_default_template = config.get_local_policy_default_template()
-    local_policy_default_template_path = os.path.join(local_policy_dir, local_policy_default_template)
+    local_policy_template = config.get_local_policy_template()
+    local_policy_template_path = os.path.join(local_policy_dir, local_policy_template)
     local_policy_default = os.path.join(local_policy_dir, default_template_name)
 
     result_path = pathlib.Path(local_policy_default)
-    if os.path.exists(local_policy_default_template):
-        result_path = pathlib.Path(local_policy_default_template)
-    elif os.path.exists(local_policy_default_template_path):
-        result_path = pathlib.Path(local_policy_default_template_path)
+    if os.path.exists(local_policy_template):
+        result_path = pathlib.Path(local_policy_template)
+    elif os.path.exists(local_policy_template_path):
+        result_path = pathlib.Path(local_policy_template_path)
 
     return pathlib.Path(result_path)
 
@@ -73,18 +73,12 @@ def file_cache_dir():
 
     return cachedir
 
-def local_policy_path():
+def local_policy_cache():
     '''
-    Returns path to directory where GPT local admin policy.
-    '''
-    return '/etc/gpupdate/local_policy'
-
-def local_policy_default_cache():
-    '''
-    Returns path to directory where lies local default policy settings cache
+    Returns path to directory where lies local policy settings cache
     transformed into GPT.
     '''
-    lpcache = pathlib.Path.joinpath(cache_dir(), 'local-policy-default')
+    lpcache = pathlib.Path.joinpath(cache_dir(), 'local-policy')
 
     if not lpcache.exists():
         lpcache.mkdir(parents=True, exist_ok=True)

gpoa/util/sid.py

@@ -19,12 +19,6 @@
 
 from enum import Enum
 
-import pwd
-import logging
-import subprocess
-import pysss_nss_idmap
-
-from .logging import log
 
 def wbinfo_getsid(domain, user):
     '''
@@ -45,35 +39,25 @@ def wbinfo_getsid(domain, user):
     return sid
 
 
-def get_local_sid_prefix():
-    return "S-1-5-21-0-0-0"
-
-
-def get_sid(domain, username, is_machine = False):
+def get_sid(domain, username):
     '''
     Lookup SID not only using wbinfo or sssd but also using own cache
     '''
+    domain_username = '{}\\{}'.format(domain, username)
     sid = 'local-{}'.format(username)
 
-    # local user
-    if not domain:
-        found_uid = 0
-        if not is_machine:
-            found_uid = pwd.getpwnam(username).pw_uid
-        return '{}-{}'.format(get_local_sid_prefix(), found_uid)
-
-    # domain user
     try:
         sid = wbinfo_getsid(domain, username)
     except:
-        logdata = dict({'sid': sid})
-        log('E16', logdata)
+        sid = 'local-{}'.format(username)
+        logging.warning(
+            slogm('Error getting SID using wbinfo, will use cached SID: {}'.format(sid)))
 
-    logdata = dict({'sid': sid})
-    log('D21', logdata)
+    logging.debug(slogm('Working with SID: {}'.format(sid)))
 
     return sid
 
+
 class IssuingAuthority(Enum):
     SECURITY_NULL_SID_AUTHORITY = 0
     SECURITY_WORLD_SID_AUTHORITY = 1

gpoa/util/system.py

@@ -21,7 +21,7 @@ import sys
 import pwd
 import signal
 import subprocess
-import locale
+
 from .logging import log
 from .dbus import dbus_session
 
@@ -30,13 +30,11 @@ def set_privileges(username, uid, gid, groups, home):
     '''
     Set current process privileges
     '''
-    defaultlocale = locale.getdefaultlocale()
+
     os.environ.clear()
     os.environ['HOME'] = home
     os.environ['USER'] = username
     os.environ['USERNAME'] = username
-    if defaultlocale[0] and defaultlocale[1]:
-        os.environ["LANG"] = '.'.join(defaultlocale)
 
     try:
         os.setgid(gid)

gpoa/util/util.py

@@ -122,10 +122,10 @@ def get_backends():
 
 def get_default_policy_name():
     '''
-    Determine the preferred Local default Policy template name according to
+    Determine the preferred Local Policy template name according to
     ALT distribution type
     '''
-    localdefaultpolicy = 'workstation'
+    localpolicy = 'workstation'
     dcpolicy = 'ad-domain-controller'
 
     try:
@@ -140,15 +140,15 @@ def get_default_policy_name():
             f = open(release)
             s = f.readline()
             if re.search('server', s, re.I):
-                localdefaultpolicy = 'server'
+                localpolicy = 'server'
     except:
         pass
 
-    return localdefaultpolicy
+    return localpolicy
 
-def get_policy_default_entries(directory):
+def get_policy_entries(directory):
     '''
-    Get list of directories representing "Local default Policy" templates.
+    Get list of directories representing "Local Policy" templates.
     '''
     filtered_entries = list()
     if os.path.isdir(directory):
@@ -162,17 +162,17 @@ def get_policy_default_entries(directory):
 
     return filtered_entries
 
-def get_policy_default_variants():
+def get_policy_variants():
     '''
-    Get the list of local default policy variants deployed on this system.
+    Get the list of local policy variants deployed on this system.
     Please note that is case overlapping names the names in
-    /etc/local-policy-default must override names in /usr/share/local-policy-default
+    /etc/local-policy must override names in /usr/share/local-policy
     '''
-    policy_dir = '/usr/share/local-policy-default'
-    etc_policy_dir = '/etc/local-policy-default'
+    policy_dir = '/usr/share/local-policy'
+    etc_policy_dir = '/etc/local-policy'
 
-    system_policies = get_policy_default_entries(policy_dir)
-    user_policies = get_policy_default_entries(etc_policy_dir)
+    system_policies = get_policy_entries(policy_dir)
+    user_policies = get_policy_entries(etc_policy_dir)
 
     general_listing = list()
     general_listing.extend(system_policies)

gpoa/util/windows.py

@@ -18,12 +18,14 @@
 
 
 import os
-import subprocess
+import pwd
+
 from samba import getopt as options
-from samba import NTSTATUSError
+
 from samba.gpclass import get_dc_hostname, check_refresh_gpo_list
 from samba.netcmd.common import netcmd_get_domain_infos_via_cldap
 import samba.gpo
+import pysss_nss_idmap
 
 from storage import cache_factory
 from messages import message_with_code
@@ -115,42 +117,75 @@ class smbcreds (smbopts):
     def update_gpos(self, username):
         gpos = self.get_gpos(username)
 
-        list_selected_dc = set()
-        list_selected_dc.add(self.selected_dc)
-
-        while list_selected_dc:
+        try:
+            log('D49')
+            check_refresh_gpo_list(self.selected_dc, self.lp, self.creds, gpos)
+            log('D50')
+        except Exception as exc:
             logdata = dict()
             logdata['username'] = username
             logdata['dc'] = self.selected_dc
-            try:
-                log('D49', logdata)
-                check_refresh_gpo_list(self.selected_dc, self.lp, self.creds, gpos)
-                log('D50', logdata)
-                list_selected_dc.clear()
-            except NTSTATUSError as smb_exc:
-                logdata['smb_exc'] = str(smb_exc)
-                self.selected_dc = get_dc_hostname(self.creds, self.lp)
-                if self.selected_dc not in list_selected_dc:
-                    logdata['action'] = 'Search another dc'
-                    log('W11', logdata)
-                    list_selected_dc.add(self.selected_dc)
-                else:
-                    log('F1', logdata)
-                    raise smb_exc
-            except Exception as exc:
-                logdata['exc'] = str(exc)
-                log('F1', logdata)
-                raise exc
+            logdata['err'] = str(exc)
+            log('F1')
+            raise exc
         return gpos
 
+
+def wbinfo_getsid(domain, user):
+    '''
+    Get SID using wbinfo
+    '''
+    # This part works only on client
+    username = '{}\\{}'.format(domain.upper(), user)
+    sid = pysss_nss_idmap.getsidbyname(username)
+
+    if username in sid:
+        return sid[username]['sid']
+
+    # This part works only on DC
+    wbinfo_cmd = ['wbinfo', '-n', username]
+    output = subprocess.check_output(wbinfo_cmd)
+    sid = output.split()[0].decode('utf-8')
+
+    return sid
+
+
+def get_local_sid_prefix():
+    return "S-1-5-21-0-0-0"
+
+
+def get_sid(domain, username, is_machine = False):
+    '''
+    Lookup SID not only using wbinfo or sssd but also using own cache
+    '''
+    sid = 'local-{}'.format(username)
+
+    # local user
+    if not domain:
+        found_uid = 0
+        if not is_machine:
+            found_uid = pwd.getpwnam(username).pw_uid
+        return '{}-{}'.format(get_local_sid_prefix(), found_uid)
+
+    # domain user
+    try:
+        sid = wbinfo_getsid(domain, username)
+    except:
+        logdata = dict({'sid': sid})
+        log('E16', logdata)
+
+    logdata = dict({'sid': sid})
+    log('D21', logdata)
+
+    return sid
+
+
 def expand_windows_var(text, username=None):
     '''
     Scan the line for percent-encoded variables and expand them.
     '''
     variables = dict()
     variables['HOME'] = '/etc/skel'
-    variables['HOMEPATH'] = '/etc/skel'
-    variables['HOMEDRIVE'] = '/'
     variables['SystemRoot'] = '/'
     variables['StartMenuDir'] = '/usr/share/applications'
     variables['SystemDrive'] = '/'
@@ -159,7 +194,6 @@ def expand_windows_var(text, username=None):
     if username:
         variables['LogonUser'] = username
         variables['HOME'] = get_homedir(username)
-        variables['HOMEPATH'] = get_homedir(username)
 
         variables['StartMenuDir'] = os.path.join(
             variables['HOME'], '.local', 'share', 'applications')

gpoa/util/xdg.py

@@ -18,7 +18,7 @@
 
 
 import os
-from messages import message_with_code
+
 from .util import get_homedir
 from .logging import log
 

gpupdate.spec

@@ -1,8 +1,8 @@
 %define _unpackaged_files_terminate_build 1
 
 Name: gpupdate
-Version: 0.9.9.1
-Release: alt1
+Version: 0.9.8
+Release: alt0.dev1
 
 Summary: GPT applier
 License: GPLv3+
@@ -57,18 +57,9 @@ ln -s %python3_sitelibdir/gpoa/gpoa \
 	%buildroot%_sbindir/gpoa
 ln -s %python3_sitelibdir/gpoa/gpupdate \
 	%buildroot%_bindir/gpupdate
-
 ln -s %python3_sitelibdir/gpoa/gpupdate-setup \
 	%buildroot%_sbindir/gpupdate-setup
 
-mkdir -p \
-	%buildroot%_prefix/libexec/%name
-
-ln -s %python3_sitelibdir/gpoa/pkcon_runner \
-	%buildroot%_prefix/libexec/%name/pkcon_runner
-ln -s %python3_sitelibdir/gpoa/scripts_runner \
-	%buildroot%_prefix/libexec/%name/scripts_runner
-
 mkdir -p %buildroot%_datadir/%name
 mv %buildroot%python3_sitelibdir/gpoa/templates \
 	%buildroot%_datadir/%name/
@@ -77,13 +68,8 @@ mkdir -p %buildroot%_sysconfdir/%name
 touch %buildroot%_sysconfdir/%name/environment
 
 install -Dm0644 dist/%name.service %buildroot%_unitdir/%name.service
-install -Dm0644 dist/%name.timer %buildroot%_unitdir/%name.timer
-install -Dm0644 dist/%name-scripts-run.service %buildroot%_unitdir/%name-scripts-run.service
 install -Dm0644 dist/%name-user.service %buildroot/usr/lib/systemd/user/%name-user.service
-install -Dm0644 dist/%name-scripts-run-user.service %buildroot/usr/lib/systemd/user/%name-scripts-run-user.service
-install -Dm0644 dist/%name-user.timer %buildroot/usr/lib/systemd/user/%name-user.timer
 install -Dm0644 dist/system-policy-%name %buildroot%_sysconfdir/pam.d/system-policy-%name
-install -Dm0644 dist/%name-remote-policy %buildroot%_sysconfdir/pam.d/%name-remote-policy
 install -Dm0644 dist/%name.ini %buildroot%_sysconfdir/%name/%name.ini
 install -Dm0644 doc/gpoa.1 %buildroot/%_man1dir/gpoa.1
 install -Dm0644 doc/gpupdate.1 %buildroot/%_man1dir/gpupdate.1
@@ -101,7 +87,6 @@ done
 
 %post
 %post_service gpupdate
-gpupdate-setup update
 
 # Remove storage in case we've lost compatibility between versions.
 # The storage will be regenerated on GPOA start.
@@ -117,29 +102,20 @@ fi
 %_sbindir/gpoa
 %_sbindir/gpupdate-setup
 %_bindir/gpupdate
-%_prefix/libexec/%name/scripts_runner
-%_prefix/libexec/%name/pkcon_runner
 %attr(755,root,root) %python3_sitelibdir/gpoa/gpoa
 %attr(755,root,root) %python3_sitelibdir/gpoa/gpupdate
 %attr(755,root,root) %python3_sitelibdir/gpoa/gpupdate-setup
-%attr(755,root,root) %python3_sitelibdir/gpoa/scripts_runner
-%attr(755,root,root) %python3_sitelibdir/gpoa/pkcon_runner
 %python3_sitelibdir/gpoa
 %_datadir/%name
 %_unitdir/%name.service
-%_unitdir/%name-scripts-run.service
-%_unitdir/%name.timer
 %_man1dir/gpoa.1.*
 %_man1dir/gpupdate.1.*
 /usr/lib/systemd/user/%name-user.service
-/usr/lib/systemd/user/%name-user.timer
-/usr/lib/systemd/user/%name-scripts-run-user.service
 %dir %_sysconfdir/%name
 %_sysconfdir/control.d/facilities/*
 %config(noreplace) %_sysconfdir/%name/environment
 %config(noreplace) %_sysconfdir/%name/%name.ini
 %config(noreplace) %_sysconfdir/pam.d/system-policy-%name
-%config(noreplace) %_sysconfdir/pam.d/%name-remote-policy
 %dir %attr(0700, root, root) %_cachedir/%name
 %dir %attr(0755, root, root) %_cachedir/%{name}_file_cache
 %dir %attr(0700, root, root) %_cachedir/%name/creds
@@ -149,24 +125,6 @@ fi
 %exclude %python3_sitelibdir/gpoa/test
 
 %changelog
-* Thu Mar 03 2022 Valery Sinelnikov <greh@altlinux.org> 0.9.9.1-alt1
-- Fixed method call (Closes: 41994)
-- Removed unnecessary replace
-- Fixed declaration of variable
-
-* Fri Feb 18 2022 Evgeny Sinelnikov <sin@altlinux.org> 0.9.9-alt1
-- Add gpupdate-remote-policy PAM substack (for pam_mount support)
-- Added lookup for possible dc if first found is unreadable
-- Correct folder applier (still experimental)
-- Update logging and translations
-- Fix error when control facilites not exists
-- Add check for the presence of Gsettings schema and keys exists
-- Add support of package applier via pkcon (still experimental)
-
-* Mon Oct 25 2021 Evgeny Sinelnikov <sin@altlinux.org> 0.9.8-alt1
-- Added exception for org.gnome.Vino authentication-methods
-- Fixed bug for alternative-port in org.gnome.Vino
-
 * Wed Sep 29 2021 Evgeny Sinelnikov <sin@altlinux.org> 0.9.7-alt1
 - Fix regression with kestroy for user credential cache
 - Update system-policy-gpupdate PAM-rules to ignore applying group policies