vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

service keys: add txs and select4update

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-03-22 11:44:54 -04:00 • committed by Jimmy Zelinskie
parent 499bb16306
commit 6ecff950ab
1 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

40
data/model/service_keys.py
View file

@ -1,7 +1,7 @@
from datetime import datetime from datetime import datetime
from data.model import ServiceKeyDoesNotExist from data.model import ServiceKeyDoesNotExist, db_transaction
from data.database import ServiceKey from data.database import db_for_update, ServiceKey, ServiceKeyApproval
def _gc_expired(service): def _gc_expired(service):
ServiceKey.delete().where(ServiceKey.service == service, ServiceKey.delete().where(ServiceKey.service == service,
@ -12,11 +12,12 @@ def upsert_service_key(kid, service, jwk, expiration_date):
_gc_expired(service) _gc_expired(service)
try: try:
key = ServiceKey.select().where(ServiceKey.kid == kid).get() with db_transaction():
key.service = service key = db_for_update(ServiceKey.select().where(ServiceKey.kid == kid)).get()
key.jwk = jwk key.service = service
key.expiration_date = expiration_date key.jwk = jwk
key.save() key.expiration_date = expiration_date
key.save()
except ServiceKey.DoesNotExist: except ServiceKey.DoesNotExist:
ServiceKey.create(kid=kid, service=service, jwk=jwk, expiration_date=expiration_date) ServiceKey.create(kid=kid, service=service, jwk=jwk, expiration_date=expiration_date)
@ -24,14 +25,11 @@ def upsert_service_key(kid, service, jwk, expiration_date):
def get_service_keys(service, kid=None): def get_service_keys(service, kid=None):
_gc_expired(service) _gc_expired(service)
try: query = ServiceKey.select().where(ServiceKey.service == service,
query = ServiceKey.select().where(ServiceKey.service == service, ~(ServiceKey.approval >> None))
~(ServiceKey.approval >> None)) if kid:
if kid: query.where(ServiceKey.kid == kid)
query.where(ServiceKey.kid == kid) return query
return query
except ServiceKey.DoesNotExist:
raise ServiceKeyDoesNotExist()
def delete_service_key(service, kid): def delete_service_key(service, kid):
@ -42,3 +40,15 @@ def delete_service_key(service, kid):
ServiceKey.kid == kid).execute() ServiceKey.kid == kid).execute()
except ServiceKey.DoesNotExist: except ServiceKey.DoesNotExist:
raise ServiceKeyDoesNotExist() raise ServiceKeyDoesNotExist()
def approve_service_key(service, kid, approver, approval_type):
try:
with db_transaction():
approval = ServiceKeyApproval.create(approver=approver, approval_type=approval_type)
key = db_for_update(ServiceKey.select().where(ServiceKey.service == service,
ServiceKey.kid == kid)).get()
key.approval = approval
key.save()
except ServiceKey.DoesNotExist:
raise ServiceKeyDoesNotExist