From 00b2c9895162c95728e6c2e77944015911379ee8 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 2 Oct 2022 11:29:12 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- .../official/nlp/transformer/data_download.py | 21 ++++++++++++++++++- .../research/deep_speech/data/download.py | 21 ++++++++++++++++++- .../research/neural_gpu/wmt_utils.py | 21 ++++++++++++++++++- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/pyslam/thirdparty/tensorflow_models/official/nlp/transformer/data_download.py b/pyslam/thirdparty/tensorflow_models/official/nlp/transformer/data_download.py index 54c5434..e26d56b 100644 --- a/pyslam/thirdparty/tensorflow_models/official/nlp/transformer/data_download.py +++ b/pyslam/thirdparty/tensorflow_models/official/nlp/transformer/data_download.py @@ -208,7 +208,26 @@ def download_and_extract(path, url, input_filename, target_filename): # Extract compressed files logging.info("Extracting %s." % compressed_file) with tarfile.open(compressed_file, "r:gz") as corpus_tar: - corpus_tar.extractall(path) + 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(corpus_tar, path) # Return file paths of the requested files. input_file = find_file(path, input_filename) diff --git a/pyslam/thirdparty/tensorflow_models/research/deep_speech/data/download.py b/pyslam/thirdparty/tensorflow_models/research/deep_speech/data/download.py index 5ded037..b84a9cb 100644 --- a/pyslam/thirdparty/tensorflow_models/research/deep_speech/data/download.py +++ b/pyslam/thirdparty/tensorflow_models/research/deep_speech/data/download.py @@ -78,7 +78,26 @@ def _progress(count, block_size, total_size): tf.logging.info( "Successfully downloaded %s, size(bytes): %d" % (url, statinfo.st_size)) with tarfile.open(tar_filepath, "r") as tar: - tar.extractall(directory) + 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(tar, directory) finally: tf.gfile.Remove(tar_filepath) diff --git a/pyslam/thirdparty/tensorflow_models/research/neural_gpu/wmt_utils.py b/pyslam/thirdparty/tensorflow_models/research/neural_gpu/wmt_utils.py index ef83191..bdd0f64 100644 --- a/pyslam/thirdparty/tensorflow_models/research/neural_gpu/wmt_utils.py +++ b/pyslam/thirdparty/tensorflow_models/research/neural_gpu/wmt_utils.py @@ -84,7 +84,26 @@ def get_wmt_enfr_train_set(directory): _WMT_ENFR_TRAIN_URL) print("Extracting tar file %s" % corpus_file) with tarfile.open(corpus_file, "r") as corpus_tar: - corpus_tar.extractall(directory) + 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(corpus_tar, directory) gunzip_file(train_path + ".fr.gz", train_path + ".fr") gunzip_file(train_path + ".en.gz", train_path + ".en") return train_path From 6bb1aa741bcd44bb728dbe14564d74f3c32ec1ef Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 17:27:58 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- .../tensorflow_models/official/nlp/transformer/data_download.py | 2 +- .../tensorflow_models/research/deep_speech/data/download.py | 2 +- .../tensorflow_models/research/neural_gpu/wmt_utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyslam/thirdparty/tensorflow_models/official/nlp/transformer/data_download.py b/pyslam/thirdparty/tensorflow_models/official/nlp/transformer/data_download.py index e26d56b..999eeb6 100644 --- a/pyslam/thirdparty/tensorflow_models/official/nlp/transformer/data_download.py +++ b/pyslam/thirdparty/tensorflow_models/official/nlp/transformer/data_download.py @@ -224,7 +224,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(corpus_tar, path) diff --git a/pyslam/thirdparty/tensorflow_models/research/deep_speech/data/download.py b/pyslam/thirdparty/tensorflow_models/research/deep_speech/data/download.py index b84a9cb..020dd9f 100644 --- a/pyslam/thirdparty/tensorflow_models/research/deep_speech/data/download.py +++ b/pyslam/thirdparty/tensorflow_models/research/deep_speech/data/download.py @@ -94,7 +94,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(tar, directory) diff --git a/pyslam/thirdparty/tensorflow_models/research/neural_gpu/wmt_utils.py b/pyslam/thirdparty/tensorflow_models/research/neural_gpu/wmt_utils.py index bdd0f64..dd50561 100644 --- a/pyslam/thirdparty/tensorflow_models/research/neural_gpu/wmt_utils.py +++ b/pyslam/thirdparty/tensorflow_models/research/neural_gpu/wmt_utils.py @@ -100,7 +100,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(corpus_tar, directory)