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

data.model._basequery: audited for repo_kind usage

Browse source
This commit is contained in:
Jimmy Zelinskie 2017-03-20 19:05:25 -04:00
parent f842bc3a82
commit 074c1bc4a8
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/model/_basequery.py
View file

@ -10,7 +10,8 @@ def get_existing_repository(namespace_name, repository_name, for_update=False):
query = (Repository query = (Repository
.select(Repository, Namespace) .select(Repository, Namespace)
.join(Namespace, on=(Repository.namespace_user == Namespace.id)) .join(Namespace, on=(Repository.namespace_user == Namespace.id))
.where(Namespace.username == namespace_name, Repository.name == repository_name)) .where(Namespace.username == namespace_name,
Repository.name == repository_name))
if for_update: if for_update:
query = db_for_update(query) query = db_for_update(query)
@ -27,11 +28,14 @@ def _lookup_team_role(name):
return TeamRole.get(name=name) return TeamRole.get(name=name)
def filter_to_repos_for_user(query, username=None, namespace=None, include_public=True, def filter_to_repos_for_user(query, username=None, namespace=None, repo_kind='image',
start_id=None): include_public=True, start_id=None):
if not include_public and not username: if not include_public and not username:
return Repository.select().where(Repository.id == '-1') return Repository.select().where(Repository.id == '-1')
# Filter on the type of repository.
query = query.where(Repository.kind == Repository.kind.get_id(repo_kind))
# Add the start ID if necessary. # Add the start ID if necessary.
if start_id is not None: if start_id is not None:
query = query.where(Repository.id >= start_id) query = query.where(Repository.id >= start_id)
@ -121,5 +125,3 @@ def calculate_image_aggregate_size(ancestors_str, image_size, parent_image):
return None return None
return ancestor_size + image_size return ancestor_size + image_size