IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

smart card advises: use a wrapper around Bash for loops

Browse Source 
Replace the raw `command` calls constructing the for loops in some
methods by a wrapper hiding this detail.

https://pagure.io/freeipa/issue/7036

Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Martin Babinsky
2017-06-22 15:30:41 +02:00
committed by Martin Basti
parent a9fec090f7
commit 4d57aef7a5
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ipaserver/advise/base.py
View File

@@ -201,6 +201,24 @@ class UnbranchedIfStatement(IfBranch):
self.advice_output.command('fi')
class ForLoop(CompoundStatement):
"""
Wrapper around the for loop
"""
def __init__(self, advice_output, loop_variable, iterable):
super(ForLoop, self).__init__(advice_output)
self.loop_variable = loop_variable
self.iterable = iterable
def begin_statement(self):
self.advice_output.command(
'for {} in {}'.format(self.loop_variable, self.iterable))
self.advice_output.command('do')
def end_statement(self):
self.advice_output.command('done')
class _AdviceOutput(object):
def __init__(self):
@@ -334,6 +352,11 @@ class _AdviceOutput(object):
with self._compound_statement(ElseIfBranch, predicate):
yield
@contextmanager
def for_loop(self, loop_variable, iterable):
with self._compound_statement(ForLoop, loop_variable, iterable):
yield
class Advice(Plugin):
"""

26
ipaserver/advise/plugins/smart_card_auth.py
View File

@@ -40,48 +40,36 @@ class common_smart_card_auth_config(Advice):
['You need to provide one or more paths to the PEM files '
'containing CAs signing the Smart Cards']
)
self.log.command(
"for {} in ${}".format(
single_ca_path_variable, ca_paths_variable))
self.log.command("do")
with self.log.indented_block():
with self.log.for_loop(single_ca_path_variable,
'${}'.format(ca_paths_variable)):
self.log.exit_on_predicate(
'[ ! -f "${}" ]'.format(single_ca_path_variable),
['Invalid CA certificate filename: ${}'.format(
single_ca_path_variable),
'Please check that the path exists and is a valid file']
)
self.log.command("done")
def upload_smartcard_ca_certificates_to_systemwide_db(self):
self.log.command(
"for {} in ${}".format(
with self.log.for_loop(
self.single_ca_cert_variable_name,
self.smart_card_ca_certs_variable_name))
self.log.command("do")
with self.log.indented_block():
'${}'.format(self.smart_card_ca_certs_variable_name)):
self.log.command(
'certutil -d {} -A -i ${} -n "Smart Card CA $(uuidgen)" '
'-t CT,C,C'.format(
self.systemwide_nssdb, self.single_ca_cert_variable_name
),
)
)
self.log.command("done")
def install_smart_card_signing_ca_certs(self):
self.log.command(
"for {} in ${}".format(
with self.log.for_loop(
self.single_ca_cert_variable_name,
self.smart_card_ca_certs_variable_name))
self.log.command("do")
with self.log.indented_block():
'${}'.format(self.smart_card_ca_certs_variable_name)):
self.log.exit_on_failed_command(
'ipa-cacert-manage install ${} -t CT,C,C'.format(
self.single_ca_cert_variable_name
),
['Failed to install external CA certificate to IPA']
)
self.log.command("done")
def update_ipa_ca_certificate_store(self):
self.log.exit_on_failed_command(