Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions fastcore/xtras.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,22 @@ def dumps(obj, **kw):

# %% ../nbs/03_xtras.ipynb #ac84300c
def _unpack(fname, out):
import shutil
shutil.unpack_archive(str(fname), str(out))
"Unpack `fname` into `out`, rejecting members that escape `out` (tar path traversal / 'tar slip')."
import shutil,tarfile
fname,out = str(fname),Path(out)
if not tarfile.is_tarfile(fname):
shutil.unpack_archive(fname, str(out)) # zip/etc: stdlib already strips '..'
else:
with tarfile.open(fname) as tf:
try: tf.extractall(out, filter='data') # py3.12+/3.11.4+: blocks '..', abs paths, links
except TypeError: # older interpreters: validate members manually
base = out.resolve()
for m in tf.getmembers():
if m.issym() or m.islnk(): raise ValueError(f'unsafe link member in archive: {m.name!r}')
dest = (out/m.name).resolve()
if dest!=base and base not in dest.parents:
raise ValueError(f'archive member escapes extraction dir: {m.name!r}')
tf.extractall(out)
ls = out.ls()
return ls[0] if len(ls) == 1 else out

Expand Down
39 changes: 37 additions & 2 deletions nbs/03_xtras.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -865,8 +865,22 @@
"source": [
"#| export\n",
"def _unpack(fname, out):\n",
" import shutil\n",
" shutil.unpack_archive(str(fname), str(out))\n",
" \"Unpack `fname` into `out`, rejecting members that escape `out` (tar path traversal / 'tar slip').\"\n",
" import shutil,tarfile\n",
" fname,out = str(fname),Path(out)\n",
" if not tarfile.is_tarfile(fname):\n",
" shutil.unpack_archive(fname, str(out)) # zip/etc: stdlib already strips '..'\n",
" else:\n",
" with tarfile.open(fname) as tf:\n",
" try: tf.extractall(out, filter='data') # py3.12+/3.11.4+: blocks '..', abs paths, links\n",
" except TypeError: # older interpreters: validate members manually\n",
" base = out.resolve()\n",
" for m in tf.getmembers():\n",
" if m.issym() or m.islnk(): raise ValueError(f'unsafe link member in archive: {m.name!r}')\n",
" dest = (out/m.name).resolve()\n",
" if dest!=base and base not in dest.parents:\n",
" raise ValueError(f'archive member escapes extraction dir: {m.name!r}')\n",
" tf.extractall(out)\n",
" ls = out.ls()\n",
" return ls[0] if len(ls) == 1 else out"
]
Expand Down Expand Up @@ -902,6 +916,27 @@
" return dest"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "56d3c7f2",
"metadata": {},
"outputs": [],
"source": [
"#|hide\n",
"# Regression (CVE-2026-65320): a tar member that escapes the extraction dir must be rejected,\n",
"# and must NOT write outside it.\n",
"import io,tarfile\n",
"with tempfile.TemporaryDirectory() as d:\n",
" d = Path(d)\n",
" tp = d/'evil.tar'\n",
" with tarfile.open(tp,'w') as t:\n",
" info = tarfile.TarInfo('../escaped.txt'); info.size = 3\n",
" t.addfile(info, io.BytesIO(b'pwn'))\n",
" test_fail(lambda: untar_dir(tp, d/'dest'))\n",
" assert not (d/'escaped.txt').exists()"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down