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

Merge pull request #3092 from sirferl/master 

Extended  ADCS_TEMPLATE_ Variable
This commit is contained in:
Hossein Shafagh 2020-08-25 09:39:12 -07:00 committed by GitHub
parent 41b35fb13d 4f148f3bc3
commit 136b8e67d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lemur/plugins/lemur_adcs/plugin.py
View File

@ -40,7 +40,10 @@ class ADCSIssuerPlugin(IssuerPlugin):
adcs_user = current_app.config.get("ADCS_USER") adcs_user = current_app.config.get("ADCS_USER")
adcs_pwd = current_app.config.get("ADCS_PWD") adcs_pwd = current_app.config.get("ADCS_PWD")
adcs_auth_method = current_app.config.get("ADCS_AUTH_METHOD") adcs_auth_method = current_app.config.get("ADCS_AUTH_METHOD")
adcs_template = current_app.config.get("ADCS_TEMPLATE") # if there is a config variable ADCS_TEMPLATE_<upper(authority.name)> take the value as Cert template
# else default to ADCS_TEMPLATE to be compatible with former versions
authority = issuer_options.get("authority").name.upper()
adcs_template = current_app.config.get("ADCS_TEMPLATE_{0}".format(authority), current_app.config.get("ADCS_TEMPLATE"))
ca_server = Certsrv( ca_server = Certsrv(
adcs_server, adcs_user, adcs_pwd, auth_method=adcs_auth_method adcs_server, adcs_user, adcs_pwd, auth_method=adcs_auth_method
) )