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
21 changes: 20 additions & 1 deletion src/python/gem5/resources/downloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,5 +501,24 @@ def get_resource(
)
unpack_to = download_dest[: -len(tar_extension)]
with tarfile.open(download_dest) as f:
f.extractall(unpack_to)
def is_within_directory(directory, target):

abs_directory = os.path.abspath(directory)
abs_target = os.path.abspath(target)

prefix = os.path.commonprefix([abs_directory, abs_target])

return prefix == abs_directory

def safe_extract(tar, path=".", members=None, *, numeric_owner=False):

for member in tar.getmembers():
member_path = os.path.join(path, member.name)
if not is_within_directory(path, member_path):
raise Exception("Attempted Path Traversal in Tar File")

tar.extractall(path, members, numeric_owner=numeric_owner)


safe_extract(f, unpack_to)
os.remove(download_dest)
21 changes: 20 additions & 1 deletion tests/gem5/fixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,26 @@ def _extract(self):
import tarfile

with tarfile.open(self.filename) as tf:
tf.extractall(self.path)
def is_within_directory(directory, target):

abs_directory = os.path.abspath(directory)
abs_target = os.path.abspath(target)

prefix = os.path.commonprefix([abs_directory, abs_target])

return prefix == abs_directory

def safe_extract(tar, path=".", members=None, *, numeric_owner=False):

for member in tar.getmembers():
member_path = os.path.join(path, member.name)
if not is_within_directory(path, member_path):
raise Exception("Attempted Path Traversal in Tar File")

tar.extractall(path, members, numeric_owner=numeric_owner)


safe_extract(tf, self.path)

def _setup(self, testitem):
# Check to see if there is a file downloaded
Expand Down