From 5a2692725f7e94341903d6dcb58940dd36c4a414 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 11 Dec 2022 01:03:36 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../pytorch_pretrained_bert/modeling.py | 21 ++++++++++++++++++- .../BingBertSquad/turing/nvidia_modeling.py | 21 ++++++++++++++++++- .../Megatron-LM/model/modeling.py | 21 ++++++++++++++++++- .../pytorch_pretrained_bert/modeling.py | 21 ++++++++++++++++++- external/deepspeed/tests/unit/modeling.py | 21 ++++++++++++++++++- 5 files changed, 100 insertions(+), 5 deletions(-) diff --git a/external/deepspeed/DeepSpeedExamples/BingBertSquad/pytorch_pretrained_bert/modeling.py b/external/deepspeed/DeepSpeedExamples/BingBertSquad/pytorch_pretrained_bert/modeling.py index e667d37..6794ef1 100644 --- a/external/deepspeed/DeepSpeedExamples/BingBertSquad/pytorch_pretrained_bert/modeling.py +++ b/external/deepspeed/DeepSpeedExamples/BingBertSquad/pytorch_pretrained_bert/modeling.py @@ -538,7 +538,26 @@ def from_pretrained(cls, 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/external/deepspeed/DeepSpeedExamples/BingBertSquad/turing/nvidia_modeling.py b/external/deepspeed/DeepSpeedExamples/BingBertSquad/turing/nvidia_modeling.py index de03061..96ee238 100755 --- a/external/deepspeed/DeepSpeedExamples/BingBertSquad/turing/nvidia_modeling.py +++ b/external/deepspeed/DeepSpeedExamples/BingBertSquad/turing/nvidia_modeling.py @@ -777,7 +777,26 @@ def from_pretrained(cls, 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/external/deepspeed/DeepSpeedExamples/Megatron-LM/model/modeling.py b/external/deepspeed/DeepSpeedExamples/Megatron-LM/model/modeling.py index d5f8f5a..9e05b1f 100644 --- a/external/deepspeed/DeepSpeedExamples/Megatron-LM/model/modeling.py +++ b/external/deepspeed/DeepSpeedExamples/Megatron-LM/model/modeling.py @@ -735,7 +735,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/external/deepspeed/DeepSpeedExamples/bing_bert/pytorch_pretrained_bert/modeling.py b/external/deepspeed/DeepSpeedExamples/bing_bert/pytorch_pretrained_bert/modeling.py index 3355349..d2b8dca 100755 --- a/external/deepspeed/DeepSpeedExamples/bing_bert/pytorch_pretrained_bert/modeling.py +++ b/external/deepspeed/DeepSpeedExamples/bing_bert/pytorch_pretrained_bert/modeling.py @@ -569,7 +569,26 @@ def from_pretrained(cls, 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/external/deepspeed/tests/unit/modeling.py b/external/deepspeed/tests/unit/modeling.py index 0a2173f..ffe10a6 100755 --- a/external/deepspeed/tests/unit/modeling.py +++ b/external/deepspeed/tests/unit/modeling.py @@ -880,7 +880,26 @@ def from_pretrained(cls, 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)