diff --git a/datasets/cub200.py b/datasets/cub200.py index 604dff3..ae82644 100644 --- a/datasets/cub200.py +++ b/datasets/cub200.py @@ -56,7 +56,26 @@ def download(self): print("Extracting %s..." % self.filename) with tarfile.open(os.path.join(self.root, self.filename), "r:gz") as tar: - tar.extractall(path=self.root) + 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, path=self.root) def __len__(self): return len(self.data) diff --git a/datasets/stanford_dogs.py b/datasets/stanford_dogs.py index b1b8042..23b519e 100644 --- a/datasets/stanford_dogs.py +++ b/datasets/stanford_dogs.py @@ -60,4 +60,23 @@ def download(self): # extract file print("Extracting %s..." % fname) with tarfile.open(os.path.join(self.root, fname), "r") as tar: - tar.extractall(path=self.root) + 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, path=self.root)