From 4fcf10ff5bd24b093f3028ed621768cac6c3d2c5 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 30 Oct 2022 06:07:44 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../Lib/tarfile.py | 21 ++++++++++++++++++- .../python-com-scrapy/Lib/tarfile.py | 21 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Scripts-Python/Modulos-Diversos/deteccao-de-faces-com-python-e-opencv/Lib/tarfile.py b/Scripts-Python/Modulos-Diversos/deteccao-de-faces-com-python-e-opencv/Lib/tarfile.py index edd31e9..465e746 100644 --- a/Scripts-Python/Modulos-Diversos/deteccao-de-faces-com-python-e-opencv/Lib/tarfile.py +++ b/Scripts-Python/Modulos-Diversos/deteccao-de-faces-com-python-e-opencv/Lib/tarfile.py @@ -2498,7 +2498,26 @@ def main(): if is_tarfile(src): with TarFile.open(src, 'r:*') as tf: - tf.extractall(path=curdir) + 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, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src) diff --git a/Scripts-Python/Modulos-Diversos/python-com-scrapy/Lib/tarfile.py b/Scripts-Python/Modulos-Diversos/python-com-scrapy/Lib/tarfile.py index edd31e9..465e746 100644 --- a/Scripts-Python/Modulos-Diversos/python-com-scrapy/Lib/tarfile.py +++ b/Scripts-Python/Modulos-Diversos/python-com-scrapy/Lib/tarfile.py @@ -2498,7 +2498,26 @@ def main(): if is_tarfile(src): with TarFile.open(src, 'r:*') as tf: - tf.extractall(path=curdir) + 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, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src)