IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-07-29 23:58:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

certmonger: refactor 'resubmit_request' and 'modify'

Browse Source 
certmonger.resubmit_request() and .modify() contain a redundant if
statement that means more lines of code must be changed when adding
or removing a function argument.  Perform a small refactor to
improve these functions.

Part of: https://pagure.io/freeipa/issue/6858

Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
Fraser Tweedale
2017-10-04 10:09:18 +02:00
committed by Pavel Vomacka
parent fc7c684b12
commit 2207dc5c17
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipalib/install/certmonger.py
+18 -17
View File
@@ -508,14 +508,14 @@ def stop_tracking(secdir=None, request_id=None, nickname=None, certfile=None):
def modify(request_id, ca=None, profile=None):
if ca or profile:
update = {}
if ca is not None:
cm = _certmonger()
update['CA'] = cm.obj_if.find_ca_by_nickname(ca)
if profile is not None:
update['template-profile'] = profile
if len(update) > 0:
request = _get_request({'nickname': request_id})
update = {}
if ca is not None:
cm = _certmonger()
update['CA'] = cm.obj_if.find_ca_by_nickname(ca)
if profile is not None:
update['template-profile'] = profile
request.obj_if.modify(update)
@@ -528,16 +528,17 @@ def resubmit_request(request_id, ca=None, profile=None, is_ca=False):
"""
request = _get_request({'nickname': request_id})
if request:
if ca or profile or is_ca:
update = {}
if ca is not None:
cm = _certmonger()
update['CA'] = cm.obj_if.find_ca_by_nickname(ca)
if profile is not None:
update['template-profile'] = profile
if is_ca:
update['template-is-ca'] = True
update['template-ca-path-length'] = -1 # no path length
update = {}
if ca is not None:
cm = _certmonger()
update['CA'] = cm.obj_if.find_ca_by_nickname(ca)
if profile is not None:
update['template-profile'] = profile
if is_ca:
update['template-is-ca'] = True
update['template-ca-path-length'] = -1 # no path length
if len(update) > 0:
request.obj_if.modify(update)
request.obj_if.resubmit()