diff --git a/python/pyenv.symlink/versions/3.6.3/lib/python3.6/tarfile.py b/python/pyenv.symlink/versions/3.6.3/lib/python3.6/tarfile.py index 5d4c86ce..b7f3bb62 100755 --- a/python/pyenv.symlink/versions/3.6.3/lib/python3.6/tarfile.py +++ b/python/pyenv.symlink/versions/3.6.3/lib/python3.6/tarfile.py @@ -2503,7 +2503,26 @@ def main(): if is_tarfile(src): with TarFile.open(src, 'r:*') as tf: - tf.extractall(path=curdir) + 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(tf, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src) diff --git a/python/pyenv.symlink/versions/3.6.3/lib/python3.6/test/test_tarfile.py b/python/pyenv.symlink/versions/3.6.3/lib/python3.6/test/test_tarfile.py index fc790554..3fa95013 100644 --- a/python/pyenv.symlink/versions/3.6.3/lib/python3.6/test/test_tarfile.py +++ b/python/pyenv.symlink/versions/3.6.3/lib/python3.6/test/test_tarfile.py @@ -604,7 +604,26 @@ def test_extractall_pathlike_name(self): with support.temp_dir(DIR), \ tarfile.open(tarname, encoding="iso8859-1") as tar: directories = [t for t in tar if t.isdir()] - tar.extractall(DIR, directories) + 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, DIR, directories) for tarinfo in directories: path = DIR / tarinfo.name self.assertEqual(os.path.getmtime(path), tarinfo.mtime) diff --git a/python/pyenv.symlink/versions/miniconda3-4.3.11/lib/python3.6/site-packages/conda/gateways/disk/create.py b/python/pyenv.symlink/versions/miniconda3-4.3.11/lib/python3.6/site-packages/conda/gateways/disk/create.py index 5adbd79c..3d8b5bbc 100644 --- a/python/pyenv.symlink/versions/miniconda3-4.3.11/lib/python3.6/site-packages/conda/gateways/disk/create.py +++ b/python/pyenv.symlink/versions/miniconda3-4.3.11/lib/python3.6/site-packages/conda/gateways/disk/create.py @@ -104,7 +104,26 @@ def extract_tarball(tarball_full_path, destination_directory=None): assert not lexists(destination_directory), destination_directory with tarfile.open(tarball_full_path) as t: - t.extractall(path=destination_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(t, path=destination_directory) if sys.platform.startswith('linux') and os.getuid() == 0: # When extracting as root, tarfile will by restore ownership # of extracted files. However, we want root to be the owner diff --git a/python/pyenv.symlink/versions/miniconda3-4.3.11/lib/python3.6/tarfile.py b/python/pyenv.symlink/versions/miniconda3-4.3.11/lib/python3.6/tarfile.py index b78b1b1f..efc26ab3 100755 --- a/python/pyenv.symlink/versions/miniconda3-4.3.11/lib/python3.6/tarfile.py +++ b/python/pyenv.symlink/versions/miniconda3-4.3.11/lib/python3.6/tarfile.py @@ -2496,7 +2496,26 @@ def main(): if is_tarfile(src): with TarFile.open(src, 'r:*') as tf: - tf.extractall(path=curdir) + 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(tf, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src) diff --git a/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/conda-4.3.11-py36_0/lib/python3.6/site-packages/conda/gateways/disk/create.py b/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/conda-4.3.11-py36_0/lib/python3.6/site-packages/conda/gateways/disk/create.py index 32d3e1f4..0c5b782b 100644 --- a/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/conda-4.3.11-py36_0/lib/python3.6/site-packages/conda/gateways/disk/create.py +++ b/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/conda-4.3.11-py36_0/lib/python3.6/site-packages/conda/gateways/disk/create.py @@ -96,7 +96,26 @@ def extract_tarball(tarball_full_path, destination_directory=None): assert not lexists(destination_directory), destination_directory with tarfile.open(tarball_full_path) as t: - t.extractall(path=destination_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(t, path=destination_directory) if sys.platform.startswith('linux') and os.getuid() == 0: # When extracting as root, tarfile will by restore ownership # of extracted files. However, we want root to be the owner diff --git a/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/conda-4.3.27-py36hb556a21_0/lib/python3.6/site-packages/conda/gateways/disk/create.py b/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/conda-4.3.27-py36hb556a21_0/lib/python3.6/site-packages/conda/gateways/disk/create.py index 5adbd79c..3d8b5bbc 100644 --- a/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/conda-4.3.27-py36hb556a21_0/lib/python3.6/site-packages/conda/gateways/disk/create.py +++ b/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/conda-4.3.27-py36hb556a21_0/lib/python3.6/site-packages/conda/gateways/disk/create.py @@ -104,7 +104,26 @@ def extract_tarball(tarball_full_path, destination_directory=None): assert not lexists(destination_directory), destination_directory with tarfile.open(tarball_full_path) as t: - t.extractall(path=destination_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(t, path=destination_directory) if sys.platform.startswith('linux') and os.getuid() == 0: # When extracting as root, tarfile will by restore ownership # of extracted files. However, we want root to be the owner diff --git a/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/python-3.6.0-0/lib/python3.6/tarfile.py b/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/python-3.6.0-0/lib/python3.6/tarfile.py index b78b1b1f..efc26ab3 100755 --- a/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/python-3.6.0-0/lib/python3.6/tarfile.py +++ b/python/pyenv.symlink/versions/miniconda3-4.3.11/pkgs/python-3.6.0-0/lib/python3.6/tarfile.py @@ -2496,7 +2496,26 @@ def main(): if is_tarfile(src): with TarFile.open(src, 'r:*') as tf: - tf.extractall(path=curdir) + 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(tf, path=curdir) if args.verbose: if curdir == '.': msg = '{!r} file is extracted.'.format(src)