From 8a01e3297c491cc542b4179cd7d1617da5a713ed Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sat, 22 Oct 2022 01:59:33 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../src/patool/programs/py_tarfile.py | 24 ++++++++++++++++++- .../src/patoolib/programs/py_tarfile.py | 24 ++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Python2.7-UnpackAndUploadToCOS/src/patool/programs/py_tarfile.py b/Python2.7-UnpackAndUploadToCOS/src/patool/programs/py_tarfile.py index d0304f08f4..702c91c452 100755 --- a/Python2.7-UnpackAndUploadToCOS/src/patool/programs/py_tarfile.py +++ b/Python2.7-UnpackAndUploadToCOS/src/patool/programs/py_tarfile.py @@ -36,7 +36,29 @@ def extract_tar (archive, compression, cmd, verbosity, interactive, outdir): """Extract a TAR archive with the tarfile Python module.""" try: with tarfile.open(archive) as tfile: - tfile.extractall(path=outdir) + + import os + + 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, path=outdir) except Exception as err: msg = "error extracting %s: %s" % (archive, err) raise util.PatoolError(msg) diff --git a/Python3.6-UnpackAndUploadToCOS/src/patoolib/programs/py_tarfile.py b/Python3.6-UnpackAndUploadToCOS/src/patoolib/programs/py_tarfile.py index d0304f08f4..702c91c452 100644 --- a/Python3.6-UnpackAndUploadToCOS/src/patoolib/programs/py_tarfile.py +++ b/Python3.6-UnpackAndUploadToCOS/src/patoolib/programs/py_tarfile.py @@ -36,7 +36,29 @@ def extract_tar (archive, compression, cmd, verbosity, interactive, outdir): """Extract a TAR archive with the tarfile Python module.""" try: with tarfile.open(archive) as tfile: - tfile.extractall(path=outdir) + + import os + + 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, path=outdir) except Exception as err: msg = "error extracting %s: %s" % (archive, err) raise util.PatoolError(msg)