Merge pull request #47 from kevgliss/keys

Fixing issue with a certificate with no role not being viewable
This commit is contained in:
kevgliss 2015-08-21 16:18:13 -07:00
commit 3df50f15f7
2 changed files with 7 additions and 7 deletions

View File

@ -446,14 +446,13 @@ class CertificatePrivateKey(AuthenticatedResource):
role = role_service.get_by_name(cert.owner) role = role_service.get_by_name(cert.owner)
if role: permission = ViewKeyPermission(certificate_id, getattr(role, 'name', None))
permission = ViewKeyPermission(certificate_id, role.name)
if permission.can(): if permission.can():
response = make_response(jsonify(key=cert.private_key), 200) response = make_response(jsonify(key=cert.private_key), 200)
response.headers['cache-control'] = 'private, max-age=0, no-cache, no-store' response.headers['cache-control'] = 'private, max-age=0, no-cache, no-store'
response.headers['pragma'] = 'no-cache' response.headers['pragma'] = 'no-cache'
return response return response
return dict(message='You are not authorized to view this key'), 403 return dict(message='You are not authorized to view this key'), 403

View File

@ -17,4 +17,5 @@ def get_key():
try: try:
return current_app.config.get('LEMUR_ENCRYPTION_KEY').strip() return current_app.config.get('LEMUR_ENCRYPTION_KEY').strip()
except RuntimeError: except RuntimeError:
print("No Encryption Key Found")
return '' return ''