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

Use the compound statement formatting API for configuring PKINIT

Browse Source 
Use `if_branch` and `else_branch` context managers instead of raw
`command` calls in the method that generates Bash snippet that
configures PKINIT on the master.

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:08:08 +02:00
committed by Martin Basti
parent 85a79b5ccd
commit a9fec090f7
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,15 +214,13 @@ class config_server_for_smart_card_auth(common_smart_card_auth_config):
def check_and_enable_pkinit(self): def check_and_enable_pkinit(self):
self.log.comment('check whether PKINIT is configured on the master') self.log.comment('check whether PKINIT is configured on the master')
self.log.command( with self.log.if_branch(
"if ipa-pkinit-manage status | grep -q 'enabled'") "ipa-pkinit-manage status | grep -q 'enabled'"):
self.log.command('then')
self.log.command('echo "PKINIT already enabled"') self.log.command('echo "PKINIT already enabled"')
self.log.command('else') with self.log.else_branch():
self.log.exit_on_failed_command( self.log.exit_on_failed_command(
'ipa-pkinit-manage enable', 'ipa-pkinit-manage enable',
['Failed to issue PKINIT certificates to local KDC']) ['Failed to issue PKINIT certificates to local KDC'])
self.log.command('fi')
def enable_ok_to_auth_as_delegate_on_http_principal(self): def enable_ok_to_auth_as_delegate_on_http_principal(self):
self.log.comment('Enable OK-AS-DELEGATE flag on the HTTP principal') self.log.comment('Enable OK-AS-DELEGATE flag on the HTTP principal')