From eb023c9dd43b9dd375361c4ebb48a900fcc15a3d Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Mon, 3 Oct 2022 03:32:50 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- lib/data_utils.py | 24 +++++++++++++++++++++++- ref/data_utils.py | 21 ++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/lib/data_utils.py b/lib/data_utils.py index a2d162e..8a60439 100644 --- a/lib/data_utils.py +++ b/lib/data_utils.py @@ -83,7 +83,29 @@ 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) + + import os + + 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 diff --git a/ref/data_utils.py b/ref/data_utils.py index 2acab8d..9bf6be2 100644 --- a/ref/data_utils.py +++ b/ref/data_utils.py @@ -80,7 +80,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 2a9dc46da4cfa46c77a49a9415bde3660aad122a Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 23:15:20 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- lib/data_utils.py | 2 +- ref/data_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/data_utils.py b/lib/data_utils.py index 8a60439..2173892 100644 --- a/lib/data_utils.py +++ b/lib/data_utils.py @@ -102,7 +102,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) diff --git a/ref/data_utils.py b/ref/data_utils.py index 9bf6be2..75ac16c 100644 --- a/ref/data_utils.py +++ b/ref/data_utils.py @@ -96,7 +96,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)