diff --git a/text/torchtext/data/dataset.py b/text/torchtext/data/dataset.py index 951a4c5..8189dfb 100644 --- a/text/torchtext/data/dataset.py +++ b/text/torchtext/data/dataset.py @@ -130,11 +130,49 @@ def download(cls, root, check=None): elif ext in ['.gz', '.tgz']: with tarfile.open(zpath, 'r:gz') as tar: dirs = [member for member in tar.getmembers()] - tar.extractall(path=path, members=dirs) + 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=path, members=dirs) elif ext in ['.bz2', '.tar']: with tarfile.open(zpath) as tar: dirs = [member for member in tar.getmembers()] - tar.extractall(path=path, members=dirs) + 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=path, members=dirs) return os.path.join(path, cls.dirname) diff --git a/text/torchtext/vocab.py b/text/torchtext/vocab.py index af35cf6..716a3ed 100644 --- a/text/torchtext/vocab.py +++ b/text/torchtext/vocab.py @@ -260,7 +260,26 @@ def cache(self, name, cache, url=None): zf.extractall(cache) elif ext == 'gz': with tarfile.open(dest, 'r:gz') as tar: - tar.extractall(path=cache) + 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=cache) if not os.path.isfile(path): raise RuntimeError('no vectors found at {}'.format(path))