Make images belong to one repository only. Add a description field to the repository. Fix a bug with access tokens. Fix an embarrasing bug with multiple select criteria in peewee. Update the test db.
This commit is contained in:
yackob03
parent
5caa54ffb3
commit
23cbcb2979
6 changed files with 79 additions and 67 deletions
|
|
@ -31,6 +31,7 @@ class Repository(BaseModel):
|
|||
namespace = CharField()
|
||||
name = CharField()
|
||||
visibility = ForeignKeyField(Visibility)
|
||||
description = CharField(null=True)
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
|
|
@ -66,8 +67,22 @@ class AccessToken(BaseModel):
|
|||
|
||||
|
||||
class Image(BaseModel):
|
||||
image_id = CharField(unique=True)
|
||||
# This class is intentionally denormalized. Even though images are supposed
|
||||
# to be globally unique we can't treat them as such for permissions and
|
||||
# security reasons. So rather than Repository <-> Image being many to many
|
||||
# each image now belongs to exactly one repository.
|
||||
image_id = CharField()
|
||||
checksum = CharField(null=True)
|
||||
created = DateTimeField(null=True)
|
||||
comment = CharField(null=True)
|
||||
repository = ForeignKeyField(Repository)
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
indexes = (
|
||||
# we don't really want duplicates
|
||||
(('repository', 'image_id'), True),
|
||||
)
|
||||
|
||||
|
||||
class RepositoryTag(BaseModel):
|
||||
|
|
@ -76,22 +91,9 @@ class RepositoryTag(BaseModel):
|
|||
repository = ForeignKeyField(Repository)
|
||||
|
||||
|
||||
class RepositoryImage(BaseModel):
|
||||
repository = ForeignKeyField(Repository)
|
||||
image = ForeignKeyField(Image)
|
||||
tag = CharField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
indexes = (
|
||||
# we don't really want duplicates
|
||||
(('repository', 'image', 'tag'), True),
|
||||
)
|
||||
|
||||
|
||||
def initialize_db():
|
||||
create_model_tables([User, Repository, Image, RepositoryImage, AccessToken,
|
||||
Role, RepositoryPermission, Visibility, RepositoryTag])
|
||||
create_model_tables([User, Repository, Image, AccessToken, Role,
|
||||
RepositoryPermission, Visibility, RepositoryTag])
|
||||
Role.create(name='admin')
|
||||
Role.create(name='write')
|
||||
Role.create(name='read')
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import bcrypt
|
||||
import logging
|
||||
import dateutil.parser
|
||||
|
||||
from database import *
|
||||
|
||||
|
|
@ -34,10 +35,15 @@ def verify_user(username, password):
|
|||
return None
|
||||
|
||||
|
||||
def create_access_token(user, repository):
|
||||
new_token = AccessToken.create(user=user, repository=repository)
|
||||
return new_token
|
||||
|
||||
|
||||
def verify_token(code, namespace_name, repository_name):
|
||||
joined = AccessToken.select(AccessToken, Repository).join(Repository)
|
||||
tokens = list(joined.where(AccessToken.code == code and
|
||||
Repository.namespace == namespace_name and
|
||||
tokens = list(joined.where(AccessToken.code == code,
|
||||
Repository.namespace == namespace_name,
|
||||
Repository.name == repository_name))
|
||||
if tokens:
|
||||
return tokens[0]
|
||||
|
|
@ -64,7 +70,7 @@ def get_all_repo_permissions(user):
|
|||
|
||||
def get_repository(namespace, name):
|
||||
try:
|
||||
return Repository.get(Repository.name == name and
|
||||
return Repository.get(Repository.name == name,
|
||||
Repository.namespace == namespace)
|
||||
except Repository.DoesNotExist:
|
||||
return None
|
||||
|
|
@ -88,28 +94,39 @@ def create_repository(namespace, name, owner):
|
|||
return repo
|
||||
|
||||
|
||||
def create_image(image_id):
|
||||
new_image = Image.create(image_id=image_id)
|
||||
def create_image(image_id, repository):
|
||||
new_image = Image.create(image_id=image_id, repository=repository)
|
||||
return new_image
|
||||
|
||||
|
||||
def set_image_checksum(image_id, checksum):
|
||||
fetched = Image.get(Image.image_id == image_id)
|
||||
def set_image_checksum(image_id, repository, checksum):
|
||||
fetched = Image.get(Image.image_id == image_id,
|
||||
Image.repository == repository)
|
||||
fetched.checksum = checksum
|
||||
fetched.save()
|
||||
return fetched
|
||||
|
||||
|
||||
def assign_image_repository(repository, image, tag):
|
||||
repo_image = RepositoryImage.create(repository=repository, image=image,
|
||||
tag=tag)
|
||||
return repo_image
|
||||
def set_image_metadata(image_id, namespace_name, repository_name,
|
||||
created_date_str, comment):
|
||||
joined = Image.select().join(Repository)
|
||||
image_list = list(joined.where(Repository.name == repository_name,
|
||||
Repository.namespace == namespace_name,
|
||||
Image.image_id == image_id))
|
||||
|
||||
if not image_list:
|
||||
raise RuntimeError('No image with specified id and repository')
|
||||
|
||||
fetched = image_list[0]
|
||||
fetched.created = dateutil.parser.parse(created_date_str)
|
||||
fetched.comment = comment
|
||||
fetched.save()
|
||||
return fetched
|
||||
|
||||
|
||||
def get_repository_images(namespace_name, repository_name):
|
||||
select = Image.select(Image, RepositoryImage)
|
||||
joined = select.join(RepositoryImage).join(Repository)
|
||||
return joined.where(Repository.name == repository_name and
|
||||
joined = Image.select().join(Repository)
|
||||
return joined.where(Repository.name == repository_name,
|
||||
Repository.namespace == namespace_name)
|
||||
|
||||
|
||||
|
|
@ -117,25 +134,25 @@ def list_repository_tags(namespace_name, repository_name):
|
|||
select = RepositoryTag.select(RepositoryTag, Image)
|
||||
with_repo = select.join(Repository)
|
||||
with_image = with_repo.switch(RepositoryTag).join(Image)
|
||||
return with_image.where(Repository.name == repository_name and
|
||||
return with_image.where(Repository.name == repository_name,
|
||||
Repository.namespace == namespace_name)
|
||||
|
||||
|
||||
def get_tag_image(namespace_name, repository_name, tag_name):
|
||||
joined = Image.select().join(RepositoryTag).join(Repository)
|
||||
return joined.where(Repository.name == repository_name and
|
||||
Repository.namespace == namespace_name and
|
||||
return joined.where(Repository.name == repository_name,
|
||||
Repository.namespace == namespace_name,
|
||||
RepositoryTag.name == tag_name)
|
||||
|
||||
|
||||
def create_or_update_tag(namespace_name, repository_name, tag_name,
|
||||
tag_image_id):
|
||||
repo = Repository.get(Repository.name == repository_name and
|
||||
repo = Repository.get(Repository.name == repository_name,
|
||||
Repository.namespace == namespace_name)
|
||||
image = Image.get(Image.image_id == tag_image_id)
|
||||
|
||||
try:
|
||||
tag = RepositoryTag.get(RepositoryTag.repository == repo and
|
||||
tag = RepositoryTag.get(RepositoryTag.repository == repo,
|
||||
RepositoryTag.name == tag_name)
|
||||
tag.image = image
|
||||
tag.save()
|
||||
|
|
@ -146,25 +163,20 @@ def create_or_update_tag(namespace_name, repository_name, tag_name,
|
|||
|
||||
|
||||
def delete_tag(namespace_name, repository_name, tag_name):
|
||||
repo = Repository.get(Repository.name == repository_name and
|
||||
repo = Repository.get(Repository.name == repository_name,
|
||||
Repository.namespace == namespace_name)
|
||||
tag = RepositoryTag.get(RepositoryTag.repository == repo and
|
||||
tag = RepositoryTag.get(RepositoryTag.repository == repo,
|
||||
RepositoryTag.name == tag_name)
|
||||
tag.delete_instance()
|
||||
|
||||
|
||||
def delete_all_repository_tags(namespace_name, repository_name):
|
||||
repo = Repository.get(Repository.name == repository_name and
|
||||
repo = Repository.get(Repository.name == repository_name,
|
||||
Repository.namespace == namespace_name)
|
||||
RepositoryTag.delete().where(RepositoryTag.repository == repo)
|
||||
|
||||
|
||||
def create_access_token(repository, user):
|
||||
new_token = AccessToken.create(user=user, repository=repository)
|
||||
return new_token
|
||||
|
||||
|
||||
def get_user_repo_permissions(user, repository):
|
||||
select = RepositoryPermission.select()
|
||||
return select.where(RepositoryPermission.user == user and
|
||||
return select.where(RepositoryPermission.user == user,
|
||||
RepositoryPermission.repository == repository)
|
||||
|
|
|
|||
Reference in a new issue