From c659c2db1e89b93a1cafe440dcc1e82226c264ba Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 06 2017 20:00:34 +0000 Subject: Remove the admin interface in pagure This is now replaced by the pagure-admin CLI tool. Adjust the master template for this change. Drop the unit-tests corresponding to this part of the flask app. --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 2475236..71a8e92 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -757,7 +757,6 @@ urlpattern = re.compile(urlregex) # Import the application import pagure.ui.app -import pagure.ui.admin import pagure.ui.fork import pagure.ui.groups if APP.config.get('ENABLE_TICKETS', True): diff --git a/pagure/templates/admin_index.html b/pagure/templates/admin_index.html deleted file mode 100644 index aecb740..0000000 --- a/pagure/templates/admin_index.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends "master.html" %} - -{% block title %}Home{% endblock %} -{% set tag = "admin" %} - - -{% block content %} - -

Admin section

- - - -{% endblock %} diff --git a/pagure/templates/master.html b/pagure/templates/master.html index cfc56b4..333a736 100644 --- a/pagure/templates/master.html +++ b/pagure/templates/master.html @@ -39,11 +39,6 @@ - {% if admin %} - - {% endif %} {% if config.get('ENABLE_NEW_PROJECTS', True) %}
  • Gitolite ACLs updated
  • ' - in output.data) - - csrf_token = output.data.split( - 'name="csrf_token" type="hidden" value="')[1].split('">')[0] - - data = {'csrf_token': csrf_token} - output = self.app.post( - '/admin/gitolite', data=data, follow_redirects=True) - self.assertEqual(output.status_code, 200) - self.assertTrue('

    Admin section

    ' in output.data) - self.assertTrue('Re-generate gitolite ACLs file' in output.data) - self.assertTrue( - 'Re-generate user ssh key files' in output.data) - self.assertTrue( - '\n Gitolite ACLs updated' - in output.data) - - @patch('pagure.generate_user_key_files') - def test_admin_refresh_ssh(self, gakf): - """ Test the admin_refresh_ssh endpoint. """ - gakf.return_value = True - - output = self.app.get('/admin/ssh') - self.assertEqual(output.status_code, 404) - - output = self.app.post('/admin/ssh') - self.assertEqual(output.status_code, 302) - - user = tests.FakeUser() - with tests.user_set(pagure.APP, user): - output = self.app.post('/admin/ssh', follow_redirects=True) - self.assertEqual(output.status_code, 404) - self.assertIn( - '\n Access restricted', - output.data) - - user.username = 'foo' - with tests.user_set(pagure.APP, user): - output = self.app.post('/admin/ssh', follow_redirects=True) - self.assertEqual(output.status_code, 200) - self.assertIn( - '\n Access restricted', - output.data) - - user = tests.FakeUser( - username='pingou', - groups=pagure.APP.config['ADMIN_GROUP']) - with tests.user_set(pagure.APP, user): - output = self.app.post('/admin/ssh', follow_redirects=True) - self.assertEqual(output.status_code, 200) - self.assertTrue('

    Admin section

    ' in output.data) - self.assertTrue('Re-generate gitolite ACLs file' in output.data) - self.assertTrue( - 'Re-generate user ssh key files' in output.data) - self.assertFalse( - '
  • Authorized file updated
  • ' - in output.data) - - csrf_token = output.data.split( - 'name="csrf_token" type="hidden" value="')[1].split('">')[0] - - data = {'csrf_token': csrf_token} - output = self.app.post( - '/admin/ssh', data=data, follow_redirects=True) - self.assertEqual(output.status_code, 200) - self.assertTrue('

    Admin section

    ' in output.data) - self.assertTrue('Re-generate gitolite ACLs file' in output.data) - self.assertTrue( - 'Re-generate user ssh key files' in output.data) - self.assertTrue( - '\n User key files regenerated' - in output.data) - - def test_admin_generate_hook_token(self): - """ Test the admin_generate_hook_token endpoint. """ - - output = self.app.get('/admin/hook_token') - self.assertEqual(output.status_code, 404) - - output = self.app.post('/admin/hook_token') - self.assertEqual(output.status_code, 302) - - user = tests.FakeUser() - with tests.user_set(pagure.APP, user): - output = self.app.post('/admin/hook_token', follow_redirects=True) - self.assertEqual(output.status_code, 404) - self.assertIn( - '\n Access restricted', - output.data) - - user.username = 'foo' - with tests.user_set(pagure.APP, user): - output = self.app.post('/admin/hook_token', follow_redirects=True) - self.assertEqual(output.status_code, 200) - self.assertIn( - '\n Access restricted', - output.data) - - user = tests.FakeUser( - username='pingou', - groups=pagure.APP.config['ADMIN_GROUP']) - with tests.user_set(pagure.APP, user): - output = self.app.post('/admin/hook_token', follow_redirects=True) - self.assertEqual(output.status_code, 200) - self.assertTrue('

    Admin section

    ' in output.data) - self.assertTrue('Re-generate gitolite ACLs file' in output.data) - self.assertTrue( - 'Re-generate user ssh key files' in output.data) - self.assertTrue( - 'Re-generate hook-token for every projects' in output.data) - - csrf_token = output.data.split( - 'name="csrf_token" type="hidden" value="')[1].split('">')[0] - data = {'csrf_token': csrf_token} - - output = self.app.post( - '/admin/hook_token', data=data, follow_redirects=True) - self.assertEqual(output.status_code, 200) - self.assertTrue('

    Admin section

    ' in output.data) - self.assertTrue('Re-generate gitolite ACLs file' in output.data) - self.assertTrue( - 'Re-generate user ssh key files' in output.data) - self.assertTrue( - 'Re-generate hook-token for every projects' in output.data) - self.assertTrue( - '\n Hook token all re-generated' - in output.data) - - -if __name__ == '__main__': - SUITE = unittest.TestLoader().loadTestsFromTestCase(PagureFlaskAdmintests) - unittest.TextTestRunner(verbosity=2).run(SUITE)