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

service keys: fix stale query

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-03-30 18:27:44 -04:00 committed by Jimmy Zelinskie
parent bbaeaffbdb
commit c79bb14049
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/model/service_keys.py
View file

@ -15,9 +15,9 @@ def _expired_keys_clause(service):
def _stale_unapproved_keys_clause(service): def _stale_unapproved_keys_clause(service):
return ((ServiceKey.service >> service) & return ((ServiceKey.service == service) &
(ServiceKey.approval >> None) & (ServiceKey.approval >> None) &
(ServiceKey.created_date + UNAPPROVED_TTL) >= datetime.utcnow()) (ServiceKey.created_date <= (datetime.utcnow() - UNAPPROVED_TTL)))
def _gc_expired(service): def _gc_expired(service):
@ -118,7 +118,7 @@ def _list_service_keys_query(kid=None, service=None, approved_only=False):
if service is not None: if service is not None:
query = query.where(ServiceKey.service == service) query = query.where(ServiceKey.service == service)
query = query.where(~(_expired_keys_clause(service)) & query = query.where(~(_expired_keys_clause(service)) |
~(_stale_unapproved_keys_clause(service))) ~(_stale_unapproved_keys_clause(service)))
if kid is not None: if kid is not None: