Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding config to use the default clientID

This commit is contained in:
Hossein Shafagh 2021-01-15 16:44:05 -08:00
parent 88e587af11
commit 4afdc13b03
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lemur/plugins/lemur_entrust/plugin.py
View File

@ -80,7 +80,6 @@ def process_options(options, client_id):
"eku": "SERVER_AND_CLIENT_AUTH", "eku": "SERVER_AND_CLIENT_AUTH",
"certType": product_type, "certType": product_type,
"certExpiryDate": validity_end, "certExpiryDate": validity_end,
# "keyType": "RSA", Entrust complaining about this parameter
"tracking": tracking_data, "tracking": tracking_data,
"org": options.get("organization"), "org": options.get("organization"),
"clientId": client_id "clientId": client_id
@ -229,7 +228,11 @@ class EntrustIssuerPlugin(IssuerPlugin):
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
raise Exception(f"Error for Getting Organization {e}") raise Exception(f"Error for Getting Organization {e}")
client_id = get_client_id(response, issuer_options.get("organization")) if current_app.config.get("ENTRUST_USE_DEFAULT_CLIENT_ID"):
# The ID of the primary client is 1.
client_id = 1
else:
client_id = get_client_id(response, issuer_options.get("organization"))
log_data = { log_data = {
"function": f"{__name__}.{sys._getframe().f_code.co_name}", "function": f"{__name__}.{sys._getframe().f_code.co_name}",
"message": f"Organization id: {client_id}" "message": f"Organization id: {client_id}"