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

PEP8 fixes.

Browse source
This commit is contained in:
yackob03 2013-09-27 20:03:07 -04:00
parent 32581c0621
commit a0adffdc8e
4 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config.py
View file

@ -1,6 +1,7 @@
class FlaskConfig(object): class FlaskConfig(object):
SECRET_KEY = '1cb18882-6d12-440d-a4cc-b7430fb5f884' SECRET_KEY = '1cb18882-6d12-440d-a4cc-b7430fb5f884'
class MailConfig(object): class MailConfig(object):
MAIL_SERVER = 'email-smtp.us-east-1.amazonaws.com' MAIL_SERVER = 'email-smtp.us-east-1.amazonaws.com'
MAIL_USE_TLS = True MAIL_USE_TLS = True
@ -11,5 +12,6 @@ class MailConfig(object):
MAIL_FAIL_SILENTLY = False MAIL_FAIL_SILENTLY = False
TESTING = False TESTING = False
class ProductionConfig(FlaskConfig, MailConfig): class ProductionConfig(FlaskConfig, MailConfig):
pass pass

12
data/model.py
View file

@ -59,7 +59,9 @@ def get_user(username):
def get_matching_users(username_prefix): def get_matching_users(username_prefix):
return list(User.select().where(User.username ** (username_prefix + '%')).limit(10)) query = User.select().where(User.username ** (username_prefix + '%'))
return list(query.limit(10))
def verify_user(username, password): def verify_user(username, password):
try: try:
@ -94,7 +96,10 @@ def get_token(code):
def get_matching_repositories(repo_term): def get_matching_repositories(repo_term):
return list(Repository.select().where(Repository.name ** ('%' + repo_term + '%') | Repository.namespace ** ('%' + repo_term + '%') | Repository.description ** ('%' + repo_term + '%')).limit(10)) clauses = (Repository.name ** ('%' + repo_term + '%') |
Repository.namespace ** ('%' + repo_term + '%') |
Repository.description ** ('%' + repo_term + '%'))
return list(Repository.select().where(clauses).limit(10))
def change_password(user, new_password): def change_password(user, new_password):
@ -187,6 +192,7 @@ def get_repository_images(namespace_name, repository_name):
return joined.where(Repository.name == repository_name, return joined.where(Repository.name == repository_name,
Repository.namespace == namespace_name) Repository.namespace == namespace_name)
def get_tag_images(namespace_name, repository_name, tag_name): def get_tag_images(namespace_name, repository_name, tag_name):
joined = Image.select().join(RepositoryTag).join(Repository) joined = Image.select().join(RepositoryTag).join(Repository)
fetched = list(joined.where(Repository.name == repository_name, fetched = list(joined.where(Repository.name == repository_name,
@ -195,6 +201,7 @@ def get_tag_images(namespace_name, repository_name, tag_name):
return fetched return fetched
def list_repository_tags(namespace_name, repository_name): def list_repository_tags(namespace_name, repository_name):
select = RepositoryTag.select(RepositoryTag, Image) select = RepositoryTag.select(RepositoryTag, Image)
with_repo = select.join(Repository) with_repo = select.join(Repository)
@ -290,6 +297,7 @@ def set_user_repo_permission(username, namespace_name, repository_name,
role=new_role) role=new_role)
return new_perm return new_perm
def delete_user_permission(username, namespace_name, repository_name): def delete_user_permission(username, namespace_name, repository_name):
if username == namespace_name: if username == namespace_name:
raise DataModelException('Namespace owner must always be admin.') raise DataModelException('Namespace owner must always be admin.')

9
endpoints/api.py
View file

@ -64,8 +64,9 @@ def match_repos_api(prefix):
'description': repo.description, 'description': repo.description,
} }
repos = [repo_view(repo) for repo in model.get_matching_repositories(prefix) if matching = model.get_matching_repositories(prefix)
ReadRepositoryPermission(repo.namespace, repo.name).can()] repos = [repo_view(repo) for repo in matching
if ReadRepositoryPermission(repo.namespace, repo.name).can()]
response = { response = {
'repositories': repos 'repositories': repos
} }
@ -162,7 +163,8 @@ def role_view(repo_perm_obj):
} }
@app.route('/api/repository/<path:repository>/tag/<tag>/images', methods=['GET']) @app.route('/api/repository/<path:repository>/tag/<tag>/images',
methods=['GET'])
@login_required @login_required
@parse_repository_name @parse_repository_name
def list_tag_images(namespace, repository, tag): def list_tag_images(namespace, repository, tag):
@ -234,6 +236,7 @@ def change_permissions(namespace, repository, username):
abort(403) # Permission denied abort(403) # Permission denied
@app.route('/api/repository/<path:repository>/permissions/<username>', @app.route('/api/repository/<path:repository>/permissions/<username>',
methods=['DELETE']) methods=['DELETE'])
@login_required @login_required

1
util/validation.py
View file

@ -14,6 +14,7 @@ def validate_username(username):
len(username) > 1 and len(username) > 1 and
len(username) < 256) len(username) < 256)
def validate_password(password): def validate_password(password):
# No whitespace and minimum length of 8 # No whitespace and minimum length of 8
if re.search(r'\s', password): if re.search(r'\s', password):