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

fixing error handling and better data formating

This commit is contained in:
alwaysjolley 2019-03-07 15:41:29 -05:00
parent a1cb8ee266
commit 752c9a086b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ class VaultDestinationPlugin(DestinationPlugin):
'name': 'vaultMount', 'name': 'vaultMount',
'type': 'str', 'type': 'str',
'required': True, 'required': True,
'validation': '^[a-zA-Z0-9]+$', 'validation': '^\S+$',
'helpMessage': 'Must be a valid Vault secrets mount name!' 'helpMessage': 'Must be a valid Vault secrets mount name!'
}, },
{ {
@ -77,11 +77,6 @@ class VaultDestinationPlugin(DestinationPlugin):
:return: :return:
""" """
cname = common_name(parse_certificate(body)) cname = common_name(parse_certificate(body))
secret = {'data': {}}
key_name = '{0}.key'.format(cname)
cert_name = '{0}.crt'.format(cname)
chain_name = '{0}.chain'.format(cname)
sans_name = '{0}.san'.format(cname)
token = current_app.config.get('VAULT_TOKEN') token = current_app.config.get('VAULT_TOKEN')
url = current_app.config.get('VAULT_URL') url = current_app.config.get('VAULT_URL')
@ -98,18 +93,19 @@ class VaultDestinationPlugin(DestinationPlugin):
path = '{0}/{1}'.format(path, cname) path = '{0}/{1}'.format(path, cname)
secret = get_secret(url, token, mount, path) secret = get_secret(url, token, mount, path)
secret['data'][cname] = {}
if bundle == 'Nginx' and cert_chain: if bundle == 'Nginx' and cert_chain:
secret['data'][cert_name] = '{0}\n{1}'.format(body, cert_chain) secret['data'][cname]['crt'] = '{0}\n{1}'.format(body, cert_chain)
elif bundle == 'Apache' and cert_chain: elif bundle == 'Apache' and cert_chain:
secret['data'][cert_name] = body secret['data'][cname]['crt'] = body
secret['data'][chain_name] = cert_chain secret['data'][cname]['chain'] = cert_chain
else: else:
secret['data'][cert_name] = body secret['data'][cname]['crt'] = body
secret['data'][key_name] = private_key secret['data'][cname]['key'] = private_key
san_list = get_san_list(body) san_list = get_san_list(body)
if isinstance(san_list, list): if isinstance(san_list, list):
secret['data'][sans_name] = san_list secret['data'][cname]['san'] = san_list
try: try:
client.secrets.kv.v1.create_or_update_secret( client.secrets.kv.v1.create_or_update_secret(
path=path, mount_point=mount, secret=secret['data']) path=path, mount_point=mount, secret=secret['data'])
@ -120,21 +116,25 @@ class VaultDestinationPlugin(DestinationPlugin):
def get_san_list(body): def get_san_list(body):
""" parse certificate for SAN names and return list, return empty list on error """ """ parse certificate for SAN names and return list, return empty list on error """
san_list = []
try: try:
byte_body = body.encode('utf-8') byte_body = body.encode('utf-8')
cert = x509.load_pem_x509_certificate(byte_body, default_backend()) cert = x509.load_pem_x509_certificate(byte_body, default_backend())
ext = cert.extensions.get_extension_for_oid(x509.oid.ExtensionOID.SUBJECT_ALTERNATIVE_NAME) ext = cert.extensions.get_extension_for_oid(x509.oid.ExtensionOID.SUBJECT_ALTERNATIVE_NAME)
return ext.value.get_values_for_type(x509.DNSName) san_list = ext.value.get_values_for_type(x509.DNSName)
except ValueError: except x509.extensions.ExtensionNotFound:
pass pass
return [] finally:
return san_list
def get_secret(url, token, mount, path): def get_secret(url, token, mount, path):
""" retreiive existing data from mount path and return dictionary """
result = {'data': {}} result = {'data': {}}
try: try:
client = hvac.Client(url=url, token=token) client = hvac.Client(url=url, token=token)
result = client.secrets.kv.v1.read_secret(path=path, mount_point=mount) result = client.secrets.kv.v1.read_secret(path=path, mount_point=mount)
except ConnectionError: #except ConnectionError:
pass # pass
return result finally:
return result