Implement selecting runner(apt1 default)

Author: Korney Gedert

gpoa/frontend/package_applier.py

@@ -24,6 +24,20 @@
       applier_frontend
     , check_enabled
 )
+import os
+
+def select_runner() -> None | str:
+    """
+    Select runner to use for package applier
+
+    Returns:
+        str if backend is selected
+        None otherwise
+    """
+    proc = subprocess.run(['/usr/libexec/gpupdate/select_runner'], stdout=subprocess.PIPE)
+    if proc.returncode != 0:
+        return None
+    return proc.stdout.decode('utf-8').strip()
 
 class package_applier(applier_frontend):
     __module_name = 'PackagesApplier'
@@ -40,8 +54,16 @@ def __init__(self, storage):
         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)
+
+        runner = select_runner()
+        if runner is None:
+            log('E81')
+            raise Exception('No package runner selected')
+        log('D236', {'runner': runner})
+        self.runner = runner + '_runner'
+
         self.fulcmd = []
-        self.fulcmd.append('/usr/libexec/gpupdate/pkcon_runner')
+        self.fulcmd.append('/usr/libexec/gpupdate/' + self.runner)
         self.fulcmd.append('--loglevel')
         logger = logging.getLogger()
         self.fulcmd.append(str(logger.level))
@@ -65,13 +87,19 @@ def run(self):
                     subprocess.check_call(self.fulcmd)
                 except Exception as exc:
                     logdata = {'msg': str(exc)}
-                    log('E55', logdata)
+                    if self.runner == 'pkcon_runner':
+                        log('E55', logdata)
+                    elif self.runner == 'apt1_runner':
+                        log('E79', logdata)
             else:
                 try:
                     subprocess.Popen(self.fulcmd,close_fds=False)
                 except Exception as exc:
                     logdata = {'msg': str(exc)}
-                    log('E61', logdata)
+                    if self.runner == 'pkcon_runner':
+                        log('E61', logdata)
+                    elif self.runner == 'apt1_runner':
+                        log('E80', logdata)
 
     def apply(self):
         if self.__module_enabled:
@@ -91,10 +119,17 @@ class package_applier_user(applier_frontend):
     __hkcu_branch = 'Software\\BaseALT\\Policies\\Packages'
 
     def __init__(self, storage, username):
+        runner = select_runner()
+        if runner is None:
+            log('E81')
+            raise Exception('No package applier runner found')
+        log('D236', {'runner': runner})
+        self.runner = runner + '_runner'
+
         self.storage = storage
         self.username = username
         self.fulcmd = []
-        self.fulcmd.append('/usr/libexec/gpupdate/pkcon_runner')
+        self.fulcmd.append('/usr/libexec/gpupdate/' + self.runner)
         self.fulcmd.append('--user')
         self.fulcmd.append(self.username)
         self.fulcmd.append('--loglevel')
@@ -129,13 +164,19 @@ def run(self):
                     subprocess.check_call(self.fulcmd)
                 except Exception as exc:
                     logdata = {'msg': str(exc)}
-                    log('E60', logdata)
+                    if self.runner == 'pkcon_runner':
+                        log('E60', logdata)
+                    elif self.runner == 'apt1_runner':
+                        log('E77', logdata)
             else:
                 try:
                     subprocess.Popen(self.fulcmd,close_fds=False)
                 except Exception as exc:
                     logdata = {'msg': str(exc)}
