From 4a8ab0e3e9372c83e087bce33772eeb3a8d6c4ac Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Fri, 7 Oct 2022 21:10:50 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- Django/mblog/venv/Lib/tarfile.py | 21 ++++++++++++++++++++- python/venv/Lib/tarfile.py | 21 ++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Django/mblog/venv/Lib/tarfile.py b/Django/mblog/venv/Lib/tarfile.py index 5d4c86c..b7f3bb6 100644 --- a/Django/mblog/venv/Lib/tarfile.py +++ b/Django/mblog/venv/Lib/tarfile.py @@ -2503,7 +2503,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/python/venv/Lib/tarfile.py b/python/venv/Lib/tarfile.py index 5d4c86c..b7f3bb6 100644 --- a/python/venv/Lib/tarfile.py +++ b/python/venv/Lib/tarfile.py @@ -2503,7 +2503,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)