Lots of smaller fixes:
- Add the rotation_duration to the keys API - Have the key service UI use the new rotation_duration field - Fix notification deletion lookup path - Add proper support for the new notification in the UI - Only delete expired keys after 7 days (configurable) - Fix angular digest loop - Fix unit tests - Regenerate initdb
This commit is contained in:
parent
2805dad64f
commit
522cf68c5d
12 changed files with 86 additions and 20 deletions
|
@ -156,9 +156,10 @@ def __create_subtree(with_storage, repo, structure, creator_username, parent, ta
|
|||
|
||||
|
||||
def __generate_service_key(kid, name, user, timestamp, approval_type, expiration=None,
|
||||
metadata=None, service='sample_service'):
|
||||
metadata=None, service='sample_service', rotation_duration=None):
|
||||
_, key = model.service_keys.generate_service_key(service, expiration, kid=kid,
|
||||
name=name, metadata=metadata)
|
||||
name=name, metadata=metadata,
|
||||
rotation_duration=rotation_duration)
|
||||
|
||||
if approval_type is not None:
|
||||
model.service_keys.approve_service_key(key.kid, user, approval_type,
|
||||
|
@ -660,7 +661,8 @@ def populate_database(minimal=False, with_storage=False):
|
|||
|
||||
__generate_service_key('kid4', 'autorotatingkey', new_user_1, six_ago,
|
||||
ServiceKeyApprovalType.KEY_ROTATION, today + timedelta(1),
|
||||
dict(rotation_ttl=timedelta(hours=12).total_seconds()))
|
||||
rotation_duration=timedelta(hours=12).total_seconds())
|
||||
|
||||
__generate_service_key('kid5', 'key for another service', new_user_1, today,
|
||||
ServiceKeyApprovalType.SUPERUSER, today + timedelta(14),
|
||||
service='different_sample_service')
|
||||
|
|
Reference in a new issue