SCAutolib 3.4.0__tar.gz → 3.4.2__tar.gz

{scautolib-3.4.0/SCAutolib.egg-info → scautolib-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: SCAutolib
-Version: 3.4.0
+Version: 3.4.2
 Summary: Python library for automation tests of smart cards using virtualization.
 Home-page: https://github.com/redhat-qe-security/SCAutolib
 Author: Pavel Yadlouski
@@ -38,6 +38,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{scautolib-3.4.0 → scautolib-3.4.2}/SCAutolib/controller.py

@@ -156,14 +156,10 @@ class Controller:
                 for c in self.lib_conf["cards"]):
             packages += ["pcsc-lite-ccid", "pcsc-lite", "virt_cacard",
                          "vpcd", "softhsm"]
-            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))
+            run("dnf -y copr --hub fedora enable jjelen/vsmartcard")
 
         # Add IPA packages if needed
-        if any([u["user_type"] != UserType.local
+        if any([u["user_type"] == UserType.ipa
                 for u in self.lib_conf["users"]]):
             packages += self._general_steps_for_ipa()
 
@@ -563,9 +559,9 @@ class Controller:
             logger.debug("idm:DL1 module is installed")
 
         if isDistro('fedora'):
-            return ["freeipa-client"]
+            return ["e2fsprogs", "freeipa-client"]
         else:
-            return ["ipa-client"]
+            return ["e2fsprogs", "ipa-client"]
 
     def get_user_dict(self, name):
         """

{scautolib-3.4.0 → scautolib-3.4.2}/SCAutolib/models/CA.py

@@ -9,7 +9,7 @@ import json
 import os
 import python_freeipa
 from cryptography import x509
-from hashlib import md5
+from hashlib import sha256
 from pathlib import Path, PosixPath
 from python_freeipa import exceptions
 from python_freeipa.client_meta import ClientMeta
@@ -578,8 +578,6 @@ class IPAServerCA(BaseCA):
                 f.write(cnt)
             logger.info(
                 "IPA server is added to /etc/resolv.conf as first nameserver")
-            run("chattr -i /etc/resolv.conf")
-            logger.info("File /etc/resolv.conf is blocked for editing")
 
         with open("/etc/resolv.conf", "r") as f:
             logger.debug(f"New resolv.conf\n{f.read()}")
@@ -608,18 +606,6 @@ class IPAServerCA(BaseCA):
         from invoke import Responder
         from fabric.connection import Connection
 
-        class __PKeyChild(paramiko.PKey):
-            """This child class is need to fix SSH connection with MD5 algorithm
-            in FIPS mode
-
-            This is just workaround until PR in paramiko would be accepted
-            https://github.com/paramiko/paramiko/issues/396. After this PR is
-            merged, delete this class
-            """
-
-            def get_fingerprint_improved(self):
-                return md5(self.asbytes(), usedforsecurity=False).digest()
-
         kinitpass = Responder(
             pattern=f"Password for admin@{self._ipa_server_realm}: ",
             response=f"{self._ipa_server_admin_passwd}\n")
@@ -628,11 +614,11 @@ class IPAServerCA(BaseCA):
         with Connection(self._ipa_server_ip, user="root",
                         connect_kwargs={
                             "password": self._ipa_server_root_passwd}) as c:
-            # Delete this block when PR in paramiko will be accepted
+            # TODO Delete this block when PR in paramiko will be accepted
             # https://github.com/paramiko/paramiko/issues/396
             #### noqa:E266
             paramiko.PKey.get_fingerprint = \
-                self.__PKeyChild.get_fingerprint_improved
+                lambda x: sha256(x.asbytes()).digest()
             c.client = paramiko.SSHClient()
             c.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
             #### noqa:E266

{scautolib-3.4.0 → scautolib-3.4.2/SCAutolib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: SCAutolib
-Version: 3.4.0
+Version: 3.4.2
 Summary: Python library for automation tests of smart cards using virtualization.
 Home-page: https://github.com/redhat-qe-security/SCAutolib
 Author: Pavel Yadlouski
@@ -38,6 +38,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{scautolib-3.4.0 → scautolib-3.4.2}/setup.py

@@ -24,7 +24,7 @@ graphical_reqs = [
 
 setup(
     name="SCAutolib",
-    version="3.4.0",
+    version="3.4.2",
     description=description,
     long_description=long_description,
     long_description_content_type='text/markdown',