From ed846f4b3647dc29f5642c2d1517e694bf5b68cf Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Thu, 15 Dec 2022 19:46:07 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../models/rnn/translate/data_utils.py | 21 ++++++++++++++++++- .../models/rnn/translate/data_utils.py | 21 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/Previous Work/android-yolo-master/jni-build/jni/include/tensorflow/models/rnn/translate/data_utils.py b/Previous Work/android-yolo-master/jni-build/jni/include/tensorflow/models/rnn/translate/data_utils.py index 369350e..625c107 100644 --- a/Previous Work/android-yolo-master/jni-build/jni/include/tensorflow/models/rnn/translate/data_utils.py +++ b/Previous Work/android-yolo-master/jni-build/jni/include/tensorflow/models/rnn/translate/data_utils.py @@ -79,7 +79,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=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 diff --git a/Previous Work/android-yolo/jni-build/jni/include/tensorflow/models/rnn/translate/data_utils.py b/Previous Work/android-yolo/jni-build/jni/include/tensorflow/models/rnn/translate/data_utils.py index 369350e..625c107 100644 --- a/Previous Work/android-yolo/jni-build/jni/include/tensorflow/models/rnn/translate/data_utils.py +++ b/Previous Work/android-yolo/jni-build/jni/include/tensorflow/models/rnn/translate/data_utils.py @@ -79,7 +79,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=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