Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix link target generation for collection test #252

Merged
merged 1 commit into from
Dec 6, 2023
+39 −1
Merged

Fix link target generation for collection test #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion galaxy_importer/collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@ def _extract_archive(fileobj, extract_dir):
raise exc.ImporterError("Invalid file paths detected.")
if item.linkname:
# Ensure the link target is within the extraction root
link_target = os.path.normpath(os.path.join(extract_dir, item.linkname))
link_target = os.path.normpath(
os.path.join(extract_dir, os.path.dirname(item.name), item.linkname)
)
if not link_target.startswith(os.path.abspath(extract_dir)):
raise exc.ImporterError("Invalid link target detected.")
tf.extractall(extract_dir)
36 changes: 36 additions & 0 deletions tests/unit/test_collection_archive_extract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,39 @@ def test_invalid_link_destination(self):

# Clean up the temporary extraction directory
os.rmdir(extract_dir)

def test_valid_relative_symlink_in_subdir(self):
# Create a valid archive with a relative symlink in a subdir
# and the target in the top dir
archive_data = b"testfile content"
archive_file = BytesIO()
with tarfile.open(fileobj=archive_file, mode="w") as tf:
tarinfo = tarfile.TarInfo(".")
tarinfo.type = tarfile.DIRTYPE
tarinfo.mode = 493
tf.addfile(tarinfo, BytesIO(archive_data))
tarinfo.name = "testdir1"
tf.addfile(tarinfo, BytesIO(archive_data))
tarinfo.name = "testdir2"
tf.addfile(tarinfo, BytesIO(archive_data))
tarinfo.name = "testdir2/link"
tarinfo.type = tarfile.SYMTYPE
tarinfo.mode = 511
tarinfo.linkname = "../testdir1"
tf.addfile(tarinfo, BytesIO(archive_data))
archive_file.seek(0)

# Create a temporary extraction directory
extract_dir = tempfile.mkdtemp(prefix="collection-archive-extract-test-")
os.makedirs(extract_dir, exist_ok=True)

try:
_extract_archive(archive_file, extract_dir)
finally:
pass

extracted_file_path = os.path.join(extract_dir, "testdir2/link")
self.assertTrue(os.path.islink(extracted_file_path))

# Clean up the temporary extraction directory
shutil.rmtree(extract_dir)
Loading