From 1a3e4e3626fcfeb34641c14dd236c7bb38542928 Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Apr 14 2017 10:32:37 +0000 Subject: Fix _get_project to get_authorized project for the new files and removing imports --- diff --git a/pagure/__init__.py b/pagure/__init__.py index ab977d1..8d1f61e 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -492,7 +492,7 @@ def set_variables(): flask.g.repo = pagure.get_authorized_project( SESSION, repo, user=username, namespace=namespace) if authenticated(): - flask.g.repo_forked = pagure.lib._get_project(SESSION, repo, user=flask.g.fas_user.username, + flask.g.repo_forked = pagure.get_authorized_project(SESSION, repo, user=flask.g.fas_user.username, namespace=namespace) if not flask.g.repo \ diff --git a/pagure/api/project.py b/pagure/api/project.py index 23e7aa2..8fff21f 100644 --- a/pagure/api/project.py +++ b/pagure/api/project.py @@ -15,7 +15,7 @@ from sqlalchemy.exc import SQLAlchemyError import pagure import pagure.exceptions import pagure.lib -from pagure import SESSION, APP, is_repo_admin, authenticated +from pagure import SESSION, APP, authenticated from pagure.api import API, api_method, APIERROR, api_login_required @@ -392,7 +392,7 @@ def api_fork_project(): username = form.username.data or None namespace = form.namespace.data.strip() or None - repo = pagure.lib._get_project( + repo = pagure.get_authorized_project( SESSION, repo, user=username, namespace=namespace) if repo is None: raise pagure.exceptions.APIError( diff --git a/pagure/hooks/files/default_hook.py b/pagure/hooks/files/default_hook.py index a91f755..6c8ad3b 100755 --- a/pagure/hooks/files/default_hook.py +++ b/pagure/hooks/files/default_hook.py @@ -38,7 +38,7 @@ def run_as_post_receive_hook(): print('user:', username) print('namespace:', namespace) - project = pagure.lib._get_project(pagure.SESSION, repo, user=username, namespace=namespace) + project = pagure.get_authorized_project(pagure.SESSION, repo, user=username, namespace=namespace) for line in sys.stdin: if pagure.APP.config.get('HOOK_DEBUG', False): diff --git a/pagure/hooks/files/fedmsg_hook.py b/pagure/hooks/files/fedmsg_hook.py index 44aa754..350e5ab 100755 --- a/pagure/hooks/files/fedmsg_hook.py +++ b/pagure/hooks/files/fedmsg_hook.py @@ -55,7 +55,7 @@ for line in sys.stdin.readlines(): project_name = pagure.lib.git.get_repo_name(abspath) username = pagure.lib.git.get_username(abspath) namespace = pagure.lib.git.get_repo_namespace(abspath) - project = pagure.lib._get_project( + project = pagure.get_authorized_project( pagure.SESSION, project_name, username, namespace=namespace) if not project: project = project_name diff --git a/pagure/hooks/files/rtd_hook.py b/pagure/hooks/files/rtd_hook.py index 7554e03..182fc26 100755 --- a/pagure/hooks/files/rtd_hook.py +++ b/pagure/hooks/files/rtd_hook.py @@ -35,7 +35,7 @@ def run_as_post_receive_hook(): print 'user: ', username print 'namespace:', namespace - repo = pagure.lib._get_project(pagure.SESSION, reponame, user=username, namespace=namespace) + repo = pagure.get_authorized_project(pagure.SESSION, reponame, user=username, namespace=namespace) if not repo: print 'Unknown repo %s of username: %s' % (reponame, username) sys.exit(1) diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 3b3d323..99c2199 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -3663,7 +3663,7 @@ def is_watching(session, user, reponame, repouser=None, namespace=None): if watcher: return watcher.watch - project = pagure.lib._get_project( + project = pagure.get_authorized_project( session, reponame, user=repouser, namespace=namespace) if not project: diff --git a/pagure/lib/git.py b/pagure/lib/git.py index da53627..fdedf19 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -411,7 +411,7 @@ def get_project_from_json( project_user = None if jsondata.get('parent'): project_user = user.username - project = pagure.lib._get_project(session, name, user=project_user, namespace=namespace) + project = pagure.get_authorized_project(session, name, user=project_user, namespace=namespace) if not project: parent = None @@ -450,7 +450,7 @@ def get_project_from_json( ) session.commit() - project = pagure.lib._get_project(session, name, user=user.username, namespace=namespace) + project = pagure.get_authorized_project(session, name, user=user.username, namespace=namespace) tags = jsondata.get('tags', None) if tags: @@ -527,7 +527,7 @@ def update_ticket_from_git( """ - repo = pagure.lib._get_project(session, reponame, user=username, namespace=namespace) + repo = pagure.get_authorized_project(session, reponame, user=username, namespace=namespace) if not repo: raise pagure.exceptions.PagureException( 'Unknown repo %s of username: %s in namespace: %s' % ( @@ -704,7 +704,7 @@ def update_request_from_git( """ - repo = pagure.lib._get_project(session, reponame, user=username, namespace=namespace) + repo = pagure.get_authorized_project(session, reponame, user=username, namespace=namespace) if not repo: raise pagure.exceptions.PagureException( 'Unknown repo %s of username: %s in namespace: %s' % ( diff --git a/pagure/lib/link.py b/pagure/lib/link.py index c56ed54..dc2c246 100644 --- a/pagure/lib/link.py +++ b/pagure/lib/link.py @@ -57,7 +57,7 @@ def get_relation(session, reponame, username, namespace, text, ''' - repo = pagure.lib._get_project( + repo = pagure.get_authorized_project( session, reponame, user=username, namespace=namespace) if not repo: return [] diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py index be86526..9566d19 100644 --- a/pagure/pfmarkdown.py +++ b/pagure/pfmarkdown.py @@ -316,7 +316,7 @@ def makeExtension(*arg, **kwargs): def _issue_exists(user, namespace, repo, idx): """ Utility method checking if a given issue exists. """ - repo_obj = pagure.lib._get_project(pagure.SESSION, name=repo, user=user, namespace=namespace) + repo_obj = pagure.get_authorized_project(pagure.SESSION, repo=repo, user=user, namespace=namespace) if not repo_obj: return False @@ -331,7 +331,7 @@ def _issue_exists(user, namespace, repo, idx): def _pr_exists(user, namespace, repo, idx): """ Utility method checking if a given PR exists. """ - repo_obj = pagure.lib._get_project(pagure.SESSION, name=repo, user=user, namespace=namespace) + repo_obj = pagure.get_authorized_project(pagure.SESSION, repo=repo, user=user, namespace=namespace) if not repo_obj: return False diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 8b14f3e..2a3ad95 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -21,8 +21,7 @@ import pagure.lib.git import pagure.forms import pagure.ui.filters from pagure import (APP, SESSION, login_required, - authenticated, is_repo_admin, - admin_session_timedout) + authenticated, admin_session_timedout) @APP.route('/browse/projects', endpoint='browse_projects') diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 9814caf..f8ed3b1 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -50,8 +50,7 @@ import pagure.forms import pagure import pagure.ui.plugins from pagure import (APP, SESSION, LOG, __get_file_in_tree, login_required, - is_repo_admin, admin_session_timedout, authenticated, - get_authorized_project) + is_repo_admin, admin_session_timedout) from pagure.lib import encoding_utils @@ -916,6 +915,7 @@ def view_tags(repo, username=None, namespace=None): @APP.route('//upload/', methods=('GET', 'POST')) +@APP.route('//upload', methods=('GET', 'POST')) @APP.route('///upload/', methods=('GET', 'POST')) @APP.route('///upload', methods=('GET', 'POST')) @APP.route('/fork///upload/', methods=('GET', 'POST'))