Convert paths to string for tarinfo

Andrew Fasano · Andrew Fasano · commit ddaa8269f6b0 · 2024-02-15T15:14:42.000-05:00
diff --git a/unblob/handlers/archive/_safe_tarfile.py b/unblob/handlers/archive/_safe_tarfile.py
@@ -112,7 +112,7 @@ def extract(self, tarinfo: tarfile.TarInfo, extract_root: Path):  # noqa: C901
                 )
 
             # The symlink will point to our relative target (may be updated below if unsafe)
-            tarinfo.linkname = rel_target
+            tarinfo.linkname = rel_target.as_posix()
             logger.info(
                 "Link target is relative", linkname=tarinfo.linkname, name=tarinfo.name
             )
@@ -160,7 +160,7 @@ def extract(self, tarinfo: tarfile.TarInfo, extract_root: Path):  # noqa: C901
                 # Prepend placeholder directories before rel_target to get a valid path
                 # within extract_root. This is the relative version of resolved_path.
                 rel_target = Path("/".join(["placeholder"] * drop_count)) / rel_target
-                tarinfo.linkname = rel_target
+                tarinfo.linkname = rel_target.as_posix()
 
             logger.debug("Creating symlink", points_to=resolved_path, name=tarinfo.name)
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ def extract(self, tarinfo: tarfile.TarInfo, extract_root: Path): # noqa: C901`
`112`	`112`	`)`
`113`	`113`
`114`	`114`	`# The symlink will point to our relative target (may be updated below if unsafe)`
`115`		`- tarinfo.linkname = rel_target`
	`115`	`+ tarinfo.linkname = rel_target.as_posix()`
`116`	`116`	`logger.info(`
`117`	`117`	`"Link target is relative", linkname=tarinfo.linkname, name=tarinfo.name`
`118`	`118`	`)`
`@@ -160,7 +160,7 @@ def extract(self, tarinfo: tarfile.TarInfo, extract_root: Path): # noqa: C901`
`160`	`160`	`# Prepend placeholder directories before rel_target to get a valid path`
`161`	`161`	`# within extract_root. This is the relative version of resolved_path.`
`162`	`162`	`rel_target = Path("/".join(["placeholder"] * drop_count)) / rel_target`
`163`		`- tarinfo.linkname = rel_target`
	`163`	`+ tarinfo.linkname = rel_target.as_posix()`
`164`	`164`
`165`	`165`	`logger.debug("Creating symlink", points_to=resolved_path, name=tarinfo.name)`
`166`	`166`