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

Fixing several small issues. (#341)

Browse Source 
* Fixing several small issues.

* Fixing tests.
This commit is contained in:
kevgliss
2016-06-01 11:18:00 -07:00
parent b2539b843b
commit 72e3fb5bfe
6 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lemur/authorities/schemas.py
View File

@ -23,8 +23,8 @@ class AuthorityInputSchema(LemurInputSchema):
description = fields.String()
common_name = fields.String(required=True, validate=validators.sensitive_domain)
validity_start = fields.DateTime()
validity_end = fields.DateTime()
validity_start = fields.Date()
validity_end = fields.Date()
validity_years = fields.Integer()
# certificate body fields

33
lemur/authorities/service.py
View File

@ -45,23 +45,25 @@ def mint(**kwargs):
"""
issuer = kwargs['plugin']['plugin_object']
body, chain, roles = issuer.create_authority(kwargs)
roles = create_authority_roles(roles, kwargs['owner'], kwargs['plugin']['plugin_object'].title)
return body, chain, roles
def create_authority_roles(**kwargs):
def create_authority_roles(roles, owner, plugin_title):
"""
Creates all of the necessary authority roles.
:param roles:
:param kwargs:
:return:
"""
role_objs = []
for r in kwargs['roles']:
role = role_service.create(
r['name'],
password=r['password'],
description="Auto generated role for {0}".format(kwargs['plugin']['plugin_object'].title),
username=r['username'])
for r in roles:
role = role_service.get_by_name(r['name'])
if not role:
role = role_service.create(
r['name'],
password=r['password'],
description="Auto generated role for {0}".format(plugin_title),
username=r['username'])
# the user creating the authority should be able to administer it
if role.username == 'admin':
@ -70,11 +72,11 @@ def create_authority_roles(**kwargs):
role_objs.append(role)
# create an role for the owner and assign it
owner_role = role_service.get_by_name(kwargs['owner'])
owner_role = role_service.get_by_name(owner)
if not owner_role:
owner_role = role_service.create(
kwargs['owner'],
description="Auto generated role based on owner: {0}".format(kwargs['owner'])
owner,
description="Auto generated role based on owner: {0}".format(owner)
)
role_objs.append(owner_role)
@ -96,8 +98,6 @@ def create(**kwargs):
else:
kwargs['roles'] = roles
kwargs['roles'] = create_authority_roles(**kwargs)
if kwargs['type'] == 'subca':
description = "This is the ROOT certificate for the {0} sub certificate authority the parent \
authority is {1}.".format(kwargs.get('name'), kwargs.get('parent'))
@ -162,11 +162,8 @@ def get_authority_role(ca_name):
# TODO we should pick admin ca roles for admin
return authority.roles[0]
else:
for role in g.current_user.roles:
if role.authority:
for authority in role.authorities:
if authority.name == ca_name:
return role
authority = get_by_name(ca_name)
return authority.roles[1]
def render(args):