SCAutolib 3.2.2__py3-none-any.whl → 3.3.2__py3-none-any.whl

SCAutolib/controller.py

@@ -12,10 +12,11 @@ from SCAutolib import (logger, run, LIB_DIR, LIB_BACKUP, LIB_DUMP,
 from SCAutolib.models import CA, file, user, card, authselect as auth
 from SCAutolib.models.file import File, OpensslCnf
 from SCAutolib.models.CA import BaseCA
-from SCAutolib.enums import (OSVersion, CardType, UserType)
+from SCAutolib.enums import (CardType, UserType)
 from SCAutolib.utils import (_check_selinux, _gen_private_key,
-                             _get_os_version, _install_packages,
-                             _check_packages, dump_to_json, ca_factory)
+                             _install_packages, _check_packages,
+                             dump_to_json, ca_factory)
+from SCAutolib.isDistro import isDistro
 
 
 class Controller:
@@ -158,7 +159,11 @@ class Controller:
                 for c in self.lib_conf["cards"]):
             packages += ["pcsc-lite-ccid", "pcsc-lite", "virt_cacard",
                          "vpcd", "softhsm"]
-            run("dnf -y copr enable jjelen/vsmartcard")
+            extra_args = ""
+            if isDistro(['rhel', 'centos'], version='10'):
+                # TODO: use better approach later
+                extra_args = " centos-stream-10-x86_64"
+            run("dnf -y copr enable jjelen/vsmartcard{0}".format(extra_args))
 
         # Add IPA packages if needed
         if any([u["user_type"] != UserType.local
@@ -175,13 +180,15 @@ class Controller:
             logger.critical(msg)
             raise exceptions.SCAutolibException(msg)
 
-        os_version = _get_os_version()
         if graphical:
-            if os_version != OSVersion.Fedora:
+            if not isDistro('fedora'):
                 run(['dnf', 'groupinstall', 'Server with GUI', '-y',
                      '--allowerasing'])
+                run(['pip', 'install', 'python-uinput'])
             else:
-                run(['dnf', 'install', 'gdm', '-y'])
+                # Fedora doesn't have server with GUI group so installed gdm
+                # manually and also python3-uinput should be installed from RPM
+                run(['dnf', 'install', 'gdm', 'python3-uinput', '-y'])
             # disable subscription message
             run(['systemctl', '--global', 'mask',
                  'org.gnome.SettingsDaemon.Subscription.target'])
@@ -190,12 +197,14 @@ class Controller:
             self.dconf_file.save()
             run('dconf update')
 
-        if os_version != OSVersion.Fedora:
+        if not isDistro('fedora'):
             run(['dnf', 'groupinstall', "Smart Card Support", '-y',
                  '--allowerasing'])
             logger.debug("Smart Card Support group in installed.")
         else:
-            run(['dnf', 'install', 'opensc', 'pcsc-lite-ccid', '-y'])
+            # Fedora requires rsyslog as well
+            run(['dnf', 'install', 'opensc', 'pcsc-lite-ccid', 'rsyslog', '-y'])
+            run(['systemctl', 'start', 'rsyslog'])
 
         self.sssd_conf.create()
         self.sssd_conf.save()
@@ -207,13 +216,6 @@ class Controller:
         dump_to_json(user.User(username="root",
                                password=self.lib_conf["root_passwd"]))
 
-        # Fedora requires python3-uinput from RPM and rsyslog
-        if os_version == OSVersion.Fedora:
-            run(['dnf', 'install', 'python3-uinput', 'rsyslog', '-y'])
-            run(['systemctl', 'start', 'rsyslog'])
-        else:
-            run(['pip', 'install', 'python-uinput'])
-
     def setup_local_ca(self, force: bool = False):
         """
         Setup local CA based on configuration from the configuration file. All
@@ -534,13 +536,12 @@ class Controller:
 
         :return: name of the IPA client package for current Linux
         """
-        os_version = _get_os_version()
-        if os_version not in (OSVersion.RHEL_9, OSVersion.CentOS_9):
+        if isDistro(['rhel', 'centos'], version='8'):
             run("dnf module enable -y idm:DL1")
             run("dnf install @idm:DL1 -y")
             logger.debug("idm:DL1 module is installed")
 
-        if os_version == OSVersion.Fedora:
+        if isDistro('fedora'):
             return ["freeipa-client"]
         else:
             return ["ipa-client"]

SCAutolib/enums.py

@@ -1,15 +1,17 @@
 from enum import Enum, auto
 
 
-class OSVersion(Enum):
+class OSVersion(int, Enum):
     """
     Enumeration for Linux versions. Used for more convenient checks.
     """
     Fedora = 1
-    RHEL_9 = 2
-    RHEL_8 = 3
-    CentOS_8 = 4
-    CentOS_9 = 5
+    RHEL_8 = 2
+    RHEL_9 = 3
+    RHEL_10 = 4
+    CentOS_8 = 5
+    CentOS_9 = 6
+    CentOS_10 = 7
 
 
 class CardType(str, Enum):

SCAutolib/isDistro.py

@@ -0,0 +1,50 @@
+"""
+This module provides a function (isDistro) that helps us identify the os
+of the system and configure the system accordingly.
+"""
+
+import distro
+from typing import Union
+
+
+def isDistro(oses: Union[str, list], version: str = None) -> bool:
+    cur_id = distro.id().lower()
+    cur_name = distro.name().lower()
+
+    if isinstance(oses, str):
+        results = (oses in cur_id) or (oses in cur_name)
+    else:
+        results = False
+        for item in oses:
+            if not isinstance(item, str):
+                continue
+            item = item.lower()
+            results = results or (item in cur_id) or (item in cur_name)
+
+    if results is False:
+        return False
+
+    if version:
+        cur_major = int(distro.major_version())
+        cur_minor = int(distro.minor_version()) if distro.minor_version() else 0
+
+        if version[0] in ('<', '=', '>'):
+            if version[1] == '=':
+                op = version[:2]
+                version = version[2:]
+            else:
+                op = version[0] if version[0] != '=' else '=='
+                version = version[1:]
+        else:
+            op = '=='
+
+        parts = version.split('.')
+        major = int(parts[0])
+        minor = int(parts[1]) if len(parts) > 1 else None
+
+        if major == cur_major and minor:
+            return eval("{0} {1} {2}".format(cur_minor, op, minor))
+        else:
+            return eval("{0} {1} {2}".format(cur_major, op, major))
+
+    return True

SCAutolib/models/file.py

@@ -26,6 +26,7 @@ import json
 
 from SCAutolib import logger, TEMPLATES_DIR, LIB_BACKUP, LIB_DUMP_CONFS, run
 from SCAutolib.exceptions import SCAutolibException
+from SCAutolib.isDistro import isDistro
 
 
 class File:
@@ -277,7 +278,6 @@ class SSSDConf(File):
     runtimes.
     """
     __instance = None
-    _template = Path(TEMPLATES_DIR, "sssd.conf")
     _conf_file = Path("/etc/sssd/sssd.conf")
     _backup_original = None
     _backup_default = LIB_BACKUP.joinpath('default-sssd.conf')
@@ -298,6 +298,12 @@ class SSSDConf(File):
             return
         self.__initialized = True
 
+        if isDistro(['rhel', 'centos'], version='<=9') \
+                or isDistro(['fedora'], version='<39'):
+            self._template = TEMPLATES_DIR.joinpath("sssd.conf-8or9")
+        else:
+            self._template = TEMPLATES_DIR.joinpath("sssd.conf-10")
+
         # _default_parser object stores default content of config file
         self._default_parser = ConfigParser()
         # avoid problems with inserting some 'specific' values

SCAutolib/models/gui.py

@@ -12,8 +12,7 @@ import uinput
 import logging
 
 from SCAutolib import run, logger
-from SCAutolib.enums import OSVersion
-from SCAutolib.utils import _get_os_version
+from SCAutolib.isDistro import isDistro
 
 
 class HTMLFileHandler(logging.FileHandler):
@@ -487,8 +486,7 @@ class GUI:
         else:
             func_str = 'assert_no_text'
 
-        os_version = _get_os_version()
-        if os_version == OSVersion.Fedora:
+        if isDistro('fedora'):
             check_str = 'tosearch'
         else:
             check_str = 'Activities'

SCAutolib/templates/sssd.conf-10

@@ -0,0 +1,18 @@
+[sssd]
+debug_level = 9
+services = nss, pam, ssh, sudo
+domains = shadowutils
+certificate_verification = no_ocsp
+
+[nss]
+debug_level = 9
+
+[pam]
+debug_level = 9
+pam_cert_auth = True
+
+[domain/shadowutils]
+debug_level = 9
+id_provider = proxy
+proxy_lib_name = files
+local_auth_policy = only

SCAutolib/utils.py

@@ -10,7 +10,6 @@ from pathlib import Path
 
 from SCAutolib import (run, logger, TEMPLATES_DIR, LIB_DUMP_USERS, LIB_DUMP_CAS,
                        LIB_DUMP_CARDS)
-from SCAutolib.enums import OSVersion
 from SCAutolib.exceptions import SCAutolibException
 from SCAutolib.models.CA import LocalCA, BaseCA, CustomCA, IPAServerCA
 from SCAutolib.models.card import Card
@@ -58,28 +57,6 @@ def _gen_private_key(key_path: Path):
             encryption_algorithm=serialization.NoEncryption()))
 
 
-def _get_os_version():
-    """
-    Find Linux version. Available version: RHEL 8, RHEL 9, Fedora.
-    :return: Enum with OS version
-    """
-    with open('/etc/redhat-release', "r") as f:
-        cnt = f.read()
-
-    if "Red Hat Enterprise Linux release 9" in cnt:
-        return OSVersion.RHEL_9
-    elif "Red Hat Enterprise Linux release 8" in cnt:
-        return OSVersion.RHEL_8
-    elif "Fedora" in cnt:
-        return OSVersion.Fedora
-    elif "CentOS Stream release 8" in cnt:
-        return OSVersion.CentOS_8
-    elif "CentOS Stream release 9" in cnt:
-        return OSVersion.CentOS_9
-    else:
-        raise SCAutolibException("OS is not detected.")
-
-
 def _install_packages(packages):
     """
     Install given packages and log package version

{SCAutolib-3.2.2.dist-info → SCAutolib-3.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SCAutolib
-Version: 3.2.2
+Version: 3.3.2
 Summary: Python library for automation tests of smart cards using virtualization.
 Home-page: https://github.com/redhat-qe-security/SCAutolib
 Author: Pavel Yadlouski
@@ -25,6 +25,7 @@ Requires-Dist: pytest >=7
 Requires-Dist: schema >=0.7
 Requires-Dist: python-freeipa >=1.0
 Requires-Dist: pexpect >=4
+Requires-Dist: distro >=1.5.0
 Provides-Extra: graphical
 Requires-Dist: opencv-python ; extra == 'graphical'
 Requires-Dist: pandas ; extra == 'graphical'

{SCAutolib-3.2.2.dist-info → SCAutolib-3.3.2.dist-info}/RECORD

@@ -1,27 +1,29 @@
 SCAutolib/__init__.py,sha256=nC78DtNE09z1s-LglB2K_-iquLONQAOfg2qbK_6ay9g,5490
 SCAutolib/cli_commands.py,sha256=5G6JSGskB0igROUufRQ8xpKwoOv6tfzhWDo6o6nI-Ao,5888
-SCAutolib/controller.py,sha256=x7BEg-FQKNmGKrj6Xu_JqGvY1QScicWEr5Kq00lrZDk,23059
-SCAutolib/enums.py,sha256=3t3N2RRjZeZW2EMhNf1kk5S-FgarabBEo1qLlf6uIzE,638
+SCAutolib/controller.py,sha256=HTkG_d9g9CuObBPjagyJSoES-Tero8PsvySAeWthy3k,23210
+SCAutolib/enums.py,sha256=UviyFPIw6MPkJl-BwWd4eTtr47BRr_KMsDlHF-ErGcU,677
 SCAutolib/exceptions.py,sha256=-Jsj80CXOSXQacCI46PYXEIh6-tdHSOw3FE4itE_e5w,857
-SCAutolib/utils.py,sha256=4BdttTsNzZtletfeoIuIERrdd5BNiJGlcHa1mOFIuSY,8026
+SCAutolib/isDistro.py,sha256=vYSmjtIEEh0N-qF9c9xtTtvYSCRWi5yP2mlTQBvOgBk,1460
+SCAutolib/utils.py,sha256=dArD7_gVa9WA8N4GlP4PwfOaK_mm_HkwA-Z7dxM7IGY,7326
 SCAutolib/models/CA.py,sha256=vWXZNxUlula854MwcbVNSU1Eiy07bSH1dBr7Y2Zz20A,29633
 SCAutolib/models/__init__.py,sha256=8NZySkDbAn2sktD1L3__Y37kY9kEXM2o4TnN3hiIsfk,48
 SCAutolib/models/authselect.py,sha256=PqRcxB9RSAWmGSF1Z8u1YrE7OLrD9oj-sCzGJEAWHa8,3443
 SCAutolib/models/card.py,sha256=QhGn5hbdZaaEuH9T1jZNNwKTopTApJfQcjP5iSKP5Kk,16149
-SCAutolib/models/file.py,sha256=Rx8QawyXxpqulPGm1l9RKxE1o6cuTrYvZMw0EUR6aYY,23066
-SCAutolib/models/gui.py,sha256=v_OHpcnqy8mp03eVzGstlOu2vuzZv-fk2jwJMg_ewEo,16378
+SCAutolib/models/file.py,sha256=MCAyiB8rd9CEHgcjTaVRJBbv2i5Ig7M3uTWcosiS5hc,23323
+SCAutolib/models/gui.py,sha256=BIIHPXOiSDgBm3GIN8jFucQQHO-XeicGjVhECeTuEBk,16285
 SCAutolib/models/log.py,sha256=6EoiehIIJjCXZqbT_X3eQyKWCS-_yZ5RdJcX5HVTJXI,1499
 SCAutolib/models/user.py,sha256=VK4chlS7izTYiwmVuYjl_cknOe00FFbCbiQOfMOoZU4,6390
 SCAutolib/templates/ca.cnf,sha256=9oqUZUSy_lEtNLDViD8SwgJl1ZKCI1-DMri1feF6vjQ,1047
 SCAutolib/templates/gnome_disable_welcome,sha256=POtfU_SrgKGn4RmgLrFtg0K3MTetSFAmUo9HWidi5W0,60
 SCAutolib/templates/softhsm2.conf,sha256=WAlZpRSLzssZ0-dnUZcz2pig9RGIJD0oQg_t5B1X3Fo,108
-SCAutolib/templates/sssd.conf,sha256=eBQJu9AY7LG4OsHRxinUjUeQOIxSu_MksWPKfqZswYo,236
+SCAutolib/templates/sssd.conf-10,sha256=qwgNOBTy7j9GKpXD9vDUPH5h1-qkDm8C8sGzGbUnq9U,284
+SCAutolib/templates/sssd.conf-8or9,sha256=eBQJu9AY7LG4OsHRxinUjUeQOIxSu_MksWPKfqZswYo,236
 SCAutolib/templates/user.cnf,sha256=pyyJhxFdOVlFqoVGVwjomOq-W4wEt3YWfRGZEXprwto,452
 SCAutolib/templates/virt_cacard.service,sha256=31NrSKUspYIKNOVhL4Usc62CImlu3heNZprJ8sdw11Y,299
 SCAutolib/templates/virtcacard.cil,sha256=TwxknjxnTtDK_KR3-MbKcLM0VrB76JVSlY-j84VaNZY,167
-SCAutolib-3.2.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-SCAutolib-3.2.2.dist-info/METADATA,sha256=4LiG0ITAAPI_0Uvbz-Em6OMm1f6brnA2tDXlMRFFAZM,2313
-SCAutolib-3.2.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-SCAutolib-3.2.2.dist-info/entry_points.txt,sha256=SyEBTEHEsfYmYZ4L3mQ_RUkW_PRTEWurYgITxGkFLe4,54
-SCAutolib-3.2.2.dist-info/top_level.txt,sha256=z2XZ0S23vykXV_dZYNlLcgcSERgBDIWxmNsiiQBL-wQ,10
-SCAutolib-3.2.2.dist-info/RECORD,,
+SCAutolib-3.3.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+SCAutolib-3.3.2.dist-info/METADATA,sha256=2_nuaZphJacyzbEkC6byGhWjtvp3n8pvTxUQi1A5GZo,2343
+SCAutolib-3.3.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+SCAutolib-3.3.2.dist-info/entry_points.txt,sha256=SyEBTEHEsfYmYZ4L3mQ_RUkW_PRTEWurYgITxGkFLe4,54
+SCAutolib-3.3.2.dist-info/top_level.txt,sha256=z2XZ0S23vykXV_dZYNlLcgcSERgBDIWxmNsiiQBL-wQ,10
+SCAutolib-3.3.2.dist-info/RECORD,,