diff --git a/Tensorflow/models/official/nlp/transformer/data_download.py b/Tensorflow/models/official/nlp/transformer/data_download.py index e3ce7fc..8d73e75 100644 --- a/Tensorflow/models/official/nlp/transformer/data_download.py +++ b/Tensorflow/models/official/nlp/transformer/data_download.py @@ -203,7 +203,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=numeric_owner) + + + safe_extract(corpus_tar, path) # Return file paths of the requested files. input_file = find_file(path, input_filename) diff --git a/Tensorflow/models/research/deep_speech/data/download.py b/Tensorflow/models/research/deep_speech/data/download.py index 3ea6e2f..c54cc9a 100644 --- a/Tensorflow/models/research/deep_speech/data/download.py +++ b/Tensorflow/models/research/deep_speech/data/download.py @@ -79,7 +79,26 @@ def _progress(count, block_size, total_size): 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=numeric_owner) + + + safe_extract(tar, directory) finally: tf.io.gfile.remove(tar_filepath)