SCAutolib 3.4.0__py3-none-any.whl → 3.4.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- SCAutolib/controller.py +4 -8
- SCAutolib/models/CA.py +3 -17
- {SCAutolib-3.4.0.dist-info → scautolib-3.4.2.dist-info}/METADATA +3 -2
- {SCAutolib-3.4.0.dist-info → scautolib-3.4.2.dist-info}/RECORD +8 -8
- {SCAutolib-3.4.0.dist-info → scautolib-3.4.2.dist-info}/WHEEL +1 -1
- {SCAutolib-3.4.0.dist-info → scautolib-3.4.2.dist-info}/entry_points.txt +0 -0
- {SCAutolib-3.4.0.dist-info → scautolib-3.4.2.dist-info/licenses}/LICENSE +0 -0
- {SCAutolib-3.4.0.dist-info → scautolib-3.4.2.dist-info}/top_level.txt +0 -0
SCAutolib/controller.py
CHANGED
|
@@ -156,14 +156,10 @@ class Controller:
|
|
|
156
156
|
for c in self.lib_conf["cards"]):
|
|
157
157
|
packages += ["pcsc-lite-ccid", "pcsc-lite", "virt_cacard",
|
|
158
158
|
"vpcd", "softhsm"]
|
|
159
|
-
|
|
160
|
-
if isDistro(['rhel', 'centos'], version='10'):
|
|
161
|
-
# TODO: use better approach later
|
|
162
|
-
extra_args = " centos-stream-10-x86_64"
|
|
163
|
-
run("dnf -y copr enable jjelen/vsmartcard{0}".format(extra_args))
|
|
159
|
+
run("dnf -y copr --hub fedora enable jjelen/vsmartcard")
|
|
164
160
|
|
|
165
161
|
# Add IPA packages if needed
|
|
166
|
-
if any([u["user_type"]
|
|
162
|
+
if any([u["user_type"] == UserType.ipa
|
|
167
163
|
for u in self.lib_conf["users"]]):
|
|
168
164
|
packages += self._general_steps_for_ipa()
|
|
169
165
|
|
|
@@ -563,9 +559,9 @@ class Controller:
|
|
|
563
559
|
logger.debug("idm:DL1 module is installed")
|
|
564
560
|
|
|
565
561
|
if isDistro('fedora'):
|
|
566
|
-
return ["freeipa-client"]
|
|
562
|
+
return ["e2fsprogs", "freeipa-client"]
|
|
567
563
|
else:
|
|
568
|
-
return ["ipa-client"]
|
|
564
|
+
return ["e2fsprogs", "ipa-client"]
|
|
569
565
|
|
|
570
566
|
def get_user_dict(self, name):
|
|
571
567
|
"""
|
SCAutolib/models/CA.py
CHANGED
|
@@ -9,7 +9,7 @@ import json
|
|
|
9
9
|
import os
|
|
10
10
|
import python_freeipa
|
|
11
11
|
from cryptography import x509
|
|
12
|
-
from hashlib import
|
|
12
|
+
from hashlib import sha256
|
|
13
13
|
from pathlib import Path, PosixPath
|
|
14
14
|
from python_freeipa import exceptions
|
|
15
15
|
from python_freeipa.client_meta import ClientMeta
|
|
@@ -578,8 +578,6 @@ class IPAServerCA(BaseCA):
|
|
|
578
578
|
f.write(cnt)
|
|
579
579
|
logger.info(
|
|
580
580
|
"IPA server is added to /etc/resolv.conf as first nameserver")
|
|
581
|
-
run("chattr -i /etc/resolv.conf")
|
|
582
|
-
logger.info("File /etc/resolv.conf is blocked for editing")
|
|
583
581
|
|
|
584
582
|
with open("/etc/resolv.conf", "r") as f:
|
|
585
583
|
logger.debug(f"New resolv.conf\n{f.read()}")
|
|
@@ -608,18 +606,6 @@ class IPAServerCA(BaseCA):
|
|
|
608
606
|
from invoke import Responder
|
|
609
607
|
from fabric.connection import Connection
|
|
610
608
|
|
|
611
|
-
class __PKeyChild(paramiko.PKey):
|
|
612
|
-
"""This child class is need to fix SSH connection with MD5 algorithm
|
|
613
|
-
in FIPS mode
|
|
614
|
-
|
|
615
|
-
This is just workaround until PR in paramiko would be accepted
|
|
616
|
-
https://github.com/paramiko/paramiko/issues/396. After this PR is
|
|
617
|
-
merged, delete this class
|
|
618
|
-
"""
|
|
619
|
-
|
|
620
|
-
def get_fingerprint_improved(self):
|
|
621
|
-
return md5(self.asbytes(), usedforsecurity=False).digest()
|
|
622
|
-
|
|
623
609
|
kinitpass = Responder(
|
|
624
610
|
pattern=f"Password for admin@{self._ipa_server_realm}: ",
|
|
625
611
|
response=f"{self._ipa_server_admin_passwd}\n")
|
|
@@ -628,11 +614,11 @@ class IPAServerCA(BaseCA):
|
|
|
628
614
|
with Connection(self._ipa_server_ip, user="root",
|
|
629
615
|
connect_kwargs={
|
|
630
616
|
"password": self._ipa_server_root_passwd}) as c:
|
|
631
|
-
# Delete this block when PR in paramiko will be accepted
|
|
617
|
+
# TODO Delete this block when PR in paramiko will be accepted
|
|
632
618
|
# https://github.com/paramiko/paramiko/issues/396
|
|
633
619
|
#### noqa:E266
|
|
634
620
|
paramiko.PKey.get_fingerprint = \
|
|
635
|
-
|
|
621
|
+
lambda x: sha256(x.asbytes()).digest()
|
|
636
622
|
c.client = paramiko.SSHClient()
|
|
637
623
|
c.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
|
|
638
624
|
#### noqa:E266
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: SCAutolib
|
|
3
|
-
Version: 3.4.
|
|
3
|
+
Version: 3.4.2
|
|
4
4
|
Summary: Python library for automation tests of smart cards using virtualization.
|
|
5
5
|
Home-page: https://github.com/redhat-qe-security/SCAutolib
|
|
6
6
|
Author: Pavel Yadlouski
|
|
@@ -38,6 +38,7 @@ Dynamic: classifier
|
|
|
38
38
|
Dynamic: description
|
|
39
39
|
Dynamic: description-content-type
|
|
40
40
|
Dynamic: home-page
|
|
41
|
+
Dynamic: license-file
|
|
41
42
|
Dynamic: provides-extra
|
|
42
43
|
Dynamic: requires-dist
|
|
43
44
|
Dynamic: requires-python
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
SCAutolib/__init__.py,sha256=ysyjkZZ9rT08COAGbKZBlyu7PEminPAFWLEB_uotQ-4,5579
|
|
2
2
|
SCAutolib/cli_commands.py,sha256=LtpkVdFxnKmkazPX3UhB7eCTufNz5Uq0i4Naa4R7r2k,10014
|
|
3
|
-
SCAutolib/controller.py,sha256=
|
|
3
|
+
SCAutolib/controller.py,sha256=GOOy8ZkKA0Q23UkzSaJot7qbzj2xJpMdbYMZtCD_M38,23798
|
|
4
4
|
SCAutolib/enums.py,sha256=UviyFPIw6MPkJl-BwWd4eTtr47BRr_KMsDlHF-ErGcU,677
|
|
5
5
|
SCAutolib/exceptions.py,sha256=-Jsj80CXOSXQacCI46PYXEIh6-tdHSOw3FE4itE_e5w,857
|
|
6
6
|
SCAutolib/isDistro.py,sha256=nAbxa9q0LIWmxmwlZeKXd22M3s9_E6FbD9G5j5coLsY,1460
|
|
7
7
|
SCAutolib/utils.py,sha256=vtZ1bb-ngHCqDGnw_9qJ8A1avC3hXKCBGkR3kvFK9f0,7359
|
|
8
|
-
SCAutolib/models/CA.py,sha256=
|
|
8
|
+
SCAutolib/models/CA.py,sha256=GkygTHAdrtcUh1K7Nd8n1OPRmkf3QL1sqPbDp9KmnCw,29039
|
|
9
9
|
SCAutolib/models/__init__.py,sha256=8NZySkDbAn2sktD1L3__Y37kY9kEXM2o4TnN3hiIsfk,48
|
|
10
10
|
SCAutolib/models/authselect.py,sha256=PqRcxB9RSAWmGSF1Z8u1YrE7OLrD9oj-sCzGJEAWHa8,3443
|
|
11
11
|
SCAutolib/models/card.py,sha256=QhGn5hbdZaaEuH9T1jZNNwKTopTApJfQcjP5iSKP5Kk,16149
|
|
@@ -21,9 +21,9 @@ SCAutolib/templates/sssd.conf-8or9,sha256=eBQJu9AY7LG4OsHRxinUjUeQOIxSu_MksWPKfq
|
|
|
21
21
|
SCAutolib/templates/user.cnf,sha256=pyyJhxFdOVlFqoVGVwjomOq-W4wEt3YWfRGZEXprwto,452
|
|
22
22
|
SCAutolib/templates/virt_cacard.service,sha256=31NrSKUspYIKNOVhL4Usc62CImlu3heNZprJ8sdw11Y,299
|
|
23
23
|
SCAutolib/templates/virtcacard.cil,sha256=TwxknjxnTtDK_KR3-MbKcLM0VrB76JVSlY-j84VaNZY,167
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
scautolib-3.4.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
25
|
+
scautolib-3.4.2.dist-info/METADATA,sha256=qGbpn_gHtvjY8txxT3c_PWL1a14kYCizFivoDQ_C-Ag,2571
|
|
26
|
+
scautolib-3.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
27
|
+
scautolib-3.4.2.dist-info/entry_points.txt,sha256=SyEBTEHEsfYmYZ4L3mQ_RUkW_PRTEWurYgITxGkFLe4,54
|
|
28
|
+
scautolib-3.4.2.dist-info/top_level.txt,sha256=z2XZ0S23vykXV_dZYNlLcgcSERgBDIWxmNsiiQBL-wQ,10
|
|
29
|
+
scautolib-3.4.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|