From 080779bd9358f9a360490a59cf0f7d3d0a774940 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Mon, 3 Oct 2022 14:16:37 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- Utility/Python36/Lib/tarfile.py | 21 ++++++++++++++++++- .../python35_Linux/lib/python3.5/tarfile.py | 21 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Utility/Python36/Lib/tarfile.py b/Utility/Python36/Lib/tarfile.py index 5d4c86ce..85e94528 100644 --- a/Utility/Python36/Lib/tarfile.py +++ b/Utility/Python36/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) + + + safe_extract(tf, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src) diff --git a/Utility/python35_Linux/lib/python3.5/tarfile.py b/Utility/python35_Linux/lib/python3.5/tarfile.py index 999a99b9..21a86371 100644 --- a/Utility/python35_Linux/lib/python3.5/tarfile.py +++ b/Utility/python35_Linux/lib/python3.5/tarfile.py @@ -2506,7 +2506,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) + + + safe_extract(tf, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src) From dbe9c4839b6dd0acfdd2ea42ef3327c77b0d84a3 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Wed, 5 Oct 2022 01:57:52 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- Utility/Python36/Lib/tarfile.py | 2 +- Utility/python35_Linux/lib/python3.5/tarfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Utility/Python36/Lib/tarfile.py b/Utility/Python36/Lib/tarfile.py index 85e94528..b7f3bb62 100644 --- a/Utility/Python36/Lib/tarfile.py +++ b/Utility/Python36/Lib/tarfile.py @@ -2519,7 +2519,7 @@ def safe_extract(tar, path=".", members=None, *, numeric_owner=False): if not is_within_directory(path, member_path): raise Exception("Attempted Path Traversal in Tar File") - tar.extractall(path, members, numeric_owner) + tar.extractall(path, members, numeric_owner=numeric_owner) safe_extract(tf, path=curdir) diff --git a/Utility/python35_Linux/lib/python3.5/tarfile.py b/Utility/python35_Linux/lib/python3.5/tarfile.py index 21a86371..6c887b2a 100644 --- a/Utility/python35_Linux/lib/python3.5/tarfile.py +++ b/Utility/python35_Linux/lib/python3.5/tarfile.py @@ -2522,7 +2522,7 @@ def safe_extract(tar, path=".", members=None, *, numeric_owner=False): if not is_within_directory(path, member_path): raise Exception("Attempted Path Traversal in Tar File") - tar.extractall(path, members, numeric_owner) + tar.extractall(path, members, numeric_owner=numeric_owner) safe_extract(tf, path=curdir)