nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitweb: Fix modifying git repositories when gitweb app is disabled

Browse Source 
Fixes #2408.

- When app is disabled, continue to update the app shortcut's login required
property. Otherwise, the value is current after the app is re-enabled.

- When public access is enabled, the gitweb-freedombox-auth.conf configuration
must be disabled. This can be done even if the configuration is already disabled
or does not exist. So, continue doing this.

Signed-off-by: Veiko Aasa <veiko17@disroot.org>
[sunil: Perform enable public access even if app is disabled]
[sunil: Perform shortcut update in all cases even if app is disabled]
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
Veiko Aasa 2024-02-27 09:15:54 +02:00 committed by Sunil Mohan Adapa
parent c217fdb5c6
commit 1268898176
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plinth/modules/gitweb/__init__.py
View File

@ -98,7 +98,7 @@ class GitwebApp(app_module.App):
def post_init(self): def post_init(self):
"""Perform post initialization operations.""" """Perform post initialization operations."""
if not self.needs_setup() and self.is_enabled(): if not self.needs_setup():
self.update_service_access() self.update_service_access()
def set_shortcut_login_required(self, login_required): def set_shortcut_login_required(self, login_required):
@ -122,7 +122,7 @@ class GitwebApp(app_module.App):
def _disable_public_access(self): def _disable_public_access(self):
"""Allow Gitweb app to be accessed by logged-in users only.""" """Allow Gitweb app to be accessed by logged-in users only."""
if not self.auth_webserver.is_conf_enabled(): if self.is_enabled() and not self.auth_webserver.is_conf_enabled():
self.auth_webserver.enable() self.auth_webserver.enable()
self.set_shortcut_login_required(True) self.set_shortcut_login_required(True)

41
plinth/modules/gitweb/tests/test_functional.py
View File

@ -63,23 +63,30 @@ class TestGitwebApp(functional.BaseAppTests):
@pytest.mark.parametrize('access', ['public', 'private']) @pytest.mark.parametrize('access', ['public', 'private'])
@pytest.mark.parametrize('repo_name', ['Test-repo', 'Test-repo.git']) @pytest.mark.parametrize('repo_name', ['Test-repo', 'Test-repo.git'])
def test_create_delete_repo(self, session_browser, access, repo_name): @pytest.mark.parametrize('app_status', ['enabled', 'disabled'])
def test_create_delete_repo(self, session_browser, access, repo_name,
app_status):
"""Test creating and deleting a repo and accessing with a git """Test creating and deleting a repo and accessing with a git
client.""" client."""
if app_status == "disabled":
functional.app_disable(session_browser, 'gitweb')
_delete_repo(session_browser, repo_name, ignore_missing=True) _delete_repo(session_browser, repo_name, ignore_missing=True)
_create_repo(session_browser, repo_name, access) _create_repo(session_browser, repo_name, access)
assert _repo_exists(session_browser, repo_name, access) assert _repo_exists(session_browser, repo_name, access)
assert _site_repo_exists(session_browser, repo_name)
if access == "public": if app_status == "enabled":
assert _repo_is_readable(repo_name) assert _site_repo_exists(session_browser, repo_name)
else:
assert not _repo_is_readable(repo_name)
assert not _repo_is_writable(repo_name) if access == "public":
assert _repo_is_readable(repo_name, with_auth=True) assert _repo_is_readable(repo_name)
assert _repo_is_writable(repo_name, with_auth=True) else:
assert not _repo_is_readable(repo_name)
assert not _repo_is_writable(repo_name)
assert _repo_is_readable(repo_name, with_auth=True)
assert _repo_is_writable(repo_name, with_auth=True)
_delete_repo(session_browser, repo_name) _delete_repo(session_browser, repo_name)
assert not _repo_exists(session_browser, repo_name) assert not _repo_exists(session_browser, repo_name)
@ -93,8 +100,12 @@ class TestGitwebApp(functional.BaseAppTests):
assert _site_repo_exists(session_browser, 'Test-repo') assert _site_repo_exists(session_browser, 'Test-repo')
assert not _site_repo_exists(session_browser, 'Test-repo-private') assert not _site_repo_exists(session_browser, 'Test-repo-private')
def test_edit_repo_metadata(self, session_browser): @pytest.mark.parametrize('app_status', ['enabled', 'disabled'])
def test_edit_repo_metadata(self, session_browser, app_status):
"""Test edit repo metadata.""" """Test edit repo metadata."""
if app_status == "disabled":
functional.app_disable(session_browser, 'gitweb')
_create_repo(session_browser, 'Test-repo2', 'public', _create_repo(session_browser, 'Test-repo2', 'public',
ok_if_exists=True) ok_if_exists=True)
_delete_repo(session_browser, 'Test-repo', ignore_missing=True) _delete_repo(session_browser, 'Test-repo', ignore_missing=True)
@ -108,10 +119,12 @@ class TestGitwebApp(functional.BaseAppTests):
assert _get_repo_metadata(session_browser, assert _get_repo_metadata(session_browser,
"Test-repo") == repo_metadata "Test-repo") == repo_metadata
_create_branch('Test-repo', 'branch1') if app_status == "enabled":
_set_default_branch(session_browser, 'Test-repo', 'branch1') _create_branch('Test-repo', 'branch1')
assert _get_gitweb_site_default_repo_branch(session_browser, _set_default_branch(session_browser, 'Test-repo', 'branch1')
'Test-repo') == 'branch1'
assert _get_gitweb_site_default_repo_branch(
session_browser, 'Test-repo') == 'branch1'
def _create_local_repo(path): def _create_local_repo(path):