From 14ebdee9905ab477a75dbcb9d6f9758e9bdf7e00 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Wed, 23 Nov 2022 09:25:45 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- ate_asc_modeling.py | 21 ++++++++++++++++++++- ate_modeling.py | 21 ++++++++++++++++++++- decoder_module.py | 21 ++++++++++++++++++++- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/ate_asc_modeling.py b/ate_asc_modeling.py index c3de9e5..7f4eede 100644 --- a/ate_asc_modeling.py +++ b/ate_asc_modeling.py @@ -515,7 +515,26 @@ def from_pretrained(cls, pretrained_model_name, state_dict=None, cache_dir=None, logger.info("extracting archive file {} to temp dir {}".format( resolved_archive_file, tempdir)) with tarfile.open(resolved_archive_file, 'r:gz') as archive: - archive.extractall(tempdir) + 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(archive, tempdir) serialization_dir = tempdir # Load config config_file = os.path.join(serialization_dir, CONFIG_NAME) diff --git a/ate_modeling.py b/ate_modeling.py index 6346311..4f1b617 100644 --- a/ate_modeling.py +++ b/ate_modeling.py @@ -512,7 +512,26 @@ def from_pretrained(cls, pretrained_model_name, state_dict=None, cache_dir=None, logger.info("extracting archive file {} to temp dir {}".format( resolved_archive_file, tempdir)) with tarfile.open(resolved_archive_file, 'r:gz') as archive: - archive.extractall(tempdir) + 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(archive, tempdir) serialization_dir = tempdir # Load config config_file = os.path.join(serialization_dir, CONFIG_NAME) diff --git a/decoder_module.py b/decoder_module.py index a2dc3f1..279c5b4 100644 --- a/decoder_module.py +++ b/decoder_module.py @@ -352,7 +352,26 @@ def get_config(cls, pretrained_model_name, cache_dir=None, type_vocab_size=2, st logger.info("extracting archive file {} to temp dir {}".format( resolved_archive_file, tempdir)) with tarfile.open(resolved_archive_file, 'r:gz') as archive: - archive.extractall(tempdir) + 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(archive, tempdir) serialization_dir = tempdir # Load config config_file = os.path.join(serialization_dir, CONFIG_NAME)