mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-19 22:46:20 -05:00
repos: submodule links must stay in the repo; import checks before it moves
* A submodule's working-tree `.git` names the git directory git uses for it. Before any submodule command (update, or deinit when submodules are turned off), and before an import, every `.git` below the top of the working tree must be a file pointing inside the repo's own .git/modules; a link, a directory, or a file pointing elsewhere could make git use a config that was never checked. * Import validates and sanitizes the clone where it is, then moves it, and moves it back if marking it fails, so a refused or failed import never leaves a clone moved without a Repo. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
d0ea6ab313
commit
4b034ae3ee
4 changed files with 141 additions and 14 deletions
|
|
@ -207,3 +207,33 @@ async def test_import_refuses(test_session, test_directory, async_client, test_w
|
|||
repo = await lib.import_repository(test_session, 'code/ssh-clone', url='https://git.example.com/owner/library',
|
||||
confirm=True)
|
||||
assert repo.url == 'https://git.example.com/owner/library'
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_import_checks_before_moving(test_session, test_directory, async_client, test_wrolpi_config,
|
||||
user_clone):
|
||||
"""Everything which can refuse an import is checked before the clone is moved."""
|
||||
directory, _ = user_clone()
|
||||
(directory / 'other').mkdir()
|
||||
(directory / 'other/.git').write_text(f'gitdir: {test_directory}\n')
|
||||
with pytest.raises(InvalidRepo, match='outside'):
|
||||
await lib.import_repository(test_session, 'code/kiwix-tools', confirm=True)
|
||||
test_session.rollback()
|
||||
assert (directory / '.git').is_dir()
|
||||
assert not (test_directory / 'repos/kiwix-tools').exists()
|
||||
assert test_session.query(Repository).count() == 0
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_import_moves_back_on_failure(test_session, test_directory, async_client, test_wrolpi_config,
|
||||
user_clone):
|
||||
"""If the import fails after the move, the clone is moved back."""
|
||||
from mock import mock
|
||||
directory, _ = user_clone()
|
||||
with mock.patch('modules.repos.lib.mark_clone', side_effect=OSError('disk full')):
|
||||
with pytest.raises(OSError):
|
||||
await lib.import_repository(test_session, 'code/kiwix-tools', confirm=True)
|
||||
test_session.rollback()
|
||||
assert (directory / '.git').is_dir()
|
||||
assert not (test_directory / 'repos/kiwix-tools').exists()
|
||||
assert test_session.query(Repository).count() == 0
|
||||
|
|
|
|||
|
|
@ -398,3 +398,51 @@ async def test_clone_token_survives_the_config(test_session, async_client, git_r
|
|||
download = await update(test_session, repos_download_manager)
|
||||
assert download.status == DownloadStatus.complete, download.error
|
||||
assert test_session.query(lib.Repository).one().head_sha == head
|
||||
|
||||
|
||||
@pytest.mark.parametrize('plant', ['outside', 'directory', 'link', 'garbage'])
|
||||
def test_working_tree_git_files(tmp_path, plant):
|
||||
"""A submodule's `.git` (in the working tree) decides which git directory git uses for it; it must be a file
|
||||
pointing inside the repo's own .git/modules."""
|
||||
repo = tmp_path / 'repo'
|
||||
(repo / '.git/modules/library').mkdir(parents=True)
|
||||
(repo / 'vendor/library').mkdir(parents=True)
|
||||
(repo / 'vendor/library/.git').write_text('gitdir: ../../.git/modules/library\n')
|
||||
assert lib.working_tree_git_error(repo) is None
|
||||
|
||||
evil = tmp_path / 'evil'
|
||||
evil.mkdir()
|
||||
(repo / 'other').mkdir()
|
||||
target = repo / 'other/.git'
|
||||
if plant == 'outside':
|
||||
target.write_text(f'gitdir: {evil}\n')
|
||||
elif plant == 'directory':
|
||||
target.mkdir()
|
||||
elif plant == 'link':
|
||||
target.symlink_to(evil)
|
||||
elif plant == 'garbage':
|
||||
target.write_text('not a gitdir line\n')
|
||||
assert lib.working_tree_git_error(repo)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('submodules', [True, False])
|
||||
@pytest.mark.asyncio
|
||||
async def test_update_refuses_planted_submodule_git_file(test_session, test_directory, git_remote_factory,
|
||||
repos_download_manager, submodules):
|
||||
"""Submodule commands (update, and deinit when submodules are turned off) never use a git directory outside
|
||||
the repo."""
|
||||
library = git_remote_factory('library')
|
||||
remote = git_remote_factory()
|
||||
remote.add_submodule('vendor/library', library)
|
||||
repo = lib.create_repository(test_session, remote.url, submodules=True)
|
||||
await repos_download_manager.wait_for_all_downloads()
|
||||
assert (repo.directory / 'vendor/library/lib.c').exists() or (repo.directory / 'vendor/library/README.md').exists()
|
||||
|
||||
evil = test_directory / 'evil-gitdir'
|
||||
evil.mkdir()
|
||||
(repo.directory / 'vendor/library/.git').write_text(f'gitdir: {evil}\n')
|
||||
lib.update_repository(test_session, repo.id, submodules=submodules)
|
||||
download = await update(test_session, repos_download_manager)
|
||||
assert download.status == DownloadStatus.deferred
|
||||
assert 'outside' in download.error
|
||||
assert list(evil.iterdir()) == []
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue