From bda2af68928b037ee074d45bcc30a087b0980e22 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 2 Oct 2022 03:44:03 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- envn/Lib/tarfile.py | 21 ++++++++++++++++++++- somModel1/Lib/tarfile.py | 21 ++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/envn/Lib/tarfile.py b/envn/Lib/tarfile.py index ca45126..adc8f83 100644 --- a/envn/Lib/tarfile.py +++ b/envn/Lib/tarfile.py @@ -2508,7 +2508,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/somModel1/Lib/tarfile.py b/somModel1/Lib/tarfile.py index edd31e9..dab8f2a 100644 --- a/somModel1/Lib/tarfile.py +++ b/somModel1/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) + + + safe_extract(tf, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src) From 33c9ff0216dbc0ae5b90141f04c55a85bf0e87cb Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 15:17:45 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- envn/Lib/tarfile.py | 2 +- somModel1/Lib/tarfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/envn/Lib/tarfile.py b/envn/Lib/tarfile.py index adc8f83..400eba7 100644 --- a/envn/Lib/tarfile.py +++ b/envn/Lib/tarfile.py @@ -2524,7 +2524,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/somModel1/Lib/tarfile.py b/somModel1/Lib/tarfile.py index dab8f2a..465e746 100644 --- a/somModel1/Lib/tarfile.py +++ b/somModel1/Lib/tarfile.py @@ -2514,7 +2514,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)