key server: misc cleanup to get it working

This commit is contained in:
Jimmy Zelinskie 2016-03-31 16:42:31 -04:00 committed by Jimmy Zelinskie
parent c0ab45d335
commit 50ad1bb6b1
2 changed files with 37 additions and 11 deletions

View file

@ -1,3 +1,4 @@
from calendar import timegm
from datetime import datetime, timedelta
from app import app
@ -32,8 +33,8 @@ def _notify_superusers(key):
'service': key.service,
'jwk': key.jwk,
'metadata': key.metadata,
'created_date': key.created_date,
'expiration_date': key.expiration_date,
'created_date': timegm(key.created_date.utctimetuple()),
'expiration_date': timegm(key.created_date.utctimetuple()),
}
superusers = User.select().where(User.username << app.config['SUPER_USERS'])
@ -136,4 +137,7 @@ def list_service_keys(service):
def get_service_key(kid, service=None):
return _list_service_keys_query(kid=kid, service=service).get()
try:
return _list_service_keys_query(kid=kid, service=service).get()
except ServiceKey.DoesNotExist:
raise ServiceKeyDoesNotExist