diff --git a/datasets/download_utils.py b/datasets/download_utils.py index eca99df..533547a 100644 --- a/datasets/download_utils.py +++ b/datasets/download_utils.py @@ -109,7 +109,26 @@ def unpickle(file): assert _md5_check(tmp_file) == md5_checksum, "md5 checksum did not match!.. deleting file" with tarfile.open(tmp_file, 'r:gz') as f: - f.extractall(tmp_dir) + 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(f, tmp_dir) finally: if os.path.isfile(tmp_file): os.remove(tmp_file) @@ -172,7 +191,26 @@ def unpickle(file): assert _md5_check(tmp_file) == md5_checksum, "md5 checksum did not match!.. deleting file" with tarfile.open(tmp_file, 'r:gz') as f: - f.extractall(tmp_dir) + 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(f, tmp_dir) finally: if os.path.isfile(tmp_file): os.remove(tmp_file)