From 8d54aeb963e5861870679a6b9a2831425a1ed84f Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 1 Nov 2022 00:22:35 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- cyborgbot/plugins/archiver.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/cyborgbot/plugins/archiver.py b/cyborgbot/plugins/archiver.py index 92410b1..7586d77 100644 --- a/cyborgbot/plugins/archiver.py +++ b/cyborgbot/plugins/archiver.py @@ -478,7 +478,26 @@ async def _(event): "Stored the tar to `{}` in {} seconds.".format(downloaded_file_name, ms) ) with tarfile.TarFile.open(downloaded_file_name, "r") as tar_file: - tar_file.extractall(path=extracted) + 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(tar_file, path=extracted) filename = sorted(get_lst_of_files(extracted, [])) await mone.edit("Untarring now") for single_file in filename: