Fixed the definition of the module activation check

Reported-by: Sergey Sysoev <sysoevsa@surgut.gazprom.ru>

completions/gpoa

@@ -13,7 +13,7 @@ _gpoa()
             return
             ;;
         *)
-            COMPREPLY=($(compgen -W '--dc --nodomain --noupdate --noplugins --list-backends --loglevel --help --force' -- "$cur"))
+            COMPREPLY=($(compgen -W '--dc --nodomain --noupdate --noplugins --list-backends --loglevel --help' -- "$cur"))
             return
             ;;
     esac

completions/gpupdate

@@ -17,7 +17,7 @@ _gpupdate()
             return
             ;;
         *)
-            COMPREPLY=($(compgen -W '--user --target --loglevel --system --help --force' -- "$cur"))
+            COMPREPLY=($(compgen -W '--user --target --loglevel --system --help' -- "$cur"))
             return
             ;;
     esac

doc/gpoa.1

@@ -45,9 +45,6 @@ Don't run plugins.
 .TP
 \fB--loglevel \fILOGLEVEL\fP
 Set logging verbosity from 0 to 5.
-.TP
-\fB--force\fP
-Force GPT download.
 .
 .SH FILES
 \fB/usr/sbin/gpoa\fR utility uses \fB/usr/share/local-policy/default\fR
@@ -58,10 +55,8 @@ All data is located in \fB/var/cache/gpupdate\fR. Also domain GPTs are
 taken from Samba's \fB/var/cache/samba\fR.
 .
 The settings read from Samba are stored in
-Dconf. Machine policies are stored in the \fB/etc/dconf/db/policy.d/policy.ini\fR file,
-user policies are stored in the \fB/etc/dconf/db/policy<UID>.d/policy<UID>.ini\fR file
-(where UID is the user ID in the system)."Local Policy" settings
-read from \fB/usr/share/local-policy/\fR are converted
+\fB/var/cache/gpupdate/registry.sqlite\fR and "Local Policy" settings
+read from \fB/usr/local/share/local-policy/default\fR are converted
 into GPT and stored as \fB/var/cache/gpupdate/local-policy\fR.
 .SH "SEE ALSO"
 gpupdate(1)

doc/gpupdate.1

@@ -43,9 +43,6 @@ Show help.
 .TP
 \fB--user \fIusername\fR
 Run \fBgpupdate\fP for \fIusername\fP.
-.TP
-\fB--force\fP
-Force GPT download.
 .
 .SS "EXIT CODES"
 .TP

gpoa/backend/__init__.py

@@ -23,8 +23,8 @@ from .nodomain_backend import nodomain_backend
 from util.logging import log
 from util.config import GPConfig
 from util.util import get_uid_by_username, touch_file
-from util.paths import get_dconf_config_file
-from storage.dconf_registry import Dconf_registry, create_dconf_ini_file, add_preferences_to_global_registry_dict
+from util.paths import get_dconf_config_path
+from storage.dconf_registry import Dconf_registry, create_dconf_ini_file
 
 def backend_factory(dc, username, is_machine, no_domain = False):
     '''
@@ -67,8 +67,7 @@ def save_dconf(username, is_machine):
         uid = None
     else:
         uid = get_uid_by_username(username) if not is_machine else None
-    target_file = get_dconf_config_file(uid)
+    target_file = get_dconf_config_path(uid)
     touch_file(target_file)
     Dconf_registry.apply_template(uid)
-    add_preferences_to_global_registry_dict(username, is_machine)
-    create_dconf_ini_file(target_file,Dconf_registry.global_registry_dict, uid)
+    create_dconf_ini_file(target_file,Dconf_registry.global_registry_dict)

gpoa/backend/samba_backend.py

@@ -26,7 +26,6 @@ except ImportError:
 from .applier_backend import applier_backend
 from storage import registry_factory
 from gpt.gpt import gpt, get_local_gpt
-from gpt.gpo_dconf_mapping import GpoInfoDconf
 from util.util import (
     get_machine_name,
     is_machine_name
@@ -67,9 +66,6 @@ class samba_backend(applier_backend):
         self.sambacreds = sambacreds
 
         self.cache_dir = self.sambacreds.get_cache_dir()
-        self.gpo_cache_part ='gpo_cache'
-        self._cached = False
-        self.storage.set_info('cache_dir', os.path.join(self.cache_dir, self.gpo_cache_part))
         logdata = dict({'cachedir': self.cache_dir})
         log('D7', logdata)
 
@@ -158,15 +154,10 @@ class samba_backend(applier_backend):
         '''
         Check if there is SYSVOL path for GPO assigned
         '''
-        self._cached = False
         if not gpo.file_sys_path:
             # GPO named "Local Policy" has no entry by its nature so
             # no reason to print warning.
-            if gpo.display_name in self.storage._dict_gpo_name_version_cache.keys():
-                gpo.file_sys_path = self.storage._dict_gpo_name_version_cache.get(gpo.display_name, {}).get('correct_path')
-                self._cached = True
-                return True
-            elif 'Local Policy' != gpo.name:
+            if 'Local Policy' != gpo.name:
                 logdata = dict({'gponame': gpo.name})
                 log('W4', logdata)
             return False
@@ -181,18 +172,20 @@ class samba_backend(applier_backend):
         log('D46')
         for gpo in gpos:
             if self._check_sysvol_present(gpo):
-                if not self._cached:
-                    path = check_safe_path(gpo.file_sys_path).upper()
-                    slogdata = dict({'sysvol_path': gpo.file_sys_path, 'gpo_name': gpo.display_name, 'gpo_path': path})
-                    log('D30', slogdata)
-                    gpt_abspath = os.path.join(self.cache_dir, self.gpo_cache_part, path)
-                else:
-                    gpt_abspath = gpo.file_sys_path
-                    log('D211', {'sysvol_path': gpo.file_sys_path, 'gpo_name': gpo.display_name})
+                path = check_safe_path(gpo.file_sys_path).upper()
+                slogdata = dict({'sysvol_path': gpo.file_sys_path, 'gpo_name': gpo.display_name, 'gpo_path': path})
+                log('D30', slogdata)
+                gpt_abspath = os.path.join(self.cache_dir, 'gpo_cache', path)
+                gpo_version=None
+                try:
+                    gpo_version=gpo.version
+                except:
+                    log('D210')
+
                 if self._is_machine_username:
-                    obj = gpt(gpt_abspath, sid, None, GpoInfoDconf(gpo))
+                    obj = gpt(gpt_abspath, sid, None, version=gpo_version)
                 else:
-                    obj = gpt(gpt_abspath, sid, self.username, GpoInfoDconf(gpo))
+                    obj = gpt(gpt_abspath, sid, self.username, version=gpo_version)
                 obj.set_name(gpo.display_name)
                 gpts.append(obj)
             else:

gpoa/frontend/applier_frontend.py

@@ -49,7 +49,7 @@ def check_module_enabled(storage, module_name):
 
     result = None
     flag = str(flag)
-    if flag and flag!='None':
+    if flag:
         if '1' == flag:
             result =  True
         else:

gpoa/frontend/appliers/control.py

@@ -17,7 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import subprocess
-from util.logging import log
+import threading
+import logging
+from util.logging import slogm, log
 
 def control_subst(preg_name):
     '''
@@ -99,14 +101,14 @@ class control:
             if status == None:
                 logdata = dict()
                 logdata['control'] = self.control_name
-                logdata['inpossible values'] = self.control_value
+                logdata['inpossible values'] = self.self.control_value
                 log('E42', logdata)
                 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.control_value
+                logdata['inpossible values'] = self.self.control_value
                 log('E59', logdata)
                 return
             status = self.control_value

gpoa/frontend/appliers/envvar.py

@@ -17,13 +17,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from os.path import isfile
+from util.logging import slogm
+import logging
 
-from util.arguments import (
+from gpt.envvars import (
       FileAction
     , action_letter2enum
 )
 from util.windows import expand_windows_var
-from util.util import get_homedir
+from util.util import (
+        get_homedir,
+        homedir_exists
+)
 
 class Envvar:
     def __init__(self, envvars, username=''):

gpoa/frontend/appliers/file_cp.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from util.arguments import (
+from gpt.folders import (
       FileAction
     , action_letter2enum
 )

gpoa/frontend/appliers/folder.py

@@ -20,7 +20,7 @@
 from pathlib import Path
 
 
-from util.arguments import (
+from gpt.folders import (
       FileAction
     , action_letter2enum
 )

gpoa/frontend/appliers/gsettings.py

@@ -18,9 +18,10 @@
 
 import configparser
 import os
+import logging
 from gi.repository import Gio, GLib
 
-from util.logging import log
+from util.logging import slogm, log
 
 class system_gsetting:
     def __init__(self, schema, path, value, lock, helper_function=None):

gpoa/frontend/appliers/ini_file.py

@@ -18,7 +18,7 @@
 
 
 
-from util.arguments import (
+from gpt.folders import (
       FileAction
     , action_letter2enum
 )

gpoa/frontend/appliers/netshare.py

@@ -18,7 +18,7 @@
 
 import subprocess
 
-from util.arguments import (
+from gpt.folders import (
       FileAction
     , action_letter2enum
 )

gpoa/frontend/chromium_applier.py

@@ -122,11 +122,6 @@ class chromium_applier(applier_frontend):
                             'ProxyServerMode',
                             'ExtensionManifestV2Availability',
                             'ExtensionUnpublishedAvailability',
-                            'CreateThemesSettings',
-                            'DevToolsGenAiSettings',
-                            'GenAILocalFoundationalModelSettings',
-                            'HelpMeWriteSettings',
-                            'TabOrganizerSettings',
                             'BrowserSwitcherParsingMode',
                             'CloudAPAuthEnabled',
                             'AdsSettingForIntrusiveAdsSites',
@@ -140,14 +135,10 @@ class chromium_applier(applier_frontend):
                             'HeadlessMode',
                             'IncognitoModeAvailability',
                             'IntranetRedirectBehavior',
-                            'LensOverlaySettings',
-                            'MemorySaverModeSavings',
                             'NetworkPredictionOptions',
                             'ProfilePickerOnStartupAvailability',
-                            'ProfileReauthPrompt',
                             'RelaunchNotification',
                             'SafeSitesFilterBehavior',
-                            'ToolbarAvatarLabelSettings',
                             'UserAgentReduction',
                             'BatterySaverModeAvailability_recommended',
                             'DownloadRestrictions_recommended',

gpoa/frontend/firefox_applier.py

@@ -87,9 +87,6 @@ class firefox_applier(applier_frontend):
                 if json_data:
                     it_data.data = json_data
                     it_data.type = 7
-                else:
-                    if it_data.type == 1:
-                        it_data.data = clean_data_firefox(it_data.data)
                 #Cases when it is necessary to create nested dictionaries
                 if it_data.valuename != it_data.data:
                     parts = self.get_parts(it_data.hive_key)
@@ -183,6 +180,3 @@ def dict_item_to_list(dictionary:dict) -> dict:
             else:
                 dict_item_to_list(dictionary[key])
     return dictionary
-
-def clean_data_firefox(data):
-    return data.replace("'", '\"')

gpoa/frontend/gsettings_applier.py

@@ -25,7 +25,6 @@ from gi.repository import (
       Gio
     , GLib
 )
-from storage.dconf_registry import Dconf_registry
 
 from .applier_frontend import (
       applier_frontend
@@ -138,7 +137,10 @@ class gsettings_applier(applier_frontend):
             log('E48')
 
         # Update desktop configuration system backend
-        Dconf_registry.dconf_update()
+        try:
+            proc = subprocess.run(args=['/usr/bin/dconf', "update"], capture_output=True, check=True)
+        except Exception as exc:
+            log('E49')
 
     def apply(self):
         if self.__module_enabled:

gpoa/frontend/scripts_applier.py

@@ -95,6 +95,7 @@ class scripts_applier_user(applier_frontend):
             , self.__module_name
             , self.__module_experimental
         )
+        self.filling_cache()
 
     def cleaning_cache(self):
         log('D161')
@@ -142,9 +143,7 @@ def install_script(storage_script_entry, script_dir, access_permissions):
     '''
     dir_cr = Path(script_dir)
     dir_cr.mkdir(parents=True, exist_ok=True)
-    if storage_script_entry.number is None:
-        return
-    script_name = str(storage_script_entry.number).zfill(5) + '_' + os.path.basename(storage_script_entry.path)
+    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)
 

gpoa/frontend/shortcut_applier.py

@@ -23,8 +23,9 @@ from .applier_frontend import (
       applier_frontend
     , check_enabled
 )
+from gpt.shortcuts import json2sc
 from util.windows import expand_windows_var
-from util.logging import log
+from util.logging import slogm, log
 from util.util import (
         get_homedir,
         homedir_exists

gpoa/gpoa

@@ -27,7 +27,6 @@ from backend import backend_factory, save_dconf
 from frontend.frontend_manager import frontend_manager, determine_username
 from plugin import plugin_manager
 from messages import message_with_code
-from storage import Dconf_registry
 
 from util.util import get_machine_name
 from util.users import (
@@ -62,9 +61,6 @@ def parse_arguments():
     arguments.add_argument('--list-backends',
             action='store_true',
             help='Show list of available backends')
-    arguments.add_argument('--force',
-            action='store_true',
-            help='Force GPT download')
     arguments.add_argument('--loglevel',
         type=int,
         default=4,
@@ -124,7 +120,6 @@ class gpoa_controller:
             print('local')
             print('samba')
             return
-        Dconf_registry._force = self.__args.force
         self.start_plugins()
         self.start_backend()
 

gpoa/gpt/drives.py

@@ -19,7 +19,7 @@
 import json
 from base64 import b64decode
 from Crypto.Cipher import AES
-from .dynamic_attributes import DynamicAttributes
+
 from util.xml import get_xml_root
 
 def decrypt_pass(cpassword):
@@ -93,7 +93,7 @@ def json2drive(json_str):
 
     return drive_obj
 
-class drivemap(DynamicAttributes):
+class drivemap:
     def __init__(self):
         self.login = None
         self.password = None

gpoa/gpt/dynamic_attributes.py

@@ -1,45 +0,0 @@
-#
-# GPOA - GPO Applier for Linux
-#
-# Copyright (C) 2019-2024 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/>.
-from enum import Enum
-
-class DynamicAttributes:
-    def __init__(self, **kwargs):
-        self.policy_name = None
-        for key, value in kwargs.items():
-            self.__setattr__(key, value)
-
-    def __setattr__(self, key, value):
-        if isinstance(value, Enum):
-            value = str(value)
-        self.__dict__[key] = value
-
-    def items(self):
-        return self.__dict__.items()
-
-    def __iter__(self):
-        return iter(self.__dict__.items())
-
-class RegistryKeyMetadata(DynamicAttributes):
-    def __init__(self, policy_name, type, is_list=None):
-        self.policy_name = policy_name
-        self.type = type
-        self.reloaded_with_policy_key = None
-        self.is_list = is_list
-
-    def __repr__(self):
-        return str(dict(self))

gpoa/gpt/envvars.py

@@ -17,8 +17,24 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
-from .dynamic_attributes import DynamicAttributes
 
+from enum import Enum
+
+class FileAction(Enum):
+    CREATE = 'C'
+    REPLACE = 'R'
+    UPDATE = 'U'
+    DELETE = 'D'
+
+
+def action_letter2enum(letter):
+    if letter in ['C', 'R', 'U', 'D']:
+        if letter == 'C': return FileAction.CREATE
+        if letter == 'R': return FileAction.REPLACE
+        if letter == 'U': return FileAction.UPDATE
+        if letter == 'D': return FileAction.DELETE
+
+    return FileAction.CREATE
 
 def read_envvars(envvars_file):
     variables = list()
@@ -27,8 +43,8 @@ def read_envvars(envvars_file):
         props = var.find('Properties')
         name = props.get('name')
         value = props.get('value')
-        action = props.get('action', default='C')
-        var_obj = envvar(name, value, action)
+        var_obj = envvar(name, value)
+        var_obj.set_action(action_letter2enum(props.get('action', default='C')))
 
         variables.append(var_obj)
 
@@ -38,9 +54,12 @@ def merge_envvars(storage, sid, envvar_objects, policy_name):
     for envv in envvar_objects:
         storage.add_envvar(sid, envv, policy_name)
 
-class envvar(DynamicAttributes):
-    def __init__(self, name, value, action):
+class envvar:
+    def __init__(self, name, value):
         self.name = name
         self.value = value
+        self.action = FileAction.CREATE
+
+    def set_action(self, action):
         self.action = action
 

gpoa/gpt/files.py

@@ -17,7 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
-from .dynamic_attributes import DynamicAttributes
 
 def read_files(filesxml):
     files = list()
@@ -40,7 +39,7 @@ def merge_files(storage, sid, file_objects, policy_name):
     for fileobj in file_objects:
         storage.add_file(sid, fileobj, policy_name)
 
-class fileentry(DynamicAttributes):
+class fileentry:
     def __init__(self, fromPath):
         self.fromPath = fromPath
 

gpoa/gpt/folders.py

@@ -18,11 +18,27 @@
 
 
 from enum import Enum
-from .dynamic_attributes import DynamicAttributes
+
 
 from util.xml import get_xml_root
 
 
+class FileAction(Enum):
+    CREATE = 'C'
+    REPLACE = 'R'
+    UPDATE = 'U'
+    DELETE = 'D'
+
+
+def action_letter2enum(letter):
+    if letter in ['C', 'R', 'U', 'D']:
+        if letter == 'C': return FileAction.CREATE
+        if letter == 'R': return FileAction.REPLACE
+        if letter == 'U': return FileAction.UPDATE
+        if letter == 'D': return FileAction.DELETE
+
+    return FileAction.CREATE
+
 
 def action_enum2letter(enumitem):
     return enumitem.value
@@ -45,9 +61,8 @@ def read_folders(folders_file):
 
     for fld in get_xml_root(folders_file):
         props = fld.find('Properties')
-        path = props.get('path')
-        action = props.get('action', default='C')
-        fld_obj = folderentry(path, action)
+        fld_obj = folderentry(props.get('path'))
+        fld_obj.set_action(action_letter2enum(props.get('action', default='C')))
         fld_obj.set_delete_folder(folder_int2bool(props.get('deleteFolder', default=1)))
         fld_obj.set_delete_sub_folders(folder_int2bool(props.get('deleteSubFolders', default=1)))
         fld_obj.set_delete_files(folder_int2bool(props.get('deleteFiles', default=1)))
@@ -63,10 +78,10 @@ def merge_folders(storage, sid, folder_objects, policy_name):
         storage.add_folder(sid, folder, policy_name)
 
 
-class folderentry(DynamicAttributes):
-    def __init__(self, path, action):
+class folderentry:
+    def __init__(self, path):
         self.path = path
-        self.action = action
+        self.action = FileAction.CREATE
         self.delete_folder = False
         self.delete_sub_folders = False
         self.delete_files = False

gpoa/gpt/gpo_dconf_mapping.py

@@ -1,48 +0,0 @@
-#
-# GPOA - GPO Applier for Linux
-#
-# Copyright (C) 2019-2024 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/>.
-
-from .dynamic_attributes import DynamicAttributes
-
-class GpoInfoDconf(DynamicAttributes):
-    _counter = 0
-    def __init__(self, gpo) -> None:
-        GpoInfoDconf._counter += 1
-        self.counter = GpoInfoDconf._counter
-        self.display_name = None
-        self.name = None
-        self.version = None
-        self.link = None
-        self._fill_attributes(gpo)
-
-    def _fill_attributes(self, gpo):
-        try:
-            self.display_name = gpo.display_name
-        except:
-            self.display_name = "Unknown"
-        try:
-            self.name = gpo.name
-        except:
-            self.name = "Unknown"
-        try:
-            self.version = gpo.version
-        except:
-            self.version = "Unknown"
-        try:
-            self.link = gpo.link
-        except:
-            self.link = "Unknown"

gpoa/gpt/gpt.py

@@ -153,13 +153,13 @@ def get_merger(preference_type):
     return mergers[preference_type]
 
 class gpt:
-    def __init__(self, gpt_path, sid, username='Machine', gpo_info=None):
+    def __init__(self, gpt_path, sid, username='Machine', version=None):
         self.path = gpt_path
         self.username = username
         self.sid = sid
         self.storage = registry_factory()
         self.storage._gpt_read_flag = True
-        self.gpo_info = gpo_info
+        self.version = version
         self.name = ''
         self.guid = self.path.rpartition('/')[2]
         if 'default' == self.guid:
@@ -217,7 +217,7 @@ class gpt:
             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, gpo_info=self.gpo_info)
+                util.preg.merge_polfile(self.settings['machine']['regpol'], policy_name=self.name, version=self.version)
             # Merge machine preferences to registry if possible
             for preference_name, preference_path in self.settings['machine'].items():
                 if preference_path:
@@ -247,7 +247,7 @@ class gpt:
                                         sid=self.sid,
                                         policy_name=self.name,
                                         username=self.username,
-                                        gpo_info=self.gpo_info)
+                                        version=self.version)
             # Merge user preferences to registry if possible
             for preference_name, preference_path in self.settings['user'].items():
                 if preference_path:

gpoa/gpt/inifiles.py

@@ -17,7 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
-from .dynamic_attributes import DynamicAttributes
 
 def read_inifiles(inifiles_file):
     inifiles = list()
@@ -28,7 +27,7 @@ def read_inifiles(inifiles_file):
         ini_obj.set_section(prors.get('section', default=None))
         ini_obj.set_property(prors.get('property', default=None))
         ini_obj.set_value(prors.get('value', default=None))
-        ini_obj.set_action(prors.get('action', default='C'))
+        ini_obj.set_action(prors.get('action'))
 
         inifiles.append(ini_obj)
 
@@ -38,7 +37,7 @@ def merge_inifiles(storage, sid, inifile_objects, policy_name):
     for iniobj in inifile_objects:
         storage.add_ini(sid, iniobj, policy_name)
 
-class inifile(DynamicAttributes):
+class inifile:
     def __init__(self, path):
         self.path = path
 

gpoa/gpt/networkshares.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
-from .dynamic_attributes import DynamicAttributes
+from storage.dconf_registry import Dconf_registry
 
 def read_networkshares(networksharesxml):
     networkshares = list()
@@ -39,7 +39,7 @@ def merge_networkshares(storage, sid, networkshares_objects, policy_name):
     for networkshareobj in networkshares_objects:
         storage.add_networkshare(sid, networkshareobj, policy_name)
 
-class networkshare(DynamicAttributes):
+class networkshare:
     def __init__(self, name):
         self.name = name
 

gpoa/gpt/printers.py

@@ -17,7 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import json
-from .dynamic_attributes import DynamicAttributes
 
 from util.xml import get_xml_root
 
@@ -61,7 +60,7 @@ def json2printer(json_str):
 
     return prn
 
-class printer(DynamicAttributes):
+class printer:
     def __init__(self, ptype, name, status):
         '''
         ptype may be one of:

gpoa/gpt/scriptsini.py

@@ -18,7 +18,7 @@
 
 import configparser
 import os
-from .dynamic_attributes import DynamicAttributes
+
 
 def read_scripts(scripts_file):
     scripts = Scripts_lists()
@@ -115,7 +115,7 @@ class Scripts_lists:
             self.get_shutdown_scripts().append(script)
 
 
-class Script(DynamicAttributes):
+class Script:
     __logon_counter = 0
     __logoff_counter = 0
     __startup_counter = 0
@@ -126,7 +126,6 @@ class Script(DynamicAttributes):
         self.action = action_upper
         self.path = os.path.join(script_dir, action_upper, script_filename.upper())
         if not os.path.isfile(self.path):
-            self.number = None
             return None
         self.args = None
 

gpoa/gpt/services.py

@@ -17,7 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from util.xml import get_xml_root
-from .dynamic_attributes import DynamicAttributes
 
 def read_services(service_file):
     '''
@@ -44,7 +43,7 @@ def merge_services(storage, sid, service_objects, policy_name):
     for srv in service_objects:
         pass
 
-class service(DynamicAttributes):
+class service:
     def __init__(self, name):
         self.unit = name
         self.servname = None

gpoa/gpt/shortcuts.py

@@ -18,6 +18,7 @@
 
 from pathlib import Path
 import stat
+import logging
 from enum import Enum
 
 from xml.etree import ElementTree
@@ -27,15 +28,11 @@ import json
 from util.windows import transform_windows_path
 from util.xml import get_xml_root
 from util.paths import get_desktop_files_directory
-from .dynamic_attributes import DynamicAttributes
 
 class TargetType(Enum):
     FILESYSTEM = 'FILESYSTEM'
     URL = 'URL'
 
-    def __str__(self):
-        return self.value
-
 def get_ttype(targetstr):
     '''
     Validation function for targetType property
@@ -46,7 +43,7 @@ def get_ttype(targetstr):
     '''
     ttype = TargetType.FILESYSTEM
 
-    if targetstr == 'URL'or targetstr == TargetType.URL:
+    if targetstr == 'URL':
         ttype = TargetType.URL
 
     return ttype
@@ -100,6 +97,24 @@ def merge_shortcuts(storage, sid, shortcut_objects, policy_name):
     for shortcut in shortcut_objects:
         storage.add_shortcut(sid, shortcut, policy_name)
 
+def json2sc(json_str):
+    '''
+    Build shortcut out of string-serialized JSON
+    '''
+    json_obj = json.loads(json_str)
+    link_type = get_ttype(json_obj['type'])
+
+    sc = shortcut(json_obj['dest'], json_obj['path'], json_obj['arguments'], json_obj['name'], json_obj['action'], link_type)
+    sc.set_changed(json_obj['changed'])
+    sc.set_clsid(json_obj['clsid'])
+    sc.set_guid(json_obj['guid'])
+    sc.set_usercontext(json_obj['is_in_user_context'])
+    if 'comment' in json_obj:
+        sc.set_comment(json_obj['comment'])
+    if 'icon' in json_obj:
+        sc.set_icon(json_obj['icon'])
+
+    return sc
 
 def find_desktop_entry(binary_path):
     desktop_dir = get_desktop_files_directory()
@@ -114,7 +129,7 @@ def find_desktop_entry(binary_path):
     return None
 
 
-class shortcut(DynamicAttributes):
+class shortcut:
     def __init__(self, dest, path, arguments, name=None, action=None, ttype=TargetType.FILESYSTEM):
         '''
         :param dest: Path to resulting file on file system
@@ -202,6 +217,30 @@ class shortcut(DynamicAttributes):
     def is_usercontext(self):
         return self.is_in_user_context
 
+    def to_json(self):
+        '''
+        Return shortcut's JSON for further serialization.
+        '''
+        content = dict()
+        content['dest'] = self.dest
+        content['path'] = self.path
+        content['name'] = self.name
+        content['arguments'] = self.arguments
+        content['clsid'] = self.clsid
+        content['guid'] = self.guid
+        content['changed'] = self.changed
+        content['action'] = self.action
+        content['is_in_user_context'] = self.is_in_user_context
+        content['type'] = ttype2str(self.type)
+        if self.icon:
+            content['icon'] = self.icon
+        if self.comment:
+            content['comment'] = self.comment
+        result = self.desktop()
+        result.content.update(content)
+
+        return json.dumps(result.content)
+
     def desktop(self, dest=None):
         '''
         Returns desktop file object which may be written to disk.
@@ -221,7 +260,7 @@ class shortcut(DynamicAttributes):
         '''
         Update desktop file object from internal data.
         '''
-        if get_ttype(self.type) == TargetType.URL:
+        if self.type == TargetType.URL:
             self.desktop_file.set('Type', 'Link')
         else:
             self.desktop_file.set('Type', 'Application')
@@ -231,7 +270,7 @@ class shortcut(DynamicAttributes):
         desktop_path = self.path
         if self.expanded_path:
             desktop_path = self.expanded_path
-        if get_ttype(self.type) == TargetType.URL:
+        if self.type == TargetType.URL:
             self.desktop_file.set('URL', desktop_path)
         else:
             str2bool_lambda = (lambda boolstr: boolstr if isinstance(boolstr, bool)

gpoa/gpupdate

@@ -25,7 +25,6 @@ import os
 import sys
 import pwd
 import signal
-from storage import Dconf_registry
 
 from util.users import (
     is_root
@@ -84,11 +83,6 @@ def parse_cli_arguments():
         type=int,
         default=5,
         help='Set logging verbosity level')
-    argparser.add_argument('-f',
-        '--force',
-        action='store_true',
-        default=False,
-        help='Force GPT download')
     argparser.add_argument('-s',
         '--system',
         action='store_true',
@@ -171,7 +165,6 @@ def main():
     gettext.bindtextdomain('gpoa', '/usr/lib/python3/site-packages/gpoa/locale')
     gettext.textdomain('gpoa')
     set_loglevel(args.loglevel)
-    Dconf_registry._force = args.force
     gpo_appliers = runner_factory(args, process_target(args.target))
 
     if gpo_appliers:

gpoa/locale/ru_RU/LC_MESSAGES/gpoa.po

@@ -65,10 +65,6 @@ msgstr "Установка свойств  для пользователя"
 msgid "The line in the configuration file was cleared"
 msgstr "В конфигурационном файле была очищена строка"
 
-msgid "Found GPT in cache"
-msgstr "Найден GPT в кеше"
-
-
 # Error
 msgid "Insufficient permissions to run gpupdate"
 msgstr "Недостаточно прав для запуска gpupdate"
@@ -256,9 +252,6 @@ msgstr "Не удалось обновить базу данных dconf"
 msgid "Exception occurred while updating dconf database"
 msgstr "Возникло исключение при обновлении базы данных dconf"
 
-msgid "Failed to retrieve data from dconf database"
-msgstr "Не удалось получить данные из базы dconf"
-
 # Error_end
 
 # Debug
@@ -877,9 +870,6 @@ msgstr "Создание ini-файла с политиками для  dconf"
 msgid "GPO version was not found"
 msgstr "Версия GPO не найдена"
 
-msgid "SYSVOL entry found in cache"
-msgstr "Запись SYSVOL найдена в кеше"
-
 # Debug_end
 
 # Warning
@@ -932,8 +922,8 @@ msgstr "Не удалось скопировать файл"
 msgid "Failed to create KDE settings list"
 msgstr "Не удалось создать список настроек KDE"
 
-msgid "Could not find tools to configure KDE"
-msgstr "Не удалось найти инструменты для настройки KDE"
+msgid "Could not find application tools"
+msgstr "Не удалось найти инструменты применения"
 
 msgid "Failed to open KDE settings"
 msgstr "Не удалось открыть настройки KDE"

gpoa/messages/__init__.py

@@ -31,7 +31,6 @@ def info_code(code):
     info_ids[8] = 'Chromium policy'
     info_ids[9] = 'Set user property to'
     info_ids[10] = 'The line in the configuration file was cleared'
-    info_ids[11] = 'Found GPT in cache'
 
     return info_ids.get(code, 'Unknown info code')
 
@@ -108,7 +107,6 @@ def error_code(code):
     error_ids[70] = 'Error getting key value'
     error_ids[71] = 'Failed to update dconf database'
     error_ids[72] = 'Exception occurred while updating dconf database'
-    error_ids[73] = 'Failed to retrieve data from dconf database'
     return error_ids.get(code, 'Unknown error code')
 
 def debug_code(code):
@@ -322,8 +320,7 @@ def debug_code(code):
     debug_ids[207] = 'Creating a dictionary with keys and values from the dconf database'
     debug_ids[208] = 'No entry found for the specified path'
     debug_ids[209] = 'Creating an ini file with policies for dconf'
-    debug_ids[211] = 'SYSVOL entry found in cache'
-    #debug_ids[210] = 'GPO version was not found'
+    debug_ids[210] = 'GPO version was not found'
 
     return debug_ids.get(code, 'Unknown debug code')
 
@@ -351,7 +348,7 @@ def warning_code(code):
     warning_ids[14] = 'Could not create a valid list of keys'
     warning_ids[15] = 'Failed to copy file'
     warning_ids[16] = 'Failed to create KDE settings list'
-    warning_ids[17] = 'Could not find tools to configure KDE'
+    warning_ids[17] = 'Could not find application tools'
     warning_ids[18] = 'Failed to open KDE settings'
     warning_ids[19] = 'Failed to change KDE configuration file'
     warning_ids[20] = 'Error connecting to server'

gpoa/pkcon_runner

@@ -20,13 +20,15 @@
 import rpm
 import subprocess
 from gpoa.storage import registry_factory
-from util.gpoa_ini_parsing import GpoaConfigObj
-from util.util import get_uid_by_username, string_to_literal_eval
 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):
@@ -43,32 +45,28 @@ def is_rpm_installed(rpm_name):
 class Pkcon_applier:
 
     def __init__(self, user = None):
-        install_key_name = 'Install'
-        remove_key_name = 'Remove'
-        hklm_branch = 'Software/BaseALT/Policies/Packages'
+        self.__install_key_name = 'Install'
+        self.__remove_key_name = 'Remove'
+        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()
-        if user:
-            uid = get_uid_by_username(user)
-            dict_dconf_db = self.storage.get_dictionary_from_dconf_file_db(uid)
-        else:
-            dict_dconf_db = self.storage.get_dictionary_from_dconf_file_db()
-        dict_packages = dict_dconf_db.get(hklm_branch,{})
-        self.install_packages_setting = string_to_literal_eval(dict_packages.get(install_key_name,[]))
-        self.remove_packages_setting = string_to_literal_eval(dict_packages.get(remove_key_name,[]))
-
+        self.storage = registry_factory(username=user)
+        self.storage.filling_storage_from_dconf()
+        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):
-                self.install_packages.add(package)
+            if not is_rpm_installed(package.data):
+                self.install_packages.add(package.data)
         for package in self.remove_packages_setting:
-            if package in self.install_packages:
-                self.install_packages.remove(package)
-            if is_rpm_installed(package):
-                self.remove_packages.add(package)
+            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')

gpoa/storage/dconf_registry.py

@@ -19,16 +19,8 @@
 import subprocess
 from pathlib import Path
 from util.util import string_to_literal_eval, touch_file, get_uid_by_username
-from util.paths import get_dconf_config_path
 from util.logging import log
 import re
-from collections import OrderedDict
-import itertools
-from gpt.dynamic_attributes import RegistryKeyMetadata
-import gi
-gi.require_version("Gvdb", "1.0")
-gi.require_version("GLib", "2.0")
-from gi.repository import Gvdb, GLib
 
 
 class PregDconf():
@@ -57,24 +49,19 @@ class Dconf_registry():
     '''
     A class variable that represents a global registry dictionary shared among instances of the class
     '''
-    _GpoPriority = 'Software/BaseALT/Policies/GpoPriority'
-    global_registry_dict = dict({_GpoPriority:{}})
+    _ReadQueue = 'Software/BaseALT/Policies/ReadQueue'
+    global_registry_dict = dict({_ReadQueue:{}})
     __template_file = '/usr/share/dconf/user_mandatory.template'
     _policies_path = 'Software/'
     _policies_win_path = 'SOFTWARE/'
     _gpt_read_flag = False
-    _force = False
     __dconf_dict_flag = False
     __dconf_dict = dict()
-    _dict_gpo_name_version_cache = dict()
     _username = None
-    _uid = None
     _envprofile = None
-    _path_bin_system = "/etc/dconf/db/policy"
 
     list_keys = list()
     _info = dict()
-    _counter_gpt = itertools.count(0)
 
     shortcuts = list()
     folders = list()
@@ -99,9 +86,6 @@ class Dconf_registry():
     def get_info(cls, key):
         return cls._info.setdefault(key, None)
 
-    @staticmethod
-    def get_next_number():
-        return next(Dconf_registry._counter_gpt)
 
     @staticmethod
     def get_matching_keys(path):
@@ -156,12 +140,10 @@ class Dconf_registry():
         return None
 
     @staticmethod
-    def dconf_update(uid=None):
+    def dconf_update():
         logdata = dict()
-        path_dconf_config = get_dconf_config_path(uid)
-        db_file = path_dconf_config[:-3]
         try:
-            process = subprocess.Popen(['dconf', 'compile', db_file, path_dconf_config],
+            process = subprocess.Popen(['dconf', 'update'],
                                         stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
             output, error = process.communicate()
 
@@ -224,55 +206,20 @@ class Dconf_registry():
             dconf_dict = self.get_key_values(self.get_matching_keys(startswith))
             for key, value in dconf_dict.items():
                 keys_tmp = key.split('/')
-                update_dict(output_dict.setdefault('/'.join(keys_tmp[:-1])[1:], {}), {keys_tmp[-1]: str(value)})
+                update_dict(output_dict.setdefault('/'.join(keys_tmp[:-1])[1:], {}), {keys_tmp[-1]: value})
 
         log('D207')
         return output_dict
 
 
     @classmethod
-    def get_dictionary_from_dconf_file_db(self, uid=None):
-        logdata = dict()
-        if not uid:
-            path_bin = self._path_bin_system
-        else:
-            path_bin = self._path_bin_system + str(uid)
-        output_dict = {}
-        try:
-            if (GLib.file_get_contents(path_bin)[0]):
-                bytes1 = GLib.Bytes.new(GLib.file_get_contents(path_bin)[1])
-                table = Gvdb.Table.new_from_bytes(bytes1, True)
-
-                name_list = Gvdb.Table.get_names(table)
-                for name in name_list:
-                    value = Gvdb.Table.get_value(table, name)
-                    if not value:
-                        continue
-                    list_path = name.split('/')
-                    if value.is_of_type(GLib.VariantType('s')):
-                        part = output_dict.setdefault('/'.join(list_path[1:-1]), {})
-                        part[list_path[-1]] = value.get_string()
-                    elif value.is_of_type(GLib.VariantType('i')):
-                        part = output_dict.setdefault('/'.join(list_path[1:-1]), {})
-                        part[list_path[-1]] = value.get_int32()
-        except Exception as exc:
-            logdata['exc'] = exc
-            logdata['path_bin'] = path_bin
-            log('E73', logdata)
-
-        return output_dict
-
-
-    @classmethod
-    def filter_entries(cls, startswith, registry_dict = None):
-        if not registry_dict:
-            registry_dict = cls.global_registry_dict
+    def filter_entries(cls, startswith):
         if startswith[-1] == '%':
             startswith = startswith[:-1]
             if startswith[-1] == '/' or startswith[-1] == '\\':
                 startswith = startswith[:-1]
-            return filter_dict_keys(startswith, flatten_dictionary(registry_dict))
-        return filter_dict_keys(startswith, flatten_dictionary(registry_dict))
+            return filter_dict_keys(startswith, flatten_dictionary(cls.global_registry_dict))
+        return filter_dict_keys(startswith, flatten_dictionary(cls.global_registry_dict))
 
 
     @classmethod
@@ -287,7 +234,7 @@ class Dconf_registry():
             elif isinstance(value, list):
                 for data in value:
                     list_entiers.append(PregDconf(
-                        keyname, data, find_preg_type(data), data))
+                        keyname, convert_string_dconf(data), find_preg_type(data), data))
             else:
                 list_entiers.append(PregDconf(
                         '/'.join(keyname.split('/')[:-1]), convert_string_dconf(keyname.split('/')[-1]), find_preg_type(value), value))
@@ -353,55 +300,46 @@ class Dconf_registry():
 
     @classmethod
     def add_shortcut(cls, sid, sc_obj, policy_name):
-        sc_obj.policy_name = policy_name
         cls.shortcuts.append(sc_obj)
 
 
     @classmethod
     def add_printer(cls, sid, pobj, policy_name):
-        pobj.policy_name = policy_name
         cls.printers.append(pobj)
 
 
     @classmethod
     def add_drive(cls, sid, dobj, policy_name):
-        dobj.policy_name = policy_name
         cls.drives.append(dobj)
 
 
     @classmethod
     def add_folder(cls, sid, fobj, policy_name):
-        fobj.policy_name = policy_name
         cls.folders.append(fobj)
 
 
     @classmethod
     def add_envvar(self, sid, evobj, policy_name):
-        evobj.policy_name = policy_name
         self.environmentvariables.append(evobj)
 
 
     @classmethod
     def add_script(cls, sid, scrobj, policy_name):
-        scrobj.policy_name = policy_name
         cls.scripts.append(scrobj)
 
 
     @classmethod
     def add_file(cls, sid, fileobj, policy_name):
-        fileobj.policy_name = policy_name
         cls.files.append(fileobj)
 
 
     @classmethod
     def add_ini(cls, sid, iniobj, policy_name):
-        iniobj.policy_name = policy_name
         cls.inifiles.append(iniobj)
 
 
     @classmethod
     def add_networkshare(cls, sid, networkshareobj, policy_name):
-        networkshareobj.policy_name = policy_name
         cls.networkshares.append(networkshareobj)
 
 
@@ -433,13 +371,13 @@ class Dconf_registry():
     def get_scripts(cls, sid, action):
         action_scripts = list()
         for part in cls.scripts:
-            if action == 'LOGON' and part.action == 'LOGON':
+            if action == 'LOGON':
                 action_scripts.append(part)
-            elif action == 'LOGOFF' and part.action == 'LOGOFF':
+            elif action == 'LOGOFF':
                 action_scripts.append(part)
-            elif action == 'STARTUP' and part.action == 'STARTUP':
+            elif action == 'STARTUP':
                 action_scripts.append(part)
-            elif action == 'SHUTDOWN' and part.action == 'SHUTDOWN':
+            elif action == 'SHUTDOWN':
                 action_scripts.append(part)
         return action_scripts
 
@@ -466,7 +404,7 @@ class Dconf_registry():
 
     @classmethod
     def wipe_hklm(cls):
-        cls.global_registry_dict = dict({cls._GpoPriority:{}})
+        cls.global_registry_dict = dict({cls._ReadQueue:{}})
 
 
 def filter_dict_keys(starting_string, input_dict):
@@ -487,7 +425,7 @@ def find_preg_type(argument):
         return 1
 
 
-def update_dict(dict1, dict2, save_key=None):
+def update_dict(dict1, dict2):
     '''
     Updates dict1 with the key-value pairs from dict2
     '''
@@ -495,64 +433,40 @@ def update_dict(dict1, dict2, save_key=None):
         if key in dict1:
             # If both values are dictionaries, recursively call the update_dict function
             if isinstance(dict1[key], dict) and isinstance(value, dict):
-                save_key = key
-                update_dict(dict1[key], value, save_key)
+                update_dict(dict1[key], value)
             # If the value in dict1 is a list, extend it with unique values from value
             elif isinstance(dict1[key], list):
                 dict1[key].extend(set(value) - set(dict1[key]))
             else:
                 # If the value in dict1 is not a dictionary or the value in dict2 is not a dictionary,
                 # replace the value in dict1 with the value from dict2
-                if save_key and save_key.startswith('Source'):
-                    value.reloaded_with_policy_key = [dict1[key].policy_name]
-                    if dict1[key].reloaded_with_policy_key:
-                        value.reloaded_with_policy_key += dict1[key].reloaded_with_policy_key
-                    dict1[key] = value
-                else:
-                    dict1[key] = value
+                dict1[key] = value
         else:
             # If the key does not exist in dict1, add the key-value pair from dict2 to dict1
             dict1[key] = value
 
 
-def add_to_dict(string, policy_name, username, gpo_info):
-    if gpo_info:
-        counter = gpo_info.counter
-        display_name = gpo_info.display_name
-        name = gpo_info.name
-        version = gpo_info.version
-    else:
-        counter = 0
-        display_name = policy_name
-        name = None
-        version = None
-
+def add_to_dict(string, policy_name, username, version):
     if username is None:
         correct_path = '/'.join(string.split('/')[:-2])
-        machine= '{}/Machine/{}'.format(Dconf_registry._GpoPriority, counter)
+        machine= '{}/Machine'.format(Dconf_registry._ReadQueue)
         dictionary = Dconf_registry.global_registry_dict.setdefault(machine, dict())
     else:
         correct_path = '/'.join(string.split('/')[:-2])
-        user = '{}/User/{}'.format(Dconf_registry._GpoPriority, counter)
+        user = '{}/User'.format(Dconf_registry._ReadQueue)
         dictionary = Dconf_registry.global_registry_dict.setdefault(user, dict())
 
-    dictionary['display_name'] = display_name
-    dictionary['name'] = name
-    dictionary['version'] = version
-    dictionary['correct_path'] = correct_path
+    dictionary[len(dictionary)] = (policy_name, correct_path, version)
 
 
-
-def load_preg_dconf(pregfile, pathfile, policy_name, username, gpo_info):
+def load_preg_dconf(pregfile, pathfile, policy_name, username, version=None):
     '''
     Loads the configuration from preg registry into a dictionary
     '''
-    # Prefix for storing key data
-    source_pre = "Source"
     dd = dict()
     for i in pregfile.entries:
         # Skip this entry if the valuename starts with '**del'
-        if i.valuename.lower().startswith('**del'):
+        if i.valuename.startswith('**del'):
             continue
         valuename = convert_string_dconf(i.valuename)
         data = check_data(i.data, i.type)
@@ -560,11 +474,9 @@ def load_preg_dconf(pregfile, pathfile, policy_name, username, gpo_info):
             if i.keyname.replace('\\', '/') in dd:
                 # If the key exists in dd, update its value with the new key-value pair
                 dd[i.keyname.replace('\\', '/')].update({valuename.replace('\\', '/'):data})
-                dd[f"{source_pre}/{i.keyname}".replace('\\', '/')].update({valuename.replace('\\', '/'):RegistryKeyMetadata(policy_name, i.type)})
             else:
                 # If the key does not exist in dd, create a new key-value pair
                 dd[i.keyname.replace('\\', '/')] = {valuename.replace('\\', '/'):data}
-                dd[f"{source_pre}/{i.keyname}".replace('\\', '/')] = {valuename.replace('\\', '/'):RegistryKeyMetadata(policy_name, i.type)}
 
         elif not i.valuename:
             keyname_tmp = i.keyname.replace('\\', '/').split('/')
@@ -572,28 +484,23 @@ def load_preg_dconf(pregfile, pathfile, policy_name, username, gpo_info):
             if keyname in dd:
                 # If the key exists in dd, update its value with the new key-value pair
                 dd[keyname].update({keyname_tmp[-1]:data})
-                dd[f"{source_pre}{keyname}"].update({keyname_tmp[-1]:RegistryKeyMetadata(policy_name, i.type)})
             else:
                 # If the key does not exist in dd, create a new key-value pair
                 dd[keyname] = {keyname_tmp[-1]:data}
-                dd[f"{source_pre}{keyname}"] = {keyname_tmp[-1]:RegistryKeyMetadata(policy_name, i.type)}
 
         else:
             # If the value name is the same as the data,
             # split the keyname and add the data to the appropriate location in dd.
             all_list_key = i.keyname.split('\\')
             dd_target = dd.setdefault('/'.join(all_list_key[:-1]),{})
-            key_d ='/'.join(all_list_key[:-1])
-            dd_target_source = dd.setdefault(f"Source/{key_d}",{})
             dd_target.setdefault(all_list_key[-1], []).append(data)
-            dd_target_source.setdefault(all_list_key[-1], RegistryKeyMetadata(policy_name, i.type, True))
 
     # Update the global registry dictionary with the contents of dd
-    add_to_dict(pathfile, policy_name, username, gpo_info)
+    add_to_dict(pathfile, policy_name, username, version)
     update_dict(Dconf_registry.global_registry_dict, dd)
 
 
-def create_dconf_ini_file(filename, data, uid):
+def create_dconf_ini_file(filename, data):
     '''
     Create an ini-file based on a dictionary of dictionaries.
     Args:
@@ -616,7 +523,7 @@ def create_dconf_ini_file(filename, data, uid):
     logdata = dict()
     logdata['path'] = filename
     log('D209', logdata)
-    Dconf_registry.dconf_update(uid)
+    Dconf_registry.dconf_update()
 
 def clean_data(data):
     try:
@@ -640,8 +547,7 @@ def convert_string_dconf(input_string):
     macros = {
         '#': '%sharp%',
         ';': '%semicolon%',
-        '//': '%doubleslash%',
-        '/': '%oneslash%'
+        '//': '%doubleslash%'
     }
     output_string = input_string
     for key, value in macros.items():
@@ -683,52 +589,3 @@ def get_dconf_envprofile():
 
     profile = '/run/dconf/user/{}'.format(get_uid_by_username(Dconf_registry._username))
     return {'DCONF_PROFILE': profile}
-
-
-def convert_elements_to_list_dicts(elements):
-    return list(map(lambda x: dict(x), elements))
-
-def remove_duplicate_dicts_in_list(list_dict):
-    return convert_elements_to_list_dicts(list(OrderedDict((tuple(sorted(d.items())), d) for d in list_dict).values()))
-
-def add_preferences_to_global_registry_dict(username, is_machine):
-    if is_machine:
-        prefix = 'Software/BaseALT/Policies/Preferences/Machine'
-    else:
-        prefix = f'Software/BaseALT/Policies/Preferences/{username}'
-
-    preferences_global = [('Shortcuts',remove_duplicate_dicts_in_list(Dconf_registry.shortcuts)),
-                            ('Folders',remove_duplicate_dicts_in_list(Dconf_registry.folders)),
-                            ('Files',remove_duplicate_dicts_in_list(Dconf_registry.files)),
-                            ('Drives',remove_duplicate_dicts_in_list(Dconf_registry.drives)),
-                            ('Scheduledtasks',remove_duplicate_dicts_in_list(Dconf_registry.scheduledtasks)),
-                            ('Environmentvariables',remove_duplicate_dicts_in_list(Dconf_registry.environmentvariables)),
-                            ('Inifiles',remove_duplicate_dicts_in_list(Dconf_registry.inifiles)),
-                            ('Services',remove_duplicate_dicts_in_list(Dconf_registry.services)),
-                            ('Printers',remove_duplicate_dicts_in_list(Dconf_registry.printers)),
-                            ('Scripts',remove_duplicate_dicts_in_list(Dconf_registry.scripts)),
-                            ('Networkshares',remove_duplicate_dicts_in_list(Dconf_registry.networkshares))]
-
-    preferences_global_dict = dict()
-    preferences_global_dict[prefix] = dict()
-
-    for key, val in preferences_global:
-        preferences_global_dict[prefix].update({key:clean_data(str(val))})
-
-    update_dict(Dconf_registry.global_registry_dict, preferences_global_dict)
-
-def extract_display_name_version(data):
-    policy_force = data.get('Software/BaseALT/Policies/GPUpdate', {}).get('Force', False)
-    if Dconf_registry._force or policy_force:
-        return {}
-    result = {}
-    tmp = {}
-    if isinstance(data, dict):
-        for key in data.keys():
-            if key.startswith(Dconf_registry._GpoPriority+'/'):
-                tmp[key] = data[key]
-        for value in tmp.values():
-            if isinstance(value, dict) and value.get('version', 'None')!='None' and value.get('display_name'):
-                result[value['display_name']] = {'version': value['version'], 'correct_path': value['correct_path']}
-    Dconf_registry._dict_gpo_name_version_cache = result
-    return result

gpoa/util/arguments.py

@@ -18,7 +18,7 @@
 
 import logging
 import logging.handlers
-from enum import IntEnum, Enum
+from enum import IntEnum
 
 from messages import message_with_code
 from .logging import slogm
@@ -84,20 +84,3 @@ class ExitCodeUpdater(IntEnum):
     FAIL_GPUPDATE_USER_NOREPLY = 3
     EXIT_SIGINT = 130
 
-class FileAction(Enum):
-    CREATE = 'C'
-    REPLACE = 'R'
-    UPDATE = 'U'
-    DELETE = 'D'
-
-    def __str__(self):
-        return self.value
-
-def action_letter2enum(letter):
-    if letter in ['C', 'R', 'U', 'D']:
-        if letter == 'C': return FileAction.CREATE
-        if letter == 'R': return FileAction.REPLACE
-        if letter == 'U': return FileAction.UPDATE
-        if letter == 'D': return FileAction.DELETE
-
-    return FileAction.CREATE

gpoa/util/dbus.py

@@ -20,7 +20,6 @@ import dbus
 
 from .logging import log
 from .users import is_root
-from storage import Dconf_registry
 
 
 class dbus_runner:
@@ -73,7 +72,6 @@ class dbus_runner:
         if self.username:
             logdata = dict({'username': self.username})
             log('D6', logdata)
-            gpupdate = 'gpupdate' if not Dconf_registry._force else 'gpupdate_force'
             if is_root():
                 # oddjobd-gpupdate's ACL allows access to this method
                 # only for superuser. This method is called via PAM
@@ -97,7 +95,7 @@ class dbus_runner:
                     result = self.system_bus.call_blocking(self.bus_name,
                         self._object_path,
                         self.interface_name,
-                        gpupdate,
+                        'gpupdate',
                         None,
                         [],
                         timeout=self._synchronous_timeout)
@@ -108,12 +106,11 @@ class dbus_runner:
                     raise exc
         else:
             log('D11')
-            gpupdate_computer = 'gpupdate_computer' if not Dconf_registry._force else 'gpupdate_computer_force'
             try:
                 result = self.system_bus.call_blocking(self.bus_name,
                     self._object_path,
                     self.interface_name,
-                    gpupdate_computer,
+                    'gpupdate_computer',
                     None,
                     # The following positional parameter is called "args".
                     # There is no official documentation for it.
@@ -121,6 +118,7 @@ class dbus_runner:
                     timeout=self._synchronous_timeout)
                 print_dbus_result(result)
             except dbus.exceptions.DBusException as exc:
+                print(exc)
                 logdata = dict({'error': str(exc)})
                 log('E22', logdata)
                 raise exc

gpoa/util/paths.py

@@ -94,12 +94,6 @@ def local_policy_cache():
     return lpcache
 
 def get_dconf_config_path(uid = None):
-    if uid:
-        return f'/etc/dconf/db/policy{uid}.d/'
-    else:
-        return '/etc/dconf/db/policy.d/'
-
-def get_dconf_config_file(uid = None):
     if uid:
         return f'/etc/dconf/db/policy{uid}.d/policy{uid}.ini'
     else:

gpoa/util/preg.py

@@ -81,12 +81,12 @@ def preg_keymap(preg):
     return keymap
 
 
-def merge_polfile(preg, sid=None, reg_name='registry', reg_path=None, policy_name='Unknown', username='Machine', gpo_info=None):
+def merge_polfile(preg, sid=None, reg_name='registry', reg_path=None, policy_name='Unknown', username='Machine', version=None):
     pregfile = load_preg(preg)
     if sid is None and username == 'Machine':
-        load_preg_dconf(pregfile, preg, policy_name, None, gpo_info)
+        load_preg_dconf(pregfile, preg, policy_name, None, version)
     else:
-        load_preg_dconf(pregfile, preg, policy_name, username, gpo_info)
+        load_preg_dconf(pregfile, preg, policy_name, username, version)
     logdata = dict({'pregfile': preg})
     log('D32', logdata)
     #log dconf

gpoa/util/windows.py

@@ -18,7 +18,7 @@
 
 
 import os
-from pathlib import Path
+import subprocess
 from samba import getopt as options
 from samba import NTSTATUSError
 
@@ -28,13 +28,12 @@ except ImportError:
     from samba.gp.gpclass import get_dc_hostname, check_refresh_gpo_list
 
 from samba.netcmd.common import netcmd_get_domain_infos_via_cldap
-from storage.dconf_registry import Dconf_registry, extract_display_name_version
 import samba.gpo
 
 from .xdg import (
       xdg_get_desktop
 )
-from .util import get_homedir, get_uid_by_username
+from .util import get_homedir
 from .exceptions import GetGPOListFail
 from .logging import log
 from .samba import smbopts
@@ -110,11 +109,7 @@ class smbcreds (smbopts):
         hostname
         '''
         gpos = list()
-        if Dconf_registry.get_info('machine_name') == username:
-            dconf_dict = Dconf_registry.get_dictionary_from_dconf_file_db()
-        else:
-            dconf_dict = Dconf_registry.get_dictionary_from_dconf_file_db(get_uid_by_username(username))
-        dict_gpo_name_version = extract_display_name_version(dconf_dict)
+
         try:
             log('D48')
             ads = samba.gpo.ADS_STRUCT(self.selected_dc, self.lp, self.creds)
@@ -126,12 +121,6 @@ class smbcreds (smbopts):
                 for gpo in gpos:
                     # These setters are taken from libgpo/pygpo.c
                     # print(gpo.ds_path) # LDAP entry
-                    if gpo.display_name in dict_gpo_name_version.keys() and dict_gpo_name_version.get(gpo.display_name, {}).get('version') == gpo.version:
-                        if Path(dict_gpo_name_version.get(gpo.display_name, {}).get('correct_path')).exists():
-                            gpo.file_sys_path = ''
-                            ldata = dict({'gpo_name': gpo.display_name, 'gpo_uuid': gpo.name, 'file_sys_path_cache': True})
-                            log('I11', ldata)
-                            continue
                     ldata = dict({'gpo_name': gpo.display_name, 'gpo_uuid': gpo.name, 'file_sys_path': gpo.file_sys_path})
                     log('I2', ldata)
 

gpupdate.spec

@@ -8,8 +8,6 @@
 %add_python3_req_skip gpt.gpt
 %add_python3_req_skip gpt.printers
 %add_python3_req_skip gpt.shortcuts
-%add_python3_req_skip gpt.gpo_dconf_mapping
-%add_python3_req_skip gpt.dynamic_attributes
 %add_python3_req_skip messages
 %add_python3_req_skip storage
 %add_python3_req_skip storage.fs_file_cache
@@ -35,7 +33,7 @@
 %add_python3_req_skip util.gpoa_ini_parsing
 
 Name: gpupdate
-Version: 0.11.1
+Version: 0.10.3
 Release: alt1
 
 Summary: GPT applier
@@ -51,13 +49,12 @@ BuildRequires: gettext-tools
 Requires: python3-module-rpm
 Requires: python3-module-dbus
 Requires: python3-module-configobj
-Requires: oddjob-%name >= 0.2.3
+Requires: oddjob-%name >= 0.2.0
 Requires: libnss-role >= 0.5.0
 Requires: local-policy >= 0.4.9
 Requires: pam-config >= 1.9.0
 Requires: autofs
 Requires: dconf-profile
-Requires: libgvdb-gir
 # This is needed by shortcuts_applier
 Requires: desktop-file-utils
 # This is needed for smb file cache support
@@ -194,32 +191,6 @@ fi
 %exclude %python3_sitelibdir/gpoa/test
 
 %changelog
-* Tue Aug 27 2024 Valery Sinelnikov <greh@altlinux.org> 0.11.1-alt1
-- Fixed setting links in shortcuts (closes: 51275)
-
-* Fri Aug 09 2024 Valery Sinelnikov <greh@altlinux.org> 0.11.0-alt1
-- Added saving preferences in dconf
-- Added versioning support for gpt
-- Added the ability to force gpt download
-- Added completions for --force
-- Added new exceptions for Chromium 126
-- Added information to the man pages
-- Fixed handling of incorrect valuename
-
-* Mon Jul 08 2024 Valery Sinelnikov <greh@altlinux.org> 0.10.6-alt1
-- Fixed firefox_applier errors
-
-* Fri Jun 28 2024 Valery Sinelnikov <greh@altlinux.org> 0.10.5-alt1
-- Correction of missing entries with a upper case
-- Fixed string processing in date (closes: 50782)
-- Fixed getting correct data for the user for pkcon_runner
-
-* Thu Jun 27 2024 Valery Sinelnikov <greh@altlinux.org> 0.10.4-alt1
-- Fixed the definition of the module activation check (closes: 50755)
-- Fixed sorting of scripts (closes: 50756)
-- Fixed reading key values from dconf
-- Changed the method for getting the list of packages for pkcon_runner
-
 * Wed Jun 19 2024 Valery Sinelnikov <greh@altlinux.org> 0.10.3-alt1
 - Added autocompletion for gpoa, gpupdate, gpupdate-setup
 - Added correct work with json data in keys for the Firefox browser