From 2ef04d06d3fa73439703afb2730474e5313b7616 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Wed, 2 Nov 2022 23:09:02 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../resmokelib/powercycle/powercycle.py | 21 ++++++++++++++++++- .../buildscripts/resmokelib/undodb/fetch.py | 21 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/mongo-r5.0.7/buildscripts/resmokelib/powercycle/powercycle.py b/mongo-r5.0.7/buildscripts/resmokelib/powercycle/powercycle.py index da33478f..7ece92be 100755 --- a/mongo-r5.0.7/buildscripts/resmokelib/powercycle/powercycle.py +++ b/mongo-r5.0.7/buildscripts/resmokelib/powercycle/powercycle.py @@ -404,7 +404,26 @@ def install_tarball(tarball, root_dir): ext = get_extension(tarball) if ext == ".tgz": with tarfile.open(tarball, "r:gz") as tar_handle: - tar_handle.extractall(path=root_dir) + 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(tar_handle, path=root_dir) output = "Unzipped {} to {}: {}".format(tarball, root_dir, tar_handle.getnames()) ret = 0 elif ext == ".zip": diff --git a/mongo-r5.0.7/buildscripts/resmokelib/undodb/fetch.py b/mongo-r5.0.7/buildscripts/resmokelib/undodb/fetch.py index 153977f3..1bd955bf 100644 --- a/mongo-r5.0.7/buildscripts/resmokelib/undodb/fetch.py +++ b/mongo-r5.0.7/buildscripts/resmokelib/undodb/fetch.py @@ -93,7 +93,26 @@ def _download_archive(url: str) -> Optional[str]: def _extract_archive(fname: str): print(f"Extracting to '{os.getcwd()}'") with tarfile.open(fname) as tfile: - tfile.extractall() + 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(tfile) def _cleanup(out_file: str):