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

fixing file read to trim line endings and cleanup

This commit is contained in:
alwaysjolley 2019-03-20 14:59:04 -04:00
parent 3a96475a2e
commit fa4a5122bc
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lemur/plugins/lemur_vault_dest/plugin.py
View File

@ -36,15 +36,13 @@ class VaultDestinationPlugin(DestinationPlugin):
'required': True, 'required': True,
'validation': '^https?://[a-zA-Z0-9.:-]+$', 'validation': '^https?://[a-zA-Z0-9.:-]+$',
'helpMessage': 'Valid URL to Hashi Vault instance' 'helpMessage': 'Valid URL to Hashi Vault instance'
'default': 'http://127.0.0.1:8200'
}, },
{ {
'name': 'vaultAuthTokenFile', 'name': 'vaultAuthTokenFile',
'type': 'str', 'type': 'str',
'required': True, 'required': True,
'validation': '(/[^/]+)+', 'validation': '(/[^/]+)+',
'helpMessage': 'Must be a valid file path!', 'helpMessage': 'Must be a valid file path!'
'default': '/etc/pki/secrets/vault/token'
}, },
{ {
'name': 'vaultMount', 'name': 'vaultMount',
@ -94,17 +92,15 @@ class VaultDestinationPlugin(DestinationPlugin):
""" """
cname = common_name(parse_certificate(body)) cname = common_name(parse_certificate(body))
token = current_app.config.get('VAULT_TOKEN')
#url = current_app.config.get('VAULT_URL')
url = self.get_option('vaultUrl', options) url = self.get_option('vaultUrl', options)
token_file = self.get_option('vaultFile', options) token_file = self.get_option('vaultAuthTokenFile', options)
mount = self.get_option('vaultMount', options) mount = self.get_option('vaultMount', options)
path = self.get_option('vaultPath', options) path = self.get_option('vaultPath', options)
bundle = self.get_option('bundleChain', options) bundle = self.get_option('bundleChain', options)
obj_name = self.get_option('objectName', options) obj_name = self.get_option('objectName', options)
with open(token_file, 'r') as file: with open(token_file, 'r') as file:
token = file.readline() token = file.readline().rstrip('\n')
client = hvac.Client(url=url, token=token) client = hvac.Client(url=url, token=token)
if obj_name: if obj_name: