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

add pre-oci models for endpoints/api/__init__.py

Browse source
This commit is contained in:
Evan Cordell 2017-07-18 15:37:44 -04:00
parent a6ea16abc5
commit b8fc20c191
3 changed files with 83 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
endpoints/api/__init__.py
View file

@ -5,13 +5,12 @@ from calendar import timegm
from email.utils import formatdate
from functools import partial, wraps
from flask import Blueprint, request, session
from flask import Blueprint, request, session
from flask_restful import Resource, abort, Api, reqparse
from flask_restful.utils.cors import crossdomain
from jsonschema import validate, ValidationError
from app import app, metric_queue
from data import model
from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermission,
AdministerRepositoryPermission, UserReadPermission,
UserAdminPermission)
@ -25,6 +24,7 @@ from endpoints.decorators import check_anon_protection
from util.metrics.metricqueue import time_decorator
from util.names import parse_namespace_repository
from util.pagination import encrypt_page_token, decrypt_page_token
from __init__models_pre_oci import pre_oci_model as model
logger = logging.getLogger(__name__)
@ -212,14 +212,13 @@ class RepositoryParamResource(ApiResource):
def disallow_for_app_repositories(func):
@wraps(func)
def wrapped(self, namespace, repository, *args, **kwargs):
def wrapped(self, namespace_name, repository_name, *args, **kwargs):
# Lookup the repository with the given namespace and name and ensure it is not an application
# repository.
repo = model.repository.get_repository(namespace, repository, kind_filter='application')
if repo:
if model.is_app_repository(namespace_name, repository_name):
abort(501)
return func(self, namespace, repository, *args, **kwargs)
return func(self, namespace_name, repository_name, *args, **kwargs)
return wrapped
@ -234,7 +233,7 @@ def require_repo_permission(permission_class, scope, allow_public=False):
permission = permission_class(namespace, repository)
if (permission.can() or
(allow_public and
model.repository.repository_is_public(namespace, repository))):
model.repository_is_public(namespace, repository))):
return func(self, namespace, repository, *args, **kwargs)
raise Unauthorized()
return wrapped
@ -362,14 +361,11 @@ def log_action(kind, user_or_orgname, metadata=None, repo=None, repo_name=None):
metadata['oauth_token_application'] = oauth_token.application.name
performer = get_authenticated_user()
if repo_name:
repository = model.repository.get_repository(user_or_orgname, repo_name)
else:
repository = repo
model.log.log_action(kind, user_or_orgname, performer=performer, ip=request.remote_addr,
metadata=metadata, repository=repository)
if repo:
repo_name = repo.name
model.log_action(kind, user_or_orgname, repo_name, performer, request.remote_addr, metadata)
def define_json_response(schema_name):