From 78e5507315aa176f7dcdf602ffd1ebff01130755 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 1/25] Add a decorator: repo_method saving some of the most used object This way, the most used variables don't need to be called everytime --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 11692be..0d6a904 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -17,6 +17,7 @@ __api_version__ = '0.7' import datetime +import functools import logging import os import subprocess @@ -198,6 +199,32 @@ LOG.setLevel(APP.config.get('LOG_LEVEL', 'INFO')) APP.wsgi_app = pagure.proxy.ReverseProxied(APP.wsgi_app) +def repo_method(function): + ''' Check the info provided in the URL and return the arguments needed + for all the endpoints. + ''' + + @functools.wraps(function) + def wrapper(*args, **kwargs): + ''' Actually does the job with the arguments provided. ''' + + repo = flask.request.view_args.get('repo') + username = flask.request.view_args.get('username') + if repo: + flask.g.repo = pagure.lib.get_project( + SESSION, repo, user=username) + if flask.g.repo is None: + flask.abort(404, 'Project not found') + + flask.g.reponame = pagure.get_repo_path(flask.g.repo) + flask.g.repo_obj = pygit2.Repository(flask.g.reponame) + flask.g.repo_admin = is_repo_admin(flask.g.repo) + + return function(*args, **kwargs) + + return wrapper + + def authenticated(): ''' Utility function checking if the current user is logged in or not. ''' From 16572e734b8e14cd990eda6a9bf68d9f7c73c8cb Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 2/25] Make use of the repo_method decorator in the repo endpoint --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 3695b27..cdd76d5 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -48,7 +48,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) + is_repo_admin, admin_session_timedout, repo_method) @APP.route('/.git') @@ -65,17 +65,13 @@ def view_repo_git(repo, username=None): @APP.route('/') @APP.route('/fork///') @APP.route('/fork//') +@repo_method def view_repo(repo, username=None): """ Front page of a specific repo. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj if not repo_obj.is_empty and not repo_obj.head_is_unborn: head = repo_obj.head.shorthand @@ -168,17 +164,13 @@ def view_repo(repo, username=None): @APP.route('//branch/') @APP.route('/fork///branch/') +@repo_method def view_repo_branch(repo, branchname, username=None): ''' Returns the list of branches in the repo. ''' - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj if branchname not in repo_obj.listall_branches(): flask.abort(404, 'Branch no found') @@ -272,17 +264,13 @@ def view_repo_branch(repo, branchname, username=None): @APP.route('/fork///commits/') @APP.route('/fork///commits') @APP.route('/fork///commits/') +@repo_method def view_commits(repo, branchname=None, username=None): """ Displays the commits of the specified repo. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj if branchname and branchname not in repo_obj.listall_branches(): flask.abort(404, 'Branch no found') @@ -384,17 +372,13 @@ def view_commits(repo, branchname=None, username=None): @APP.route('//c/..') @APP.route('/fork///c/../') @APP.route('/fork///c/..') +@repo_method def compare_commits(repo, commit1, commit2, username=None): """ Compares two commits for specified repo """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj if not repo_obj.is_empty and not repo_obj.head_is_unborn: head = repo_obj.head.shorthand @@ -456,17 +440,13 @@ def compare_commits(repo, commit1, commit2, username=None): @APP.route('//blob//f/') @APP.route( '/fork///blob//f/') +@repo_method def view_file(repo, identifier, filename, username=None): """ Displays the content of a file or a tree for the specified repo. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj if repo_obj.is_empty: flask.abort(404, 'Empty repo cannot have a file') @@ -591,17 +571,13 @@ def view_file(repo, identifier, filename, username=None): defaults={'filename': None}) @APP.route( '/fork///raw//f/') +@repo_method def view_raw_file(repo, identifier, filename=None, username=None): """ Displays the raw content of a file of a commit for the specified repo. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj if repo_obj.is_empty: flask.abort(404, 'Empty repo cannot have a file') @@ -701,17 +677,23 @@ if APP.config.get('OLD_VIEW_COMMIT_ENABLED', False): @APP.route('//c/') @APP.route('/fork///c//') @APP.route('/fork///c/') +@repo_method def view_commit(repo, commitid, username=None): """ Render a commit in a repo """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + print flask.request + print dir(flask.request) + print flask.request.args + print flask.request.query_string + print flask.request.values + print flask.request.endpoint + print flask.request.json + print flask.request.url_rule + print flask.request.view_args + + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj branchname = flask.request.args.get('branch', None) @@ -751,17 +733,13 @@ def view_commit(repo, commitid, username=None): @APP.route('//c/.patch') @APP.route('/fork///c/.patch') +@repo_method def view_commit_patch(repo, commitid, username=None): """ Render a commit in a repo as patch """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj try: commit = repo_obj.get(commitid) @@ -782,17 +760,13 @@ def view_commit_patch(repo, commitid, username=None): @APP.route('/fork///tree/') @APP.route('/fork///tree') @APP.route('/fork///tree/') +@repo_method def view_tree(repo, identifier=None, username=None): """ Render the tree of the repo """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj branchname = None content = None @@ -857,13 +831,13 @@ def view_tree(repo, identifier=None, username=None): @APP.route('//forks') @APP.route('/fork///forks/') @APP.route('/fork///forks') +@repo_method def view_forks(repo, username=None): """ Presents all the forks of the project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj return flask.render_template( 'forks.html', @@ -878,16 +852,13 @@ def view_forks(repo, username=None): @APP.route('//releases') @APP.route('/fork///releases/') @APP.route('/fork///releases') +@repo_method def view_tags(repo, username=None): """ Presents all the tags of the project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') - - reponame = pagure.get_repo_path(repo) - repo_obj = pygit2.Repository(reponame) + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj tags = pagure.lib.git.get_git_tags_objects(repo) @@ -957,6 +928,7 @@ def new_release(repo, username=None): @APP.route('/fork///settings/', methods=('GET', 'POST')) @APP.route('/fork///settings', methods=('GET', 'POST')) @login_required +@repo_method def view_settings(repo, username=None): """ Presents the settings of the project. """ @@ -966,10 +938,9 @@ def view_settings(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=flask.request.url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj repo_admin = is_repo_admin(repo) if not repo_admin: @@ -977,9 +948,6 @@ def view_settings(repo, username=None): 403, 'You are not allowed to change the settings for this project') - reponame = pagure.get_repo_path(repo) - repo_obj = pygit2.Repository(reponame) - plugins = pagure.ui.plugins.get_plugin_names( APP.config.get('DISABLED_PLUGINS')) tags = pagure.lib.get_tags_of_project(SESSION, repo) @@ -1261,6 +1229,7 @@ def update_milestones(repo, username=None): @APP.route('//default/branch/', methods=['POST']) @APP.route('/fork///default/branch/', methods=['POST']) @login_required +@repo_method def change_ref_head(repo, username=None): """ Change HEAD reference """ @@ -1272,16 +1241,15 @@ def change_ref_head(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj if not is_repo_admin(repo): flask.abort( 403, 'You are not allowed to change the settings for this project') - repopath = pagure.get_repo_path(repo) - repo_obj = pygit2.Repository(repopath) + branches = repo_obj.listall_branches() form = pagure.forms.DefaultBranchForm(branches=branches) @@ -1695,6 +1663,7 @@ def regenerate_git(repo, username=None): @APP.route('/fork///token/new/', methods=('GET', 'POST')) @APP.route('/fork///token/new', methods=('GET', 'POST')) @login_required +@repo_method def add_token(repo, username=None): """ Add a token to a specified project. """ @@ -1704,13 +1673,9 @@ def add_token(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=flask.request.url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - repo_admin = is_repo_admin(repo) - if not repo_admin: + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1742,7 +1707,6 @@ def add_token(repo, username=None): select='settings', form=form, acls=acls, - repo_admin=repo_admin, username=username, repo=repo, ) @@ -1752,6 +1716,7 @@ def add_token(repo, username=None): @APP.route('/fork///token/revoke/', methods=['POST']) @login_required +@repo_method def revoke_api_token(repo, token_id, username=None): """ Revokie a token to a specified project. """ @@ -1762,12 +1727,9 @@ def revoke_api_token(repo, token_id, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1806,15 +1768,15 @@ def revoke_api_token(repo, token_id, username=None): '/fork///edit//f/', methods=('GET', 'POST')) @login_required +@repo_method def edit_file(repo, branchname, filename, username=None): """ Edit a file online. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1822,10 +1784,6 @@ def edit_file(repo, branchname, filename, username=None): user = pagure.lib.search_user( SESSION, username=flask.g.fas_user.username) - reponame = pagure.get_repo_path(repo) - - repo_obj = pygit2.Repository(reponame) - if repo_obj.is_empty: flask.abort(404, 'Empty repo cannot have a file') @@ -1894,15 +1852,15 @@ def edit_file(repo, branchname, filename, username=None): @APP.route('/fork///b//delete', methods=['POST']) @login_required +@repo_method def delete_branch(repo, branchname, username=None): """ Delete the branch of a project. """ - repo_obj = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo_obj: - flask.abort(404, 'Project not found') + repo = flask.g.repo + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj - if not is_repo_admin(repo_obj): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to delete branch for this project') @@ -1910,14 +1868,11 @@ def delete_branch(repo, branchname, username=None): if branchname == 'master': flask.abort(403, 'You are not allowed to delete the master branch') - reponame = pagure.get_repo_path(repo_obj) - repo_git = pygit2.Repository(reponame) - - if branchname not in repo_git.listall_branches(): + if branchname not in repo_obj.listall_branches(): flask.abort(404, 'Branch no found') try: - branch = repo_git.lookup_branch(branchname) + branch = repo_obj.lookup_branch(branchname) branch.delete() flask.flash('Branch `%s` deleted' % branchname) except pygit2.GitError as err: @@ -1925,7 +1880,7 @@ def delete_branch(repo, branchname, username=None): flask.flash('Could not delete `%s`' % branchname, 'error') return flask.redirect( - flask.url_for('view_repo', repo=repo, username=username)) + flask.url_for('view_repo', repo=repo.name, username=username)) @APP.route('/docs//') @@ -1974,9 +1929,9 @@ def view_project_activity(repo): @APP.route('/watch//settings/', methods=['POST']) -@APP.route('/watch/fork///settings/', methods=['POST']) +@APP.route('/watch/fork///settings/', methods=['POST']) @login_required -def watch_repo(repo, watch, user=None): +def watch_repo(repo, watch, username=None): """ Marked for watching or Unwatching """ return_point = flask.url_for('index') @@ -1990,19 +1945,17 @@ def watch_repo(repo, watch, user=None): if str(watch) not in ['0', '1']: flask.abort(400) - username = flask.g.fas_user.username - repo_obj = pagure.lib.get_project(SESSION, repo) - if user is not None: - repo_obj = pagure.lib.get_project(SESSION, repo, user) + repo_obj = pagure.lib.get_project(SESSION, repo, user=username) if not repo_obj: flask.abort(404, 'Project not found') try: msg = pagure.lib.update_watch_status( - SESSION, repo_obj, - username, watch - ) + SESSION, + repo_obj, + flask.g.fas_user.username, + watch) SESSION.commit() flask.flash(msg) except pagure.exceptions.PagureException as msg: From ae3cda3343a78767e6079304998eca64fbb6571a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 3/25] Adjust the tests for the use of the repo_method decorator --- diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 0efa5d7..0c1bda9 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -2560,6 +2560,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE, bare=True) # No a repo admin output = self.app.get('/test/edit/foo/f/sources') @@ -2568,12 +2569,7 @@ index 0000000..fb7093d user.username = 'pingou' with tests.user_set(pagure.APP, user): - # No associated git repo - output = self.app.get('/test/edit/foo/f/sources') - self.assertEqual(output.status_code, 404) - - tests.create_projects_git(tests.HERE, bare=True) - + # No such file output = self.app.get('/test/edit/foo/f/sources') self.assertEqual(output.status_code, 404) @@ -2704,7 +2700,7 @@ index 0000000..fb7093d user = tests.FakeUser() with tests.user_set(pagure.APP, user): output = self.app.post('/foo/default/branch/') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) ast.return_value = False @@ -2712,13 +2708,13 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + repos = tests.create_projects_git(tests.HERE) output = self.app.post('/test/default/branch/') self.assertEqual(output.status_code, 403) user.username = 'pingou' with tests.user_set(pagure.APP, user): - repo = tests.create_projects_git(tests.HERE) output = self.app.post('/test/default/branch/', follow_redirects=True) # without git branch self.assertEqual(output.status_code, 200) @@ -2731,7 +2727,7 @@ index 0000000..fb7093d csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] - repo_obj = pygit2.Repository(repo[0]) + repo_obj = pygit2.Repository(repos[0]) tree = repo_obj.index.write_tree() author = pygit2.Signature( 'Alice Author', 'alice@authors.tld') @@ -2858,6 +2854,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE, bare=True) output = self.app.get('/test/token/new/') self.assertEqual(output.status_code, 403) @@ -2889,15 +2886,6 @@ index 0000000..fb7093d self.assertIn('Create a new token', output.data) data = {'csrf_token': csrf_token, 'acls': ['issue_create']} - output = self.app.post( - '/test/token/new/', data=data, follow_redirects=True) - self.assertEqual(output.status_code, 404) - self.assertIn( - '\n Token created', - output.data) - self.assertIn('

No git repo found

', output.data) - - repo = tests.create_projects_git(tests.HERE) # Upload successful data = {'csrf_token': csrf_token, 'acls': ['issue_create']} @@ -2927,6 +2915,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE, bare=True) output = self.app.post('/test/token/revoke/123') self.assertEqual(output.status_code, 403) @@ -2957,7 +2946,6 @@ index 0000000..fb7093d self.assertIn('

Token not found

', output.data) # Create a token to revoke - repo = tests.create_projects_git(tests.HERE) data = {'csrf_token': csrf_token, 'acls': ['issue_create']} output = self.app.post( '/test/token/new/', data=data, follow_redirects=True) @@ -2999,6 +2987,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 302) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE, bare=True) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -3017,8 +3006,6 @@ index 0000000..fb7093d '

You are not allowed to delete the master branch

', output.data) - tests.create_projects_git(tests.HERE, bare=True) - output = self.app.post('/test/b/bar/delete') self.assertEqual(output.status_code, 404) self.assertIn('

Branch no found

', output.data) From 3119c6b72657c09c917342e676327e1f161ed477 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 4/25] Drop setting repo_admin in most endpoints --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index cdd76d5..9b6d249 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -157,7 +157,6 @@ def view_repo(repo, username=None): last_commits=last_commits, tree=tree, diff_commits=diff_commits, - repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), ) @@ -253,7 +252,6 @@ def view_repo_branch(repo, branchname, username=None): safe=safe, readme=readme, diff_commits=diff_commits, - repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), ) @@ -363,7 +361,6 @@ def view_commits(repo, branchname=None, username=None): number_of_commits=n_commits, page=page, total_page=total_page, - repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), ) @@ -433,7 +430,6 @@ def compare_commits(repo, commit1, commit2, username=None): diff=diff, diff_commits=diff_commits, branches=sorted(repo_obj.listall_branches()), - repo_admin=is_repo_admin(repo), ) @@ -554,7 +550,6 @@ def view_file(repo, identifier, filename, username=None): filename=filename, content=content, output_type=output_type, - repo_admin=is_repo_admin(repo), readme=readme, readme_ext=readme_ext, safe=safe, @@ -723,7 +718,6 @@ def view_commit(repo, commitid, username=None): repo=repo, branchname=branchname, username=username, - repo_admin=is_repo_admin(repo), commitid=commitid, commit=commit, diff=diff, @@ -820,7 +814,6 @@ def view_tree(repo, identifier=None, username=None): filename='', content=content, output_type=output_type, - repo_admin=is_repo_admin(repo), readme=readme, readme_ext=readme_ext, safe=safe, @@ -844,7 +837,6 @@ def view_forks(repo, username=None): select='forks', username=username, repo=repo, - repo_admin=is_repo_admin(repo), ) @@ -868,7 +860,6 @@ def view_tags(repo, username=None): username=username, repo=repo, tags=tags, - repo_admin=is_repo_admin(repo), repo_obj=repo_obj, ) @@ -942,8 +933,7 @@ def view_settings(repo, username=None): reponame = flask.g.reponame repo_obj = flask.g.repo_obj - repo_admin = is_repo_admin(repo) - if not repo_admin: + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1001,7 +991,6 @@ def view_settings(repo, username=None): branches_form=branches_form, tags=tags, plugins=plugins, - repo_admin=repo_admin, branchname=branchname, ) @@ -1245,7 +1234,7 @@ def change_ref_head(repo, username=None): reponame = flask.g.reponame repo_obj = flask.g.repo_obj - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1270,6 +1259,7 @@ def change_ref_head(repo, username=None): @APP.route('//delete', methods=['POST']) @APP.route('/fork///delete', methods=['POST']) @login_required +@repo_method def delete_repo(repo, username=None): """ Delete the present project. """ @@ -1283,12 +1273,9 @@ def delete_repo(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1329,6 +1316,7 @@ def delete_repo(repo, username=None): @APP.route('//hook_token', methods=['POST']) @APP.route('/fork///hook_token', methods=['POST']) @login_required +@repo_method def new_repo_hook_token(repo, username=None): """ Re-generate a hook token for the present project. """ @@ -1342,12 +1330,9 @@ def new_repo_hook_token(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1373,6 +1358,7 @@ def new_repo_hook_token(repo, username=None): @APP.route('/fork///dropuser/', methods=['POST']) @login_required +@repo_method def remove_user(repo, userid, username=None): """ Remove the specified user from the project. """ @@ -1387,12 +1373,9 @@ def remove_user(repo, userid, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the users for this project') @@ -1432,6 +1415,7 @@ def remove_user(repo, userid, username=None): @APP.route('/fork///adduser/', methods=('GET', 'POST')) @APP.route('/fork///adduser', methods=('GET', 'POST')) @login_required +@repo_method def add_user(repo, username=None): """ Add the specified user from the project. """ @@ -1446,12 +1430,9 @@ def add_user(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=flask.request.url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to add users to this project') @@ -1492,6 +1473,7 @@ def add_user(repo, username=None): @APP.route( '/fork///dropgroup/', methods=['POST']) @login_required +@repo_method def remove_group_project(repo, groupid, username=None): """ Remove the specified group from the project. """ @@ -1507,12 +1489,9 @@ def remove_group_project(repo, groupid, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the users for this project') @@ -1552,6 +1531,7 @@ def remove_group_project(repo, groupid, username=None): @APP.route('/fork///addgroup/', methods=('GET', 'POST')) @APP.route('/fork///addgroup', methods=('GET', 'POST')) @login_required +@repo_method def add_group_project(repo, username=None): """ Add the specified group from the project. """ @@ -1566,12 +1546,9 @@ def add_group_project(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=flask.request.url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to add groups to this project') From 319056e6bc95fbaf8d45a47bea072ff0326f7b04 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 5/25] Start using @repo_method in the fork controller --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 6845a86..4023fdc 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -30,7 +30,7 @@ import pagure.lib import pagure.lib.git import pagure.forms from pagure import (APP, SESSION, LOG, login_required, is_repo_admin, - __get_file_in_tree) + __get_file_in_tree, repo_method) @@ -133,6 +133,7 @@ def _get_pr_info(repo_obj, orig_repo, branch_from, branch_to): @APP.route('//pull-requests') @APP.route('/fork///pull-requests/') @APP.route('/fork///pull-requests') +@repo_method def request_pulls(repo, username=None): """ Request pulling the changes from the fork into the project. """ @@ -140,10 +141,7 @@ def request_pulls(repo, username=None): assignee = flask.request.args.get('assignee', None) author = flask.request.args.get('author', None) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -198,7 +196,6 @@ def request_pulls(repo, username=None): status=status, assignee=assignee, author=author, - repo_admin=is_repo_admin(repo), form=pagure.forms.ConfirmationForm(), head=head, ) @@ -208,14 +205,12 @@ def request_pulls(repo, username=None): @APP.route('//pull-request/') @APP.route('/fork///pull-request//') @APP.route('/fork///pull-request/') +@repo_method def request_pull(repo, requestid, username=None): """ Request pulling the changes from the fork into the project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -286,7 +281,6 @@ def request_pull(repo, requestid, username=None): username=username, repo_obj=repo_obj, pull_request=request, - repo_admin=is_repo_admin(request.project), diff_commits=diff_commits, diff=diff, mergeform=form, @@ -295,13 +289,11 @@ def request_pull(repo, requestid, username=None): @APP.route('//pull-request/.patch') @APP.route('/fork///pull-request/.patch') +@repo_method def request_pull_patch(repo, requestid, username=None): """ Returns the commits from the specified pull-request as patches. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -372,14 +364,12 @@ def request_pull_patch(repo, requestid, username=None): @APP.route('/fork///pull-request//edit', methods=('GET', 'POST')) @login_required +@repo_method def request_pull_edit(repo, requestid, username=None): """ Edit the title of a pull-request. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -437,15 +427,13 @@ def request_pull_edit(repo, requestid, username=None): @APP.route('/fork///pull-request//comment/' '//', methods=('GET', 'POST')) @login_required +@repo_method def pull_request_add_comment( repo, requestid, commit=None, filename=None, row=None, username=None): """ Add a comment to a commit in a pull-request. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -520,13 +508,11 @@ def pull_request_add_comment( '/fork///pull-request//comment/drop', methods=['POST']) @login_required +@repo_method def pull_request_drop_comment(repo, requestid, username=None): """ Delete a comment of a pull-request. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -585,15 +571,13 @@ def pull_request_drop_comment(repo, requestid, username=None): '/fork///pull-request//comment' '//edit', methods=('GET', 'POST')) @login_required +@repo_method def pull_request_edit_comment(repo, requestid, commentid, username=None): """Edit comment of a pull request """ is_js = flask.request.args.get('js', False) - project = pagure.lib.get_project(SESSION, repo, user=username) - - if not project: - flask.abort(404, 'Project not found') + project = flask.g.repo if not project.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -666,6 +650,7 @@ def pull_request_edit_comment(repo, requestid, commentid, username=None): @APP.route('/fork///pull-request//merge', methods=['POST']) @login_required +@repo_method def merge_request_pull(repo, requestid, username=None): """ Request pulling the changes from the fork into the project. """ @@ -676,10 +661,7 @@ def merge_request_pull(repo, requestid, username=None): return flask.redirect(flask.url_for( 'request_pull', repo=repo, requestid=requestid, username=username)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -741,28 +723,27 @@ def merge_request_pull(repo, requestid, username=None): @APP.route('/fork///pull-request/cancel/', methods=['POST']) @login_required +@repo_method def cancel_request_pull(repo, requestid, username=None): """ Cancel request pulling request. """ + reponame=repo form = pagure.forms.ConfirmationForm() if form.validate_on_submit(): - repo_obj = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo_obj: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not repo_obj.settings.get('pull_requests', True): + if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') request = pagure.lib.search_pull_requests( - SESSION, project_id=repo_obj.id, requestid=requestid) + SESSION, project_id=repo.id, requestid=requestid) if not request: flask.abort(404, 'Pull-request not found') - if not is_repo_admin(repo_obj) \ + if not is_repo_admin(repo) \ and not flask.g.fas_user.username == request.user.username: flask.abort( 403, @@ -784,7 +765,7 @@ def cancel_request_pull(repo, requestid, username=None): else: flask.flash('Invalid input submitted', 'error') - return flask.redirect(flask.url_for('view_repo', repo=repo)) + return flask.redirect(flask.url_for('view_repo', repo=reponame)) @APP.route( @@ -793,12 +774,10 @@ def cancel_request_pull(repo, requestid, username=None): '/fork///pull-request//assign', methods=['POST']) @login_required +@repo_method def set_assignee_requests(repo, requestid, username=None): ''' Assign a pull-request. ''' - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-request allowed on this project') @@ -847,18 +826,16 @@ def set_assignee_requests(repo, requestid, username=None): @APP.route('/do_fork/', methods=['POST']) @APP.route('/do_fork/fork//', methods=['POST']) @login_required +@repo_method def fork_project(repo, username=None): """ Fork the project specified into the user's namespace """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = flask.g.repo form = pagure.forms.ConfirmationForm() if not form.validate_on_submit(): flask.abort(400) - if repo is None: - flask.abort(404) - if pagure.lib.get_project( SESSION, repo.name, user=flask.g.fas_user.username): flask.flash('You had already forked this project') @@ -904,14 +881,13 @@ def fork_project(repo, username=None): @APP.route( '/fork///diff/..', methods=('GET', 'POST')) +@repo_method def new_request_pull(repo, branch_to, branch_from, username=None): """ Request pulling the changes from the fork into the project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) branch_to = flask.request.values.get('branch_to', branch_to) - if not repo: - flask.abort(404) + repo = flask.g.repo parent = repo if repo.parent: @@ -1040,14 +1016,13 @@ def new_request_pull(repo, branch_to, branch_from, username=None): @APP.route( '/fork///diff/remote', methods=('GET', 'POST')) @login_required +@repo_method def new_remote_request_pull(repo, username=None): """ Request pulling the changes from a remote fork into the project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) confirm = flask.request.values.get('confirm', False) - if not repo: - flask.abort(404) + repo = flask.g.repo if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-request allowed on this project') @@ -1182,18 +1157,16 @@ def new_remote_request_pull(repo, username=None): '/fork_edit/fork///edit//' 'f/', methods=['POST']) @login_required +@repo_method def fork_edit_file(repo, branchname, filename, username=None): """ Fork the project specified and open the specific file to edit """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = flask.g.repo form = pagure.forms.ConfirmationForm() if not form.validate_on_submit(): flask.abort(400) - if repo is None: - flask.abort(404) - if pagure.lib.get_project( SESSION, repo.name, user=flask.g.fas_user.username): flask.flash('You had already forked this project') From 068e0f0e5eccdb2fbcd27deca8c2a05344b5810f Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 6/25] Rely on flask.g.repo_admin in the templates since we set it in @repo_method --- diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 9ab7e36..35863c9 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -9,7 +9,7 @@
- {% if repo_admin and branch != head %} + {% if g.repo_admin and branch != head %}
SSH
@@ -177,7 +177,7 @@ git push -u origin master
{% endif %} - {% if authenticated and repo_admin %} + {% if authenticated and g.repo_admin %} {% if config.get('ENABLE_TICKETS', True) and repo.settings.get('issue_tracker', True) %}
Issues GIT URLs
@@ -266,7 +266,7 @@ $(function() { } }); - {% if authenticated and repo_admin %} + {% if authenticated and g.repo_admin %} $.ajax({ url: '{{ url_for("internal_ns.get_pull_request_ready_branch") }}' , type: 'POST', diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index de13543..2007267 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -156,7 +156,7 @@ Issues  - {{ repo.open_tickets if repo_admin else repo.open_tickets_public }} + {{ repo.open_tickets if g.repo_admin else repo.open_tickets_public }} @@ -195,7 +195,7 @@ {% endif %} {% if authenticated %} - {% if repo_admin %} + {% if g.repo_admin %}
  • Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 7/25] Simply the repo_method method --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 0d6a904..047f606 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -216,7 +216,7 @@ def repo_method(function): if flask.g.repo is None: flask.abort(404, 'Project not found') - flask.g.reponame = pagure.get_repo_path(flask.g.repo) + flask.g.reponame = get_repo_path(flask.g.repo) flask.g.repo_obj = pygit2.Repository(flask.g.reponame) flask.g.repo_admin = is_repo_admin(flask.g.repo) @@ -523,7 +523,6 @@ def get_repo_path(repo): Repository object from the DB. """ repopath = os.path.join(APP.config['GIT_FOLDER'], repo.path) - if not os.path.exists(repopath): flask.abort(404, 'No git repo found') From 72ed6b3f4d9e389338b1939305c6e854bbadf9fd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 8/25] Adjust unit-tests for the @repo_method decorator --- diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py index effabc7..05efda1 100644 --- a/tests/test_pagure_flask_internal.py +++ b/tests/test_pagure_flask_internal.py @@ -40,6 +40,7 @@ class PagureFlaskInternaltests(tests.Modeltests): pagure.SESSION = self.session pagure.internal.SESSION = self.session pagure.ui.repo.SESSION = self.session + pagure.ui.filters.SESSION = self.session pagure.APP.config['GIT_FOLDER'] = tests.HERE pagure.APP.config['FORK_FOLDER'] = os.path.join( @@ -815,6 +816,7 @@ class PagureFlaskInternaltests(tests.Modeltests): def test_get_branches_of_commit(self): ''' Test the get_branches_of_commit from the internal API. ''' tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser() user.username = 'pingou' @@ -868,8 +870,17 @@ class PagureFlaskInternaltests(tests.Modeltests): ) # Request is fine, but git repo doesn't exist + item = pagure.lib.model.Project( + user_id=1, # pingou + name='test20', + description='test project #20', + hook_token='aaabbbhhh', + ) + self.session.add(item) + self.session.commit() + data = { - 'repo': 'test', + 'repo': 'test20', 'commit_id': 'foo', 'csrf_token': csrf_token, } @@ -886,9 +897,8 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a git repo to play with gitrepo = os.path.join(tests.HERE, 'test.git') - self.assertFalse(os.path.exists(gitrepo)) - os.makedirs(gitrepo) - repo = pygit2.init_repository(gitrepo) + self.assertTrue(os.path.exists(gitrepo)) + repo = pygit2.Repository(gitrepo) # Create a file in that git repo with open(os.path.join(gitrepo, 'sources'), 'w') as stream: diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 0c1bda9..42d3886 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -71,6 +71,8 @@ class PagureFlaskRepotests(tests.Modeltests): user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + output = self.app.get('/test/adduser') self.assertEqual(output.status_code, 404) @@ -117,6 +119,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) output = self.app.get('/test/adduser') self.assertEqual(output.status_code, 403) @@ -165,7 +168,6 @@ class PagureFlaskRepotests(tests.Modeltests): 'found', output.data) data['user'] = 'foo' - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/adduser', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -207,6 +209,8 @@ class PagureFlaskRepotests(tests.Modeltests): #just get the csrf token pagure.APP.config['ENABLE_USER_MNGT'] = True tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + output = self.app.get('/test/addgroup') csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -224,7 +228,6 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) data['group'] = 'foo' - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/addgroup', data=data, follow_redirects=True) self.assertEqual(output.status_code, 404) @@ -246,6 +249,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) output = self.app.get('/test/addgroup') self.assertEqual(output.status_code, 403) @@ -307,7 +311,6 @@ class PagureFlaskRepotests(tests.Modeltests): output.data) data['group'] = 'foo' - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/addgroup', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -331,6 +334,7 @@ class PagureFlaskRepotests(tests.Modeltests): with tests.user_set(pagure.APP, user): tests.create_projects(self.session) tests.create_projects_git(tests.HERE) + output = self.app.post('/test/settings') csrf_token = output.data.split( @@ -379,6 +383,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) output = self.app.post('/test/dropuser/1') self.assertEqual(output.status_code, 403) @@ -390,7 +395,6 @@ class PagureFlaskRepotests(tests.Modeltests): user.username = 'pingou' with tests.user_set(pagure.APP, user): - tests.create_projects_git(tests.HERE) output = self.app.post('/test/settings') csrf_token = output.data.split( @@ -518,6 +522,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) output = self.app.post('/test/dropgroup/1') self.assertEqual(output.status_code, 403) @@ -529,7 +534,6 @@ class PagureFlaskRepotests(tests.Modeltests): user.username = 'pingou' with tests.user_set(pagure.APP, user): - tests.create_projects_git(tests.HERE) output = self.app.post('/test/settings') csrf_token = output.data.split( @@ -2132,18 +2136,21 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + #tests.create_projects_git(tests.HERE) output = self.app.post('/test/delete') # No git repo associated - self.assertEqual(output.status_code, 403) + self.assertEqual(output.status_code, 404) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): + tests.create_projects_git(tests.HERE) + ast.return_value = True output = self.app.post('/test/delete') self.assertEqual(output.status_code, 302) - ast.return_value = False + output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( @@ -2166,6 +2173,7 @@ index 0000000..fb7093d self.session.add(item) self.session.commit() tests.create_projects_git(tests.HERE) + output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertTrue( @@ -2372,6 +2380,7 @@ index 0000000..fb7093d """ Test the new_repo_hook_token endpoint. """ ast.return_value = False tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) repo = pagure.lib.get_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') @@ -2413,7 +2422,6 @@ index 0000000..fb7093d repo = pagure.lib.get_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/hook_token', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) From 63fe8a64f797861ff28a90dc00d8d7de9075ca64 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 9/25] Put the list of branches in @repo_method --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 047f606..3a629da 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -219,6 +219,7 @@ def repo_method(function): flask.g.reponame = get_repo_path(flask.g.repo) flask.g.repo_obj = pygit2.Repository(flask.g.reponame) flask.g.repo_admin = is_repo_admin(flask.g.repo) + flask.g.branches = sorted(flask.g.repo_obj.listall_branches()) return function(*args, **kwargs) From 78c393638f6f6e73b05bd460efb5b9ce92ff6a99 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 10/25] Use flask.g.branches in the templates instead of the one provided --- diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html index 3bc23b7..cb9f6af 100644 --- a/pagure/templates/commits.html +++ b/pagure/templates/commits.html @@ -37,7 +37,7 @@ {{ branchname }}
    - {% for branch in branches %} + {% for branch in g.branches %} {{ branch }} diff --git a/pagure/templates/edit_file.html b/pagure/templates/edit_file.html index bd8458d..6b46ac1 100644 --- a/pagure/templates/edit_file.html +++ b/pagure/templates/edit_file.html @@ -58,7 +58,7 @@
    {% if branch_to %}{% endif %} - {% for branch in branches |reverse %} + {% for branch in g.branches |reverse %} {% if not branch_to or branch != branch_to %} {% endif %} diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html index 35863c9..12d9b88 100644 --- a/pagure/templates/repo_info.html +++ b/pagure/templates/repo_info.html @@ -100,7 +100,7 @@ git push -u origin master
    {% endif %} - {% for branch in branches if branch != head%} + {% for branch in g.branches if branch != head%}
    From c8157c5afd45249deb3f338523584d50fc36c581 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 11/25] Drop a bunch of decodding code and specifying all the branches to the templates --- diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 9b6d249..12cf37c 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -152,7 +152,6 @@ def view_repo(repo, username=None): readme=readme, safe=safe, origin='view_repo', - branches=sorted(repo_obj.listall_branches()), branchname=branchname, last_commits=last_commits, tree=tree, @@ -244,7 +243,6 @@ def view_repo_branch(repo, branchname, username=None): repo=repo, head=head, username=username, - branches=sorted(repo_obj.listall_branches()), branchname=branchname, origin='view_repo_branch', last_commits=last_commits, @@ -353,7 +351,6 @@ def view_commits(repo, branchname=None, username=None): repo=repo, username=username, head=head, - branches=sorted(repo_obj.listall_branches()), branchname=branchname, last_commits=last_commits, diff_commits=diff_commits, @@ -429,7 +426,6 @@ def compare_commits(repo, commit1, commit2, username=None): commit2=commit2, diff=diff, diff_commits=diff_commits, - branches=sorted(repo_obj.listall_branches()), ) @@ -545,7 +541,6 @@ def view_file(repo, identifier, filename, username=None): repo=repo, origin='view_file', username=username, - branches=sorted(repo_obj.listall_branches()), branchname=branchname, filename=filename, content=content, @@ -676,16 +671,6 @@ if APP.config.get('OLD_VIEW_COMMIT_ENABLED', False): def view_commit(repo, commitid, username=None): """ Render a commit in a repo """ - print flask.request - print dir(flask.request) - print flask.request.args - print flask.request.query_string - print flask.request.values - print flask.request.endpoint - print flask.request.json - print flask.request.url_rule - print flask.request.view_args - repo = flask.g.repo reponame = flask.g.reponame repo_obj = flask.g.repo_obj @@ -810,7 +795,6 @@ def view_tree(repo, identifier=None, username=None): repo=repo, username=username, branchname=branchname, - branches=sorted(repo_obj.listall_branches()), filename='', content=content, output_type=output_type, @@ -1821,7 +1805,6 @@ def edit_file(repo, branchname, filename, username=None): filename=filename, form=form, user=user, - branches=repo_obj.listall_branches(), ) From c57fc571f859cf3c97515370b930945978fa52a4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 12/25] Explain a little more what's happening in the @repo_method --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 3a629da..33a0949 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -208,8 +208,11 @@ def repo_method(function): def wrapper(*args, **kwargs): ''' Actually does the job with the arguments provided. ''' + # Check if there is a `repo` and an `username` variable in the URL + # path repo = flask.request.view_args.get('repo') username = flask.request.view_args.get('username') + # If there isn't a `repo` in the URL path, just don't do anything if repo: flask.g.repo = pagure.lib.get_project( SESSION, repo, user=username) From 73489252b3199791c1c645ccfc3654353d3f72f6 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 13/25] Drop the @repo_method decorator and use an @app.before_request instead This will allow having the information available for each and every endpoint without having to change them --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 33a0949..513c034 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -17,7 +17,6 @@ __api_version__ = '0.7' import datetime -import functools import logging import os import subprocess @@ -199,36 +198,6 @@ LOG.setLevel(APP.config.get('LOG_LEVEL', 'INFO')) APP.wsgi_app = pagure.proxy.ReverseProxied(APP.wsgi_app) -def repo_method(function): - ''' Check the info provided in the URL and return the arguments needed - for all the endpoints. - ''' - - @functools.wraps(function) - def wrapper(*args, **kwargs): - ''' Actually does the job with the arguments provided. ''' - - # Check if there is a `repo` and an `username` variable in the URL - # path - repo = flask.request.view_args.get('repo') - username = flask.request.view_args.get('username') - # If there isn't a `repo` in the URL path, just don't do anything - if repo: - flask.g.repo = pagure.lib.get_project( - SESSION, repo, user=username) - if flask.g.repo is None: - flask.abort(404, 'Project not found') - - flask.g.reponame = get_repo_path(flask.g.repo) - flask.g.repo_obj = pygit2.Repository(flask.g.reponame) - flask.g.repo_admin = is_repo_admin(flask.g.repo) - flask.g.branches = sorted(flask.g.repo_obj.listall_branches()) - - return function(*args, **kwargs) - - return wrapper - - def authenticated(): ''' Utility function checking if the current user is logged in or not. ''' @@ -408,6 +377,36 @@ def set_session(): flask.session.permanent = True +@APP.before_request +def set_variables(): + """ This method retrieve the repo and username set in the URLs and + provide some of the variables that are most often used. + """ + + if flask.request.blueprint == 'api_ns': + return + + # Retrieve the variables in the URL + args = flask.request.view_args or {} + # Check if there is a `repo` and an `username` + repo = args.get('repo') + username = args.get('username') + + # If there isn't a `repo` in the URL path, or if there is but the + # endpoint called is part of the API, just don't do anything + if repo: + flask.g.repo = pagure.lib.get_project( + SESSION, repo, user=username) + + if flask.g.repo is None: + flask.abort(404, 'Project not found') + + flask.g.reponame = get_repo_path(flask.g.repo) + flask.g.repo_obj = pygit2.Repository(flask.g.reponame) + flask.g.repo_admin = is_repo_admin(flask.g.repo) + flask.g.branches = sorted(flask.g.repo_obj.listall_branches()) + + @APP.errorhandler(404) def not_found(error): """404 Not Found page""" From 6f4d1680411ba4507cddf0547ab9f7ca77659b81 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 14/25] Drop the @repo_method decorator --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 4023fdc..c061145 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -30,7 +30,7 @@ import pagure.lib import pagure.lib.git import pagure.forms from pagure import (APP, SESSION, LOG, login_required, is_repo_admin, - __get_file_in_tree, repo_method) + __get_file_in_tree) @@ -133,7 +133,6 @@ def _get_pr_info(repo_obj, orig_repo, branch_from, branch_to): @APP.route('//pull-requests') @APP.route('/fork///pull-requests/') @APP.route('/fork///pull-requests') -@repo_method def request_pulls(repo, username=None): """ Request pulling the changes from the fork into the project. """ @@ -205,7 +204,6 @@ def request_pulls(repo, username=None): @APP.route('//pull-request/') @APP.route('/fork///pull-request//') @APP.route('/fork///pull-request/') -@repo_method def request_pull(repo, requestid, username=None): """ Request pulling the changes from the fork into the project. """ @@ -289,7 +287,6 @@ def request_pull(repo, requestid, username=None): @APP.route('//pull-request/.patch') @APP.route('/fork///pull-request/.patch') -@repo_method def request_pull_patch(repo, requestid, username=None): """ Returns the commits from the specified pull-request as patches. """ @@ -364,7 +361,6 @@ def request_pull_patch(repo, requestid, username=None): @APP.route('/fork///pull-request//edit', methods=('GET', 'POST')) @login_required -@repo_method def request_pull_edit(repo, requestid, username=None): """ Edit the title of a pull-request. """ @@ -427,7 +423,6 @@ def request_pull_edit(repo, requestid, username=None): @APP.route('/fork///pull-request//comment/' '//', methods=('GET', 'POST')) @login_required -@repo_method def pull_request_add_comment( repo, requestid, commit=None, filename=None, row=None, username=None): @@ -508,7 +503,6 @@ def pull_request_add_comment( '/fork///pull-request//comment/drop', methods=['POST']) @login_required -@repo_method def pull_request_drop_comment(repo, requestid, username=None): """ Delete a comment of a pull-request. """ @@ -571,7 +565,6 @@ def pull_request_drop_comment(repo, requestid, username=None): '/fork///pull-request//comment' '//edit', methods=('GET', 'POST')) @login_required -@repo_method def pull_request_edit_comment(repo, requestid, commentid, username=None): """Edit comment of a pull request """ @@ -650,7 +643,6 @@ def pull_request_edit_comment(repo, requestid, commentid, username=None): @APP.route('/fork///pull-request//merge', methods=['POST']) @login_required -@repo_method def merge_request_pull(repo, requestid, username=None): """ Request pulling the changes from the fork into the project. """ @@ -723,7 +715,6 @@ def merge_request_pull(repo, requestid, username=None): @APP.route('/fork///pull-request/cancel/', methods=['POST']) @login_required -@repo_method def cancel_request_pull(repo, requestid, username=None): """ Cancel request pulling request. """ @@ -774,7 +765,6 @@ def cancel_request_pull(repo, requestid, username=None): '/fork///pull-request//assign', methods=['POST']) @login_required -@repo_method def set_assignee_requests(repo, requestid, username=None): ''' Assign a pull-request. ''' repo = flask.g.repo @@ -826,7 +816,6 @@ def set_assignee_requests(repo, requestid, username=None): @APP.route('/do_fork/', methods=['POST']) @APP.route('/do_fork/fork//', methods=['POST']) @login_required -@repo_method def fork_project(repo, username=None): """ Fork the project specified into the user's namespace """ @@ -881,7 +870,6 @@ def fork_project(repo, username=None): @APP.route( '/fork///diff/..', methods=('GET', 'POST')) -@repo_method def new_request_pull(repo, branch_to, branch_from, username=None): """ Request pulling the changes from the fork into the project. """ @@ -1016,7 +1004,6 @@ def new_request_pull(repo, branch_to, branch_from, username=None): @APP.route( '/fork///diff/remote', methods=('GET', 'POST')) @login_required -@repo_method def new_remote_request_pull(repo, username=None): """ Request pulling the changes from a remote fork into the project. """ @@ -1157,7 +1144,6 @@ def new_remote_request_pull(repo, username=None): '/fork_edit/fork///edit//' 'f/', methods=['POST']) @login_required -@repo_method def fork_edit_file(repo, branchname, filename, username=None): """ Fork the project specified and open the specific file to edit """ diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 12cf37c..24cf80e 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -48,7 +48,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, repo_method) + is_repo_admin, admin_session_timedout) @APP.route('/.git') @@ -65,7 +65,6 @@ def view_repo_git(repo, username=None): @APP.route('/') @APP.route('/fork///') @APP.route('/fork//') -@repo_method def view_repo(repo, username=None): """ Front page of a specific repo. """ @@ -162,7 +161,6 @@ def view_repo(repo, username=None): @APP.route('//branch/') @APP.route('/fork///branch/') -@repo_method def view_repo_branch(repo, branchname, username=None): ''' Returns the list of branches in the repo. ''' @@ -260,7 +258,6 @@ def view_repo_branch(repo, branchname, username=None): @APP.route('/fork///commits/') @APP.route('/fork///commits') @APP.route('/fork///commits/') -@repo_method def view_commits(repo, branchname=None, username=None): """ Displays the commits of the specified repo. """ @@ -366,7 +363,6 @@ def view_commits(repo, branchname=None, username=None): @APP.route('//c/..') @APP.route('/fork///c/../') @APP.route('/fork///c/..') -@repo_method def compare_commits(repo, commit1, commit2, username=None): """ Compares two commits for specified repo """ @@ -432,7 +428,6 @@ def compare_commits(repo, commit1, commit2, username=None): @APP.route('//blob//f/') @APP.route( '/fork///blob//f/') -@repo_method def view_file(repo, identifier, filename, username=None): """ Displays the content of a file or a tree for the specified repo. """ @@ -561,7 +556,6 @@ def view_file(repo, identifier, filename, username=None): defaults={'filename': None}) @APP.route( '/fork///raw//f/') -@repo_method def view_raw_file(repo, identifier, filename=None, username=None): """ Displays the raw content of a file of a commit for the specified repo. """ @@ -667,7 +661,6 @@ if APP.config.get('OLD_VIEW_COMMIT_ENABLED', False): @APP.route('//c/') @APP.route('/fork///c//') @APP.route('/fork///c/') -@repo_method def view_commit(repo, commitid, username=None): """ Render a commit in a repo """ @@ -712,7 +705,6 @@ def view_commit(repo, commitid, username=None): @APP.route('//c/.patch') @APP.route('/fork///c/.patch') -@repo_method def view_commit_patch(repo, commitid, username=None): """ Render a commit in a repo as patch """ @@ -739,7 +731,6 @@ def view_commit_patch(repo, commitid, username=None): @APP.route('/fork///tree/') @APP.route('/fork///tree') @APP.route('/fork///tree/') -@repo_method def view_tree(repo, identifier=None, username=None): """ Render the tree of the repo """ @@ -808,7 +799,6 @@ def view_tree(repo, identifier=None, username=None): @APP.route('//forks') @APP.route('/fork///forks/') @APP.route('/fork///forks') -@repo_method def view_forks(repo, username=None): """ Presents all the forks of the project. """ @@ -828,7 +818,6 @@ def view_forks(repo, username=None): @APP.route('//releases') @APP.route('/fork///releases/') @APP.route('/fork///releases') -@repo_method def view_tags(repo, username=None): """ Presents all the tags of the project. """ @@ -903,7 +892,6 @@ def new_release(repo, username=None): @APP.route('/fork///settings/', methods=('GET', 'POST')) @APP.route('/fork///settings', methods=('GET', 'POST')) @login_required -@repo_method def view_settings(repo, username=None): """ Presents the settings of the project. """ @@ -1202,7 +1190,6 @@ def update_milestones(repo, username=None): @APP.route('//default/branch/', methods=['POST']) @APP.route('/fork///default/branch/', methods=['POST']) @login_required -@repo_method def change_ref_head(repo, username=None): """ Change HEAD reference """ @@ -1243,7 +1230,6 @@ def change_ref_head(repo, username=None): @APP.route('//delete', methods=['POST']) @APP.route('/fork///delete', methods=['POST']) @login_required -@repo_method def delete_repo(repo, username=None): """ Delete the present project. """ @@ -1300,7 +1286,6 @@ def delete_repo(repo, username=None): @APP.route('//hook_token', methods=['POST']) @APP.route('/fork///hook_token', methods=['POST']) @login_required -@repo_method def new_repo_hook_token(repo, username=None): """ Re-generate a hook token for the present project. """ @@ -1342,7 +1327,6 @@ def new_repo_hook_token(repo, username=None): @APP.route('/fork///dropuser/', methods=['POST']) @login_required -@repo_method def remove_user(repo, userid, username=None): """ Remove the specified user from the project. """ @@ -1399,7 +1383,6 @@ def remove_user(repo, userid, username=None): @APP.route('/fork///adduser/', methods=('GET', 'POST')) @APP.route('/fork///adduser', methods=('GET', 'POST')) @login_required -@repo_method def add_user(repo, username=None): """ Add the specified user from the project. """ @@ -1457,7 +1440,6 @@ def add_user(repo, username=None): @APP.route( '/fork///dropgroup/', methods=['POST']) @login_required -@repo_method def remove_group_project(repo, groupid, username=None): """ Remove the specified group from the project. """ @@ -1515,7 +1497,6 @@ def remove_group_project(repo, groupid, username=None): @APP.route('/fork///addgroup/', methods=('GET', 'POST')) @APP.route('/fork///addgroup', methods=('GET', 'POST')) @login_required -@repo_method def add_group_project(repo, username=None): """ Add the specified group from the project. """ @@ -1624,7 +1605,6 @@ def regenerate_git(repo, username=None): @APP.route('/fork///token/new/', methods=('GET', 'POST')) @APP.route('/fork///token/new', methods=('GET', 'POST')) @login_required -@repo_method def add_token(repo, username=None): """ Add a token to a specified project. """ @@ -1677,7 +1657,6 @@ def add_token(repo, username=None): @APP.route('/fork///token/revoke/', methods=['POST']) @login_required -@repo_method def revoke_api_token(repo, token_id, username=None): """ Revokie a token to a specified project. """ @@ -1729,7 +1708,6 @@ def revoke_api_token(repo, token_id, username=None): '/fork///edit//f/', methods=('GET', 'POST')) @login_required -@repo_method def edit_file(repo, branchname, filename, username=None): """ Edit a file online. """ @@ -1812,7 +1790,6 @@ def edit_file(repo, branchname, filename, username=None): @APP.route('/fork///b//delete', methods=['POST']) @login_required -@repo_method def delete_branch(repo, branchname, username=None): """ Delete the branch of a project. """ From 4ad0bbd9cc3141304d17eae3d7c0d9c65b8b1053 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 15/25] Adjust the test so that we only drop the @app.before_request from flask-fas-openid --- diff --git a/tests/__init__.py b/tests/__init__.py index 0d7ed46..0aa4ebb 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -110,7 +110,12 @@ def user_set(APP, user): # flask.ext.fas_openid.FAS which otherwise kills our effort to set a # flask.g.fas_user. from flask import appcontext_pushed, g - APP.before_request_funcs[None] = [] + keep = [] + for meth in APP.before_request_funcs[None]: + if 'flask_fas_openid.FAS' in str(meth): + continue + keep.append(meth) + APP.before_request_funcs[None] = keep def handler(sender, **kwargs): g.fas_user = user From 0c09859b103370562862bd3c54a779d40c7bbbe6 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 16/25] Add a small new check for the http code returned --- diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py index 05efda1..86963cc 100644 --- a/tests/test_pagure_flask_internal.py +++ b/tests/test_pagure_flask_internal.py @@ -822,6 +822,7 @@ class PagureFlaskInternaltests(tests.Modeltests): user.username = 'pingou' with tests.user_set(pagure.APP, user): output = self.app.get('/test/adduser') + self.assertEqual(output.status_code, 200) csrf_token = output.data.split( b'name="csrf_token" type="hidden" value="')[1].split(b'">')[0] From 3f60e3e272f34f717a87e95f2401e16f8af57122 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 17/25] Adjust unit-tests for the new @app.before_request method This method now checks for the existence of the git repo when the URL is called, so the order in which we do our tests needs to be adjusted. --- diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 909cc59..b87c373 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -1854,15 +1854,19 @@ index 0000000..2a552bb send_email.return_value = True - # User not logged in + # Git repo not found output = self.app.post('fork_edit/test/edit/master/f/sources') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) tests.create_projects(self.session) for folder in ['docs', 'tickets', 'requests', 'repos']: tests.create_projects_git( os.path.join(tests.HERE, folder), bare=True) + # User not logged in + output = self.app.post('fork_edit/test/edit/master/f/sources') + self.assertEqual(output.status_code, 302) + user = tests.FakeUser() user.username = 'pingou' with tests.user_set(pagure.APP, user): diff --git a/tests/test_pagure_flask_ui_plugins.py b/tests/test_pagure_flask_ui_plugins.py index 2d9469d..0d0a071 100644 --- a/tests/test_pagure_flask_ui_plugins.py +++ b/tests/test_pagure_flask_ui_plugins.py @@ -84,8 +84,9 @@ class PagureFlaskPluginstests(tests.Modeltests): def test_view_plugin_page(self): """ Test the view_plugin_page endpoint. """ + # No Git repo output = self.app.get('/foo/settings/Mail') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -98,6 +99,10 @@ class PagureFlaskPluginstests(tests.Modeltests): output = self.app.get('/test/settings/Mail') self.assertEqual(output.status_code, 403) + # User not logged in + output = self.app.get('/test/settings/Mail') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): output = self.app.get('/test/settings/Mail') diff --git a/tests/test_pagure_flask_ui_plugins_fedmsg.py b/tests/test_pagure_flask_ui_plugins_fedmsg.py index 5d9ed27..7da5451 100644 --- a/tests/test_pagure_flask_ui_plugins_fedmsg.py +++ b/tests/test_pagure_flask_ui_plugins_fedmsg.py @@ -55,6 +55,7 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests): """ Test the fedmsg plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -87,11 +88,6 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests): tests.HERE, 'test.git', 'hooks', 'post-receive.fedmsg'))) data['csrf_token'] = csrf_token - # No git found - output = self.app.post('/test/settings/Fedmsg', data=data) - self.assertEqual(output.status_code, 404) - - tests.create_projects_git(tests.HERE) # With the git repo output = self.app.post( diff --git a/tests/test_pagure_flask_ui_plugins_irc.py b/tests/test_pagure_flask_ui_plugins_irc.py index 891a9c6..0e74120 100644 --- a/tests/test_pagure_flask_ui_plugins_irc.py +++ b/tests/test_pagure_flask_ui_plugins_irc.py @@ -55,6 +55,7 @@ class PagureFlaskPluginIRCtests(tests.Modeltests): """ Test the irc plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -87,11 +88,6 @@ class PagureFlaskPluginIRCtests(tests.Modeltests): tests.HERE, 'test.git', 'hooks', 'post-receive.irc'))) data['csrf_token'] = csrf_token - # No git found - output = self.app.post('/test/settings/IRC', data=data) - self.assertEqual(output.status_code, 404) - - tests.create_projects_git(tests.HERE) # With the git repo output = self.app.post( diff --git a/tests/test_pagure_flask_ui_plugins_mail.py b/tests/test_pagure_flask_ui_plugins_mail.py index 13c1d92..55c2f88 100644 --- a/tests/test_pagure_flask_ui_plugins_mail.py +++ b/tests/test_pagure_flask_ui_plugins_mail.py @@ -55,6 +55,7 @@ class PagureFlaskPluginMailtests(tests.Modeltests): """ Test the mail plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -90,11 +91,6 @@ class PagureFlaskPluginMailtests(tests.Modeltests): in output.data) data['csrf_token'] = csrf_token - # No git found - output = self.app.post('/test/settings/Mail', data=data) - self.assertEqual(output.status_code, 404) - - tests.create_projects_git(tests.HERE) # With the git repo output = self.app.post( diff --git a/tests/test_pagure_flask_ui_plugins_noff.py b/tests/test_pagure_flask_ui_plugins_noff.py index 039350f..c2db1f5 100644 --- a/tests/test_pagure_flask_ui_plugins_noff.py +++ b/tests/test_pagure_flask_ui_plugins_noff.py @@ -55,6 +55,7 @@ class PagureFlaskPluginNoFFtests(tests.Modeltests): """ Test the noff plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -96,12 +97,6 @@ class PagureFlaskPluginNoFFtests(tests.Modeltests): in output.data) data['csrf_token'] = csrf_token - # No git found - output = self.app.post( - '/test/settings/Block non fast-forward pushes', data=data) - self.assertEqual(output.status_code, 404) - - tests.create_projects_git(tests.HERE) # With the git repo output = self.app.post( diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py index d3416a6..648e0c3 100644 --- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py +++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py @@ -47,6 +47,7 @@ class PagureFlaskPluginPagureCItests(tests.Modeltests): """ Test the pagure ci plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -104,12 +105,6 @@ class PagureFlaskPluginPagureCItests(tests.Modeltests): data['csrf_token'] = csrf_token - # No git found - output = self.app.post('/test/settings/Pagure', data=data) - self.assertEqual(output.status_code, 404) - - tests.create_projects_git(tests.HERE) - if not pagure.APP.config.get('PAGURE_CI_SERVICES'): return diff --git a/tests/test_pagure_flask_ui_plugins_pagure_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_hook.py index fd68dfa..712a098 100644 --- a/tests/test_pagure_flask_ui_plugins_pagure_hook.py +++ b/tests/test_pagure_flask_ui_plugins_pagure_hook.py @@ -57,6 +57,7 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests): """ Test the pagure hook plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -86,11 +87,7 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests): in output.data) data['csrf_token'] = csrf_token - # No git found - output = self.app.post('/test/settings/Pagure', data=data) - self.assertEqual(output.status_code, 404) - tests.create_projects_git(tests.HERE) tests.create_projects_git(os.path.join(tests.HERE, 'docs')) tests.create_projects_git(os.path.join(tests.HERE, 'requests')) diff --git a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py index a821bae..b564347 100644 --- a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py +++ b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py @@ -55,6 +55,7 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests): """ Test the pagure_request plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -84,15 +85,10 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests): in output.data) data['csrf_token'] = csrf_token - # No git found - output = self.app.post('/test/settings/Pagure requests', data=data) - self.assertEqual(output.status_code, 404) - # Create both the requests repo + # Create the requests repo tests.create_projects_git(os.path.join(tests.HERE, 'requests')) - # With the git repo - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/settings/Pagure requests', data=data, follow_redirects=True) diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py index fcd8baa..4e13a84 100644 --- a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py +++ b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py @@ -55,6 +55,7 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests): """ Test the pagure_ticket plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -84,15 +85,10 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests): in output.data) data['csrf_token'] = csrf_token - # No git found - output = self.app.post('/test/settings/Pagure tickets', data=data) - self.assertEqual(output.status_code, 404) - # Create both the tickets repo + # Create the tickets repo tests.create_projects_git(os.path.join(tests.HERE, 'tickets')) - # With the git repo - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/settings/Pagure tickets', data=data, follow_redirects=True) diff --git a/tests/test_pagure_flask_ui_plugins_rtd_hook.py b/tests/test_pagure_flask_ui_plugins_rtd_hook.py index f4b5d35..8efefbc 100644 --- a/tests/test_pagure_flask_ui_plugins_rtd_hook.py +++ b/tests/test_pagure_flask_ui_plugins_rtd_hook.py @@ -55,6 +55,7 @@ class PagureFlaskPluginRtdHooktests(tests.Modeltests): """ Test the pagure_request plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -84,15 +85,10 @@ class PagureFlaskPluginRtdHooktests(tests.Modeltests): output.data) data['csrf_token'] = csrf_token - # No git found - output = self.app.post('/test/settings/Read the Doc', data=data) - self.assertEqual(output.status_code, 404) - # Create both the requests repo + # Create the requests repo tests.create_projects_git(os.path.join(tests.HERE, 'requests')) - # With the git repo - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/settings/Read the Doc', data=data, follow_redirects=True) diff --git a/tests/test_pagure_flask_ui_plugins_unsigned.py b/tests/test_pagure_flask_ui_plugins_unsigned.py index 89ecab8..009689a 100644 --- a/tests/test_pagure_flask_ui_plugins_unsigned.py +++ b/tests/test_pagure_flask_ui_plugins_unsigned.py @@ -55,6 +55,7 @@ class PagureFlaskPluginUnsignedtests(tests.Modeltests): """ Test the noff plugin on/off endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -90,12 +91,6 @@ class PagureFlaskPluginUnsignedtests(tests.Modeltests): in output.data) data['csrf_token'] = csrf_token - # No git found - output = self.app.post( - '/test/settings/Block Un-Signed commits', data=data) - self.assertEqual(output.status_code, 404) - - tests.create_projects_git(tests.HERE) # With the git repo output = self.app.post( diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 42d3886..6e106e7 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -65,13 +65,19 @@ class PagureFlaskRepotests(tests.Modeltests): pagure.APP.config['ENABLE_USER_MNGT'] = False ast.return_value = False + # No Git repo output = self.app.get('/foo/adduser') + self.assertEqual(output.status_code, 404) + + tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + + # User not logged in + output = self.app.get('/test/adduser') self.assertEqual(output.status_code, 302) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): - tests.create_projects(self.session) - tests.create_projects_git(tests.HERE) output = self.app.get('/test/adduser') self.assertEqual(output.status_code, 404) @@ -109,18 +115,19 @@ class PagureFlaskRepotests(tests.Modeltests): """ Test the add_user endpoint. """ ast.return_value = False + # No git repo output = self.app.get('/foo/adduser') + self.assertEqual(output.status_code, 404) + + tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + + # User not logged in + output = self.app.get('/test/adduser') self.assertEqual(output.status_code, 302) user = tests.FakeUser() with tests.user_set(pagure.APP, user): - - output = self.app.get('/foo/adduser') - self.assertEqual(output.status_code, 404) - - tests.create_projects(self.session) - tests.create_projects_git(tests.HERE) - output = self.app.get('/test/adduser') self.assertEqual(output.status_code, 403) @@ -185,7 +192,15 @@ class PagureFlaskRepotests(tests.Modeltests): pagure.APP.config['ENABLE_USER_MNGT'] = False ast.return_value = False + # No Git repo output = self.app.get('/foo/addgroup') + self.assertEqual(output.status_code, 404) + + tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + + # User not logged in + output = self.app.get('/test/addgroup') self.assertEqual(output.status_code, 302) msg = pagure.lib.add_group( @@ -203,13 +218,8 @@ class PagureFlaskRepotests(tests.Modeltests): user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): - output = self.app.get('/test/addgroup') - self.assertEqual(output.status_code, 404) - #just get the csrf token pagure.APP.config['ENABLE_USER_MNGT'] = True - tests.create_projects(self.session) - tests.create_projects_git(tests.HERE) output = self.app.get('/test/addgroup') csrf_token = output.data.split( @@ -240,17 +250,19 @@ class PagureFlaskRepotests(tests.Modeltests): """ Test the add_group_project endpoint. """ ast.return_value = False + # No Git repo output = self.app.get('/foo/addgroup') + self.assertEqual(output.status_code, 404) + + tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + + # User not logged in + output = self.app.get('/test/addgroup') self.assertEqual(output.status_code, 302) user = tests.FakeUser() with tests.user_set(pagure.APP, user): - output = self.app.get('/foo/addgroup') - self.assertEqual(output.status_code, 404) - - tests.create_projects(self.session) - tests.create_projects_git(tests.HERE) - output = self.app.get('/test/addgroup') self.assertEqual(output.status_code, 403) @@ -327,8 +339,9 @@ class PagureFlaskRepotests(tests.Modeltests): pagure.APP.config['ENABLE_USER_MNGT'] = False ast.return_value = False + # Git repo not found output = self.app.post('/foo/dropuser/1') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): @@ -346,6 +359,10 @@ class PagureFlaskRepotests(tests.Modeltests): '/test/dropuser/2', data=data, follow_redirects=True) self.assertEqual(output.status_code, 404) + # User not logged in + output = self.app.post('/test/dropuser/1') + self.assertEqual(output.status_code, 302) + # Add an user to a project repo = pagure.lib.get_project(self.session, 'test') msg = pagure.lib.add_user_to_project( @@ -374,8 +391,9 @@ class PagureFlaskRepotests(tests.Modeltests): """ Test the remove_user endpoint. """ ast.return_value = False + # Git repo not found output = self.app.post('/foo/dropuser/1') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -393,6 +411,10 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 302) ast.return_value = False + # User not logged in + output = self.app.post('/test/dropuser/1') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): output = self.app.post('/test/settings') @@ -450,16 +472,20 @@ class PagureFlaskRepotests(tests.Modeltests): pagure.APP.config['ENABLE_USER_MNGT'] = False ast.return_value = False + # No Git repo output = self.app.post('/foo/dropgroup/1') + self.assertEqual(output.status_code, 404) + + tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + + # User not logged in + output = self.app.post('/test/dropgroup/1') self.assertEqual(output.status_code, 302) user = tests.FakeUser() - with tests.user_set(pagure.APP, user): - tests.create_projects(self.session) - user.username = 'pingou' with tests.user_set(pagure.APP, user): - tests.create_projects_git(tests.HERE) output = self.app.post('/test/settings') csrf_token = output.data.split( @@ -513,8 +539,9 @@ class PagureFlaskRepotests(tests.Modeltests): """ Test the remove_group_project endpoint. """ ast.return_value = False + # No Git repo output = self.app.post('/foo/dropgroup/1') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -532,6 +559,10 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 302) ast.return_value = False + # User not logged in + output = self.app.post('/test/dropgroup/1') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): output = self.app.post('/test/settings') @@ -604,27 +635,35 @@ class PagureFlaskRepotests(tests.Modeltests): """ Test the update_project endpoint. """ ast.return_value = True + # Git repo not found output = self.app.post('/foo/update') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): - output = self.app.post('/foo/update') - self.assertEqual(output.status_code, 302) - - ast.return_value = False - + # Project does not exist output = self.app.post('/foo/update') self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + + # Session timed-out + output = self.app.post('/test/update') + self.assertEqual(output.status_code, 302) + ast.return_value = False + + # Not allowed output = self.app.post('/test/update') self.assertEqual(output.status_code, 403) + # User not logged in + output = self.app.post('/test/update') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): - tests.create_projects_git(tests.HERE) output = self.app.post('/test/update', follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( @@ -692,8 +731,9 @@ class PagureFlaskRepotests(tests.Modeltests): """ Test the view_settings endpoint. """ ast.return_value = False + # No Git repo output = self.app.get('/foo/settings') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -706,6 +746,10 @@ class PagureFlaskRepotests(tests.Modeltests): output = self.app.get('/test/settings') self.assertEqual(output.status_code, 403) + # User not logged in + output = self.app.get('/test/settings') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): ast.return_value = True @@ -1918,16 +1962,23 @@ index 0000000..fb7093d send_email.return_value = True pagure.APP.config['ENABLE_DEL_PROJECTS'] = False + # No Git repo output = self.app.post('/foo/delete') - # User not logged in - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) + output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 404) + # User not logged in + output = self.app.post('/test/delete') + self.assertEqual(output.status_code, 302) + + with tests.user_set(pagure.APP, user): # Only git repo item = pagure.lib.model.Project( user_id=1, # pingou @@ -1937,7 +1988,6 @@ index 0000000..fb7093d ) self.session.add(item) self.session.commit() - tests.create_projects_git(tests.HERE) output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 404) @@ -2125,23 +2175,23 @@ index 0000000..fb7093d ast.return_value = False send_email.return_value = True + # No Git repo output = self.app.post('/foo/delete') - # User not logged in - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): - output = self.app.post('/foo/delete') - # No project registered in the DB - self.assertEqual(output.status_code, 404) - tests.create_projects(self.session) - #tests.create_projects_git(tests.HERE) + tests.create_projects_git(tests.HERE) - output = self.app.post('/test/delete') - # No git repo associated + # No project registered in the DB (no git repo) + output = self.app.post('/foo/delete') self.assertEqual(output.status_code, 404) + # User not logged in + output = self.app.post('/test/delete') + self.assertEqual(output.status_code, 302) + user = tests.FakeUser(username='pingou') with tests.user_set(pagure.APP, user): tests.create_projects_git(tests.HERE) @@ -2442,6 +2492,7 @@ index 0000000..fb7093d upgit.return_value = True sendmail.return_value = True tests.create_projects(self.session) + tests.create_projects_git(tests.HERE) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -2491,7 +2542,6 @@ index 0000000..fb7093d self.assertEqual(msg.title, 'Test issue') data['regenerate'] = 'tickets' - tests.create_projects_git(tests.HERE) output = self.app.post( '/test/regenerate', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -2558,8 +2608,9 @@ index 0000000..fb7093d def test_edit_file(self): """ Test the edit_file endpoint. """ + # No Git repo output = self.app.get('/foo/edit/foo/f/sources') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -2574,6 +2625,10 @@ index 0000000..fb7093d output = self.app.get('/test/edit/foo/f/sources') self.assertEqual(output.status_code, 403) + # User not logged in + output = self.app.get('/test/edit/foo/f/sources') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): @@ -2702,8 +2757,9 @@ index 0000000..fb7093d """ Test the change_ref_head endpoint. """ ast.return_value = True + # No Git repo output = self.app.post('/foo/default/branch/') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -2721,6 +2777,10 @@ index 0000000..fb7093d output = self.app.post('/test/default/branch/') self.assertEqual(output.status_code, 403) + # User no logged in + output = self.app.post('/test/default/branch/') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): output = self.app.post('/test/default/branch/', @@ -2798,8 +2858,9 @@ index 0000000..fb7093d def test_new_release(self): """ Test the new_release endpoint. """ + # No Git repo output = self.app.post('/foo/upload/') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -2807,10 +2868,15 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 404) tests.create_projects(self.session) + repo = tests.create_projects_git(tests.HERE) output = self.app.post('/test/upload/') self.assertEqual(output.status_code, 403) + # User not logged in + output = self.app.post('/test/upload/') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): img = os.path.join(tests.HERE, 'placebo.png') @@ -2824,19 +2890,6 @@ index 0000000..fb7093d csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] - # Upload Ok but No git repo - data = {'filestream': open(img), 'csrf_token': csrf_token} - output = self.app.post( - '/test/upload/', data=data, follow_redirects=True) - self.assertEqual(output.status_code, 404) - self.assertIn( - '\n File', output.data) - self.assertIn( - 'uploaded\n
    ', output.data) - self.assertIn('

    No git repo found

    ', output.data) - - repo = tests.create_projects_git(tests.HERE) - # Upload successful data = {'filestream': open(img), 'csrf_token': csrf_token} output = self.app.post( @@ -2853,8 +2906,9 @@ index 0000000..fb7093d """ Test the add_token endpoint. """ ast.return_value = False + # No Git repo output = self.app.get('/foo/token/new/') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -2867,6 +2921,10 @@ index 0000000..fb7093d output = self.app.get('/test/token/new/') self.assertEqual(output.status_code, 403) + # User not logged in + output = self.app.get('/test/token/new/') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): output = self.app.get('/test/token/new/') @@ -2914,8 +2972,9 @@ index 0000000..fb7093d """ Test the revoke_api_token endpoint. """ ast.return_value = False + # No Git repo output = self.app.post('/foo/token/revoke/123') - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) user = tests.FakeUser() with tests.user_set(pagure.APP, user): @@ -2928,6 +2987,10 @@ index 0000000..fb7093d output = self.app.post('/test/token/revoke/123') self.assertEqual(output.status_code, 403) + # User not logged in + output = self.app.post('/test/token/revoke/123') + self.assertEqual(output.status_code, 302) + user.username = 'pingou' with tests.user_set(pagure.APP, user): output = self.app.get('/test/token/new') @@ -2990,17 +3053,21 @@ index 0000000..fb7093d def test_delete_branch(self): """ Test the delete_branch endpoint. """ + # No Git repo output = self.app.post('/foo/b/master/delete') - # No project registered in the DB - self.assertEqual(output.status_code, 302) + self.assertEqual(output.status_code, 404) tests.create_projects(self.session) tests.create_projects_git(tests.HERE, bare=True) + # User not logged in + output = self.app.post('/test/b/master/delete') + self.assertEqual(output.status_code, 302) + user = tests.FakeUser() with tests.user_set(pagure.APP, user): - output = self.app.post('/foo/b/master/delete') # Unknown repo + output = self.app.post('/foo/b/master/delete') self.assertEqual(output.status_code, 404) output = self.app.post('/test/b/master/delete') @@ -3097,6 +3164,7 @@ index 0000000..fb7093d def test_view_project_activity(self): """ Test the view_project_activity endpoint. """ tests.create_projects(self.session) + tests.create_projects_git(tests.HERE, bare=True) # Project Exists, but No DATAGREPPER_URL set output = self.app.get('/test/activity/') @@ -3122,6 +3190,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 405) tests.create_projects(self.session) + tests.create_projects_git(tests.HERE, bare=True) user = tests.FakeUser() user.username = 'pingou' @@ -3164,13 +3233,15 @@ index 0000000..fb7093d item = pagure.lib.model.Project( user_id=2, # foo name='test', - description='test project #1', + description='foo project #1', hook_token='aaabbb', is_fork=True, parent_id=1, ) self.session.add(item) self.session.commit() + gitrepo = os.path.join(tests.HERE, 'forks', 'foo', 'test.git') + pygit2.init_repository(gitrepo, bare=True) output = self.app.post( '/watch/fork/foo/test/settings/0', data=data, follow_redirects=True) From bcd7a0433fb54102ca5fa94d0e8b6d9dd7f19ec0 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 18/25] Some more relying on flask.g and some code adjustments --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index c061145..89afa1e 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -177,8 +177,8 @@ def request_pulls(repo, username=None): author=author, count=True) - reponame = pagure.get_repo_path(repo) - repo_obj = pygit2.Repository(reponame) + reponame = flask.g.reponame + repo_obj = flask.g.repo_obj if not repo_obj.is_empty and not repo_obj.head_is_unborn: head = repo_obj.head.shorthand else: @@ -718,23 +718,20 @@ def merge_request_pull(repo, requestid, username=None): def cancel_request_pull(repo, requestid, username=None): """ Cancel request pulling request. """ - reponame=repo form = pagure.forms.ConfirmationForm() if form.validate_on_submit(): - repo = flask.g.repo - - if not repo.settings.get('pull_requests', True): + if not flask.g.repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') request = pagure.lib.search_pull_requests( - SESSION, project_id=repo.id, requestid=requestid) + SESSION, project_id=flask.g.repo.id, requestid=requestid) if not request: flask.abort(404, 'Pull-request not found') - if not is_repo_admin(repo) \ + if not flask.g.repo_admin \ and not flask.g.fas_user.username == request.user.username: flask.abort( 403, @@ -756,7 +753,7 @@ def cancel_request_pull(repo, requestid, username=None): else: flask.flash('Invalid input submitted', 'error') - return flask.redirect(flask.url_for('view_repo', repo=reponame)) + return flask.redirect(flask.url_for('view_repo', repo=repo)) @APP.route( From d824d1689d1e85786739c520b2afc1f45df32364 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 19/25] Also check that if the user is not allowed, they get a 403 error --- diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 6e106e7..87be925 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -2188,6 +2188,10 @@ index 0000000..fb7093d output = self.app.post('/foo/delete') self.assertEqual(output.status_code, 404) + # User not allowed + output = self.app.post('/test/delete') + self.assertEqual(output.status_code, 403) + # User not logged in output = self.app.post('/test/delete') self.assertEqual(output.status_code, 302) From 74dadb3424c5ba68b777aa6d62fdfb3aadf49b70 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 20/25] Port the controllers remaining to rely on the variables in flask.g --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 89afa1e..1999a20 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -29,8 +29,7 @@ import pagure.exceptions import pagure.lib import pagure.lib.git import pagure.forms -from pagure import (APP, SESSION, LOG, login_required, is_repo_admin, - __get_file_in_tree) +from pagure import APP, SESSION, LOG, login_required, __get_file_in_tree @@ -189,7 +188,6 @@ def request_pulls(repo, username=None): select='requests', repo=repo, username=username, - repo_obj=repo_obj, requests=requests, oth_requests=oth_requests, status=status, @@ -379,7 +377,7 @@ def request_pull_edit(repo, requestid, username=None): if request.status != 'Open': flask.abort(400, 'Pull-request is already closed') - if not is_repo_admin(repo) \ + if not flask.g.repo_admin \ and flask.g.fas_user.username != request.user.username: flask.abort(403, 'You are not allowed to edit this pull-request') @@ -537,7 +535,7 @@ def pull_request_drop_comment(repo, requestid, username=None): if (flask.g.fas_user.username != comment.user.username or comment.parent.status is False) \ - and not is_repo_admin(repo): + and not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to remove this comment from ' @@ -589,7 +587,7 @@ def pull_request_edit_comment(repo, requestid, commentid, username=None): if (flask.g.fas_user.username != comment.user.username or comment.parent.status != 'Open') \ - and not is_repo_admin(project): + and not flask.g.repo_admin: flask.abort(403, 'You are not allowed to edit the comment') form = pagure.forms.EditCommentForm() @@ -635,7 +633,6 @@ def pull_request_edit_comment(repo, requestid, commentid, username=None): form=form, comment=comment, is_js=is_js, - repo_admin=is_repo_admin(project), ) @@ -664,7 +661,7 @@ def merge_request_pull(repo, requestid, username=None): if not request: flask.abort(404, 'Pull-request not found') - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to merge pull-request for this project') @@ -778,7 +775,7 @@ def set_assignee_requests(repo, requestid, username=None): if request.status != 'Open': flask.abort(403, 'Pull-request closed') - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort(403, 'You are not allowed to assign this pull-request') form = pagure.forms.ConfirmationForm() @@ -895,7 +892,7 @@ def new_request_pull(repo, branch_to, branch_from, username=None): return flask.redirect(flask.url_for( 'view_repo', username=username, repo=repo.name)) - repo_admin = is_repo_admin(repo) + repo_admin = flask.g.repo_admin form = pagure.forms.RequestPullForm() if form.validate_on_submit() and repo_admin: @@ -952,7 +949,7 @@ def new_request_pull(repo, branch_to, branch_from, username=None): SESSION.rollback() flask.flash(str(err), 'error') - if not is_repo_admin(repo): + if not flask.g.repo_admin: form = None # if the pull request we are creating only has one commit, @@ -976,20 +973,19 @@ def new_request_pull(repo, branch_to, branch_from, username=None): contributing, _ = pagure.doc_utils.convert_readme( contributing.data, 'md') + flask.g.branches = sorted(orig_repo.listall_branches()) + return flask.render_template( 'pull_request.html', select='requests', repo=repo, username=username, - repo_obj=repo_obj, orig_repo=orig_repo, diff_commits=diff_commits, diff=diff, form=form, - branches=sorted(orig_repo.listall_branches()), branch_to=branch_to, branch_from=branch_from, - repo_admin=repo_admin, contributing=contributing, ) @@ -1014,7 +1010,7 @@ def new_remote_request_pull(repo, username=None): parentpath = pagure.get_repo_path(repo) orig_repo = pygit2.Repository(parentpath) - repo_admin = is_repo_admin(repo) + repo_admin = flask.g.repo_admin form = pagure.forms.RemoteRequestPullForm() if form.validate_on_submit(): diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index e5436fa..cde2e1d 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -31,7 +31,7 @@ import pagure.exceptions import pagure.lib import pagure.forms from pagure import (APP, SESSION, LOG, __get_file_in_tree, - login_required, is_repo_admin, authenticated) + login_required, authenticated) # URLs @@ -47,7 +47,7 @@ def update_issue(repo, issueid, username=None): ''' Add a comment to an issue. ''' is_js = flask.request.args.get('js', False) - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = flask.g.repo if flask.request.method == 'GET': if not is_js: @@ -55,9 +55,6 @@ def update_issue(repo, issueid, username=None): return flask.redirect(flask.url_for( 'view_issue', username=username, repo=repo.name, issueid=issueid)) - if repo is None: - flask.abort(404, 'Project not found') - if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -66,7 +63,7 @@ def update_issue(repo, issueid, username=None): if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') - if issue.private and not is_repo_admin(repo) \ + if issue.private and not flask.g.repo_admin \ and (not authenticated() or not issue.user.user == flask.g.fas_user.username): flask.abort( @@ -84,7 +81,7 @@ def update_issue(repo, issueid, username=None): status=status, priorities=repo.priorities) if form.validate_on_submit(): - repo_admin = is_repo_admin(repo) + repo_admin = flask.g.repo_admin if flask.request.form.get('drop_comment'): commentid = flask.request.form.get('drop_comment') @@ -96,7 +93,7 @@ def update_issue(repo, issueid, username=None): if (flask.g.fas_user.username != comment.user.username or comment.parent.status != 'Open') \ - and not is_repo_admin(repo): + and not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to remove this comment from ' @@ -269,12 +266,9 @@ def update_issue(repo, issueid, username=None): def edit_tag(repo, tag, username=None): """ Edit the specified tag associated with the issues of a project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to edit tags associated with the issues of \ @@ -325,12 +319,9 @@ def edit_tag(repo, tag, username=None): def remove_tag(repo, username=None): """ Remove the specified tag, associated with the issues, from the project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to remove tags associated with the issues \ @@ -379,10 +370,7 @@ def view_issues(repo, username=None): assignee = flask.request.args.get('assignee', None) author = flask.request.args.get('author', None) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -398,7 +386,7 @@ def view_issues(repo, username=None): if authenticated(): private = flask.g.fas_user.username # If user is repo admin, show all tickets included the private ones - if is_repo_admin(repo): + if flask.g.repo_admin: private = None oth_issues = None @@ -463,8 +451,6 @@ def view_issues(repo, username=None): assignee=assignee, author=author, priority=priority, - repo_admin=is_repo_admin(repo), - repo_obj=repo_obj, ) @@ -480,10 +466,7 @@ def view_roadmap(repo, username=None): status = None milestone = flask.request.args.getlist('milestone', None) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -494,7 +477,7 @@ def view_roadmap(repo, username=None): if authenticated(): private = flask.g.fas_user.username # If user is repo admin, show all tickets included the private ones - if is_repo_admin(repo): + if flask.g.repo_admin: private = None milestones = milestone or list(repo.milestones.keys()) @@ -556,8 +539,6 @@ def view_roadmap(repo, username=None): milestones=milestones_ordered, issues=milestone_issues, tags=milestone, - repo_admin=is_repo_admin(repo), - repo_obj=repo_obj, ) @@ -569,10 +550,7 @@ def view_roadmap(repo, username=None): def new_issue(repo, username=None): """ Create a new issue """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -665,7 +643,6 @@ def new_issue(repo, username=None): form=form, repo=repo, username=username, - repo_admin=is_repo_admin(repo), types=types, default=default, ) @@ -679,10 +656,7 @@ def view_issue(repo, issueid, username=None): """ List all issues associated to a repo """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -692,7 +666,7 @@ def view_issue(repo, issueid, username=None): if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') - if issue.private and not is_repo_admin(repo) \ + if issue.private and not flask.g.repo_admin \ and (not authenticated() or not issue.user.user == flask.g.fas_user.username): flask.abort( @@ -713,12 +687,10 @@ def view_issue(repo, issueid, username=None): select='issues', repo=repo, username=username, - repo_obj=repo_obj, tag_list=tag_list, issue=issue, issueid=issueid, form=form, - repo_admin=is_repo_admin(repo), ) @@ -729,10 +701,7 @@ def delete_issue(repo, issueid, username=None): """ Delete the specified issue """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -742,7 +711,7 @@ def delete_issue(repo, issueid, username=None): if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to remove tickets of this project') @@ -778,10 +747,7 @@ def delete_issue(repo, issueid, username=None): def edit_issue(repo, issueid, username=None): """ Edit the specified issue """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -791,7 +757,7 @@ def edit_issue(repo, issueid, username=None): if issue is None or issue.project != repo: flask.abort(404, 'Issue not found') - if not (is_repo_admin(repo) + if not (flask.g.repo_admin or flask.g.fas_user.username == issue.user.username): flask.abort( 403, 'You are not allowed to edit issues for this project') @@ -875,7 +841,6 @@ def edit_issue(repo, issueid, username=None): username=username, issue=issue, issueid=issueid, - repo_admin=is_repo_admin(repo), ) @@ -886,10 +851,7 @@ def edit_issue(repo, issueid, username=None): def upload_issue(repo, issueid, username=None): ''' Upload a file to a ticket. ''' - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if repo is None: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -939,10 +901,7 @@ def view_issue_raw_file(repo, filename=None, username=None): """ Displays the raw content of a file of a commit for the specified ticket repo. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -1004,10 +963,7 @@ def edit_comment_issue(repo, issueid, commentid, username=None): """ is_js = flask.request.args.get('js', False) - project = pagure.lib.get_project(SESSION, repo, user=username) - - if not project: - flask.abort(404, 'Project not found') + project = flask.g.repo if not project.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') @@ -1025,7 +981,7 @@ def edit_comment_issue(repo, issueid, commentid, username=None): if (flask.g.fas_user.username != comment.user.username or comment.parent.status != 'Open') \ - and not is_repo_admin(project): + and not flask.g.repo_admin: flask.abort(403, 'You are not allowed to edit this comment') form = pagure.forms.EditCommentForm() @@ -1072,5 +1028,4 @@ def edit_comment_issue(repo, issueid, commentid, username=None): form=form, comment=comment, is_js=is_js, - repo_admin=is_repo_admin(project), ) diff --git a/pagure/ui/plugins.py b/pagure/ui/plugins.py index a8997ba..6cf552a 100644 --- a/pagure/ui/plugins.py +++ b/pagure/ui/plugins.py @@ -20,7 +20,7 @@ from pagure.hooks import BaseHook import pagure.exceptions import pagure.lib import pagure.forms -from pagure import APP, SESSION, login_required, is_repo_admin +from pagure import APP, SESSION, login_required from pagure.lib.model import BASE from pagure.exceptions import FileNotFoundException @@ -79,12 +79,9 @@ def get_plugin(plugin_name): def view_plugin(repo, plugin, username=None, full=True): """ Presents the settings of the project. """ - repo = pagure.lib.get_project(SESSION, repo, user=username) + repo = flask.g.repo - if not repo: - flask.abort(404, 'Project not found') - - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index 24cf80e..6dc3a25 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -48,7 +48,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) + admin_session_timedout) @APP.route('/.git') @@ -145,7 +145,6 @@ def view_repo(repo, username=None): 'repo_info.html', select='overview', repo=repo, - repo_obj=repo_obj, username=username, head=head, readme=readme, @@ -344,7 +343,6 @@ def view_commits(repo, branchname=None, username=None): 'commits.html', select='commits', origin='view_commits', - repo_obj=repo_obj, repo=repo, username=username, head=head, @@ -781,7 +779,6 @@ def view_tree(repo, identifier=None, username=None): return flask.render_template( 'file.html', select='tree', - repo_obj=repo_obj, origin='view_tree', repo=repo, username=username, @@ -833,7 +830,6 @@ def view_tags(repo, username=None): username=username, repo=repo, tags=tags, - repo_obj=repo_obj, ) @@ -849,12 +845,9 @@ def new_release(repo, username=None): and not APP.config.get('UPLOAD_FOLDER'): flask.abort(404) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -957,7 +950,6 @@ def view_settings(repo, username=None): select='settings', username=username, repo=repo, - repo_obj=repo_obj, form=form, tag_form=tag_form, branches_form=branches_form, @@ -980,12 +972,9 @@ def update_project(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1027,15 +1016,12 @@ def update_priorities(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1118,15 +1104,12 @@ def update_milestones(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo if not repo.settings.get('issue_tracker', True): flask.abort(404, 'No issue tracker found for this project') - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort( 403, 'You are not allowed to change the settings for this project') @@ -1565,12 +1548,9 @@ def regenerate_git(repo, username=None): return flask.redirect( flask.url_for('auth_login', next=url)) - repo = pagure.lib.get_project(SESSION, repo, user=username) - - if not repo: - flask.abort(404, 'Project not found') + repo = flask.g.repo - if not is_repo_admin(repo): + if not flask.g.repo_admin: flask.abort(403, 'You are not allowed to regenerate the git repos') regenerate = flask.request.form.get('regenerate') From 0be52909d0449f4d39e0ff920027e3664cf4f131 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 07 2016 10:50:18 +0000 Subject: [PATCH 21/25] Adjust the templates to rely on the variables in flask.g Since we are no longer providing these --- diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html index 8afcac2..a743541 100644 --- a/pagure/templates/_formhelper.html +++ b/pagure/templates/_formhelper.html @@ -102,7 +102,7 @@ {% endmacro %} -{% macro show_comment(comment, id, repo, username, issueid, form, repo_admin) %} +{% macro show_comment(comment, id, repo, username, issueid, form) %}
    {{ comment.user.default_email | avatar(16) | safe }} @@ -144,7 +144,7 @@ {% endif %} - {% if id != 0 and g.fas_user and repo_admin or ( + {% if id != 0 and g.fas_user and g.repo_admin or ( comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username) %} {% endif %} - {% if id != 0 and g.fas_user and repo_admin or ( + {% if id != 0 and g.fas_user and g.repo_admin or ( comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username) %}
    - {% if authenticated and repo_admin and type and type == 'edit' %} + {% if authenticated and g.repo_admin and type and type == 'edit' %} diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html index 7f8f1ad..ec64986 100644 --- a/pagure/templates/pull_request.html +++ b/pagure/templates/pull_request.html @@ -4,7 +4,7 @@ {% block title %} {%- if pull_request -%} PR#{{ requestid }}: {{ pull_request.title | noJS(ignore="img")}} - {{ repo.name }} - {% elif form and (repo_admin or remote_git) %} + {% elif form and (g.repo_admin or remote_git) %} Create new Pull Request for {{ branch_to }} - {{ repo.name }} {%- elif origin == 'compare_commits' -%} Diff from {{ commit1 }} to {{ commit2 }} - {{ repo.name }} @@ -26,7 +26,7 @@ {% block repo %}
    -
    +
    {% if pull_request %}

    PR#{{requestid}} {% if pull_request.status != 'Open'%} @@ -34,10 +34,10 @@ {% endif %} {{ pull_request.title | noJS(ignore="img") | safe}} {% if authenticated and (g.fas_user.username == pull_request.user.username - or repo_admin) and pull_request.status == 'Open'%} + or g.repo_admin) and pull_request.status == 'Open'%} {% if pull_request.status == 'Open' and authenticated and - (repo_admin or g.fas_user.username == pull_request.user.username) %} + (g.repo_admin or g.fas_user.username == pull_request.user.username) %} {% endif %} @@ -47,7 +47,7 @@ repo=repo.name, requestid=requestid) }}" title="Update title"> {% if pull_request.status == 'Open' and authenticated and - (repo_admin or g.fas_user.username == pull_request.user.username) %} + (g.repo_admin or g.fas_user.username == pull_request.user.username) %} {{ mergeform.csrf_token }}

    {% if pull_request.status == 'Open' and authenticated and - (repo_admin or g.fas_user.username == pull_request.user.username) %} + (g.repo_admin or g.fas_user.username == pull_request.user.username) %} {% endif %} @@ -104,7 +104,7 @@
    {%endif%} -{% elif form and (repo_admin or remote_git) %} +{% elif form and (g.repo_admin or remote_git) %}

    Create pull request

    {% else %}

    Diff @@ -118,7 +118,7 @@ {% endif %} -{% if form and (repo_admin or remote_git) %} +{% if form and (g.repo_admin or remote_git) %}
    {% if remote_git %}