-                    log('E62', logdata)
+                    if self.runner == 'pkcon_runner':
+                        log('E62', logdata)
+                    elif self.runner == 'apt1_runner':
+                        log('E78', logdata)
 
     def admin_context_apply(self):
         '''

gpoa/locale/ru_RU/LC_MESSAGES/gpoa.po

@@ -268,6 +268,21 @@ msgstr "Не удалось обновить LDAP новыми данными п
 msgid "Failed to change local user password"
 msgstr "Не удалось изменить пароль локального пользователя"
 
+msgid "Error running apt1_runner sync for user"
+msgstr "Ошибка при запуске apt1_runner синхронно для пользователя"
+
+msgid "Error running apt1_runner async for user"
+msgstr "Ошибка при запуске apt1_runner асинхронно для пользователя"
+
+msgid "Error running apt1_runner sync for machine"
+msgstr "Ошибка при запуске apt1_runner синхронно для компьютера"
+
+msgid "Error running apt1_runner async for machine"
+msgstr "Ошибка при запуске apt1_runner асинхронно для компьютера"
+
+msgid "Error no package applier runner found"
+msgstr "Ошибка не найден исполнитель применения пакетов"
+
 # Error_end
 
 # Debug
@@ -961,6 +976,9 @@ msgstr "Не найдены входы после изменения парол
 msgid "Running apt1_runner to install and remove packages"
 msgstr "Запуск pkcon_runner для установки и удаления пакетов"
 
+msgid "Package applier runner found"
+msgstr "Найдено средство применения пакета"
+
 msgid "Unknown message type, no message assigned"
 msgstr "Неизвестный тип сообщения"
 

gpoa/messages/__init__.py

@@ -112,6 +112,12 @@ def error_code(code):
     error_ids[74] = 'Autofs restart failed'
     error_ids[75] = 'Failed to update LDAP with new password data'
     error_ids[76] = 'Failed to change local user password'
+    error_ids[77] = 'Error running apt1_runner sync for user'
+    error_ids[78] = 'Error running apt1_runner async for user'
+    error_ids[79] = 'Error running apt1_runner sync for machine'
+    error_ids[80] = 'Error running apt1_runner async for machine'
+    error_ids[81] = 'Error no package applier runner found'
+
     return error_ids.get(code, 'Unknown error code')
 
 def debug_code(code):
@@ -350,6 +356,7 @@ def debug_code(code):
     debug_ids[233] = 'Calculating time since the first user login after their password change'
     debug_ids[234] = 'No logins found after password change'
     debug_ids[235] = 'Running apt1_runner to install and remove packages'
+    debug_ids[236] = 'Package applier runner found'
 
     return debug_ids.get(code, 'Unknown debug code')
 

gpoa/select_runner

@@ -0,0 +1,91 @@
+#!/usr/bin/python3
+
+import dbus
+import logging
+from util.logging import log
+import argparse
+import gettext
+import locale
+
+import os
+import dbus
+import dbus.mainloop.glib
+
+
+def check_apt1() -> bool:
+    '''
+    Check if apt1 is running and has ApplyAsync method
+
+    Returns:
+        True if apt1 is running and has ApplyAsync method
+    '''
+    dbus_interface = 'org.altlinux.alterator.apt1'
+    bus_name = 'org.altlinux.alterator'
+    object_path = '/org/altlinux/alterator/apt'
+    try:
+        bus = dbus.SystemBus()
+
+        if not bus.name_has_owner(bus_name):
+            bus.close()
+            return False
+
+        if not bus.get_object(bus_name, object_path).has_method(dbus_interface, 'ApplyAsync'):
+            bus.close()
+            return False
+
+        bus.close()
+        return True
+    except dbus.exceptions.DBusException as e:
+        return False
+
+def check_pkcon() -> bool:
+    """
+    Check if pkcon is installed and executable
+
+    Returns:
+        True if pkcon is installed and executable
+    """
+    if os.path.isfile('/usr/bin/pkcon') and os.access('/usr/bin/pkcon', os.X_OK):
+        return True
+    return False
+
+def main() -> int:
+    """
+    Check if apt1 or pkcon is running and return the name of the backend
+
+    Returns:
+        0 if apt1 or pkcon is running, 1 otherwise
+    """
+
+    backends = { "apt1": check_apt1,"pkcon": check_pkcon }
+
+    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('-b', '--backend', type=str, choices=backends.keys(), default='apt1', help='priority backend (default: %(default)s)')
+    parser.add_argument('--loglevel', type=int, help='loglevel', nargs='?', default=30)
+
+    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+    args = parser.parse_args()
+    logger.setLevel(args.loglevel)
+
+    if backends[args.backend]():
+        print(args.backend)
+        return 0
+
+    for el in backends:
+        if el == args.backend:
+            continue
+        if backends[el]():
+            print(el)
+            return 0
+    return 1
+
+if __name__ == '__main__':
+    try:
+        exit(main())
+    except Exception as exc:
+        exit(1)

gpupdate.spec

@@ -108,6 +108,8 @@ mkdir -p \
 
 ln -s %python3_sitelibdir/gpoa/apt1_runner \
 	%buildroot%_prefix/libexec/%name/apt1_runner
+ln -s %python3_sitelibdir/gpoa/select_runner \
+	%buildroot%_prefix/libexec/%name/select_runner
 ln -s %python3_sitelibdir/gpoa/pkcon_runner \
 	%buildroot%_prefix/libexec/%name/pkcon_runner
 ln -s %python3_sitelibdir/gpoa/scripts_runner \
@@ -169,12 +171,14 @@ fi
 %_prefix/libexec/%name/scripts_runner
 %_prefix/libexec/%name/pkcon_runner
 %_prefix/libexec/%name/apt1_runner
+%_prefix/libexec/%name/select_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
 %attr(755,root,root) %python3_sitelibdir/gpoa/apt1_runner
+%attr(755,root,root) %python3_sitelibdir/gpoa/select_runner
 %python3_sitelibdir/gpoa
 %_datadir/%name
 %_unitdir/%name.service