From e42b4d78fa1edb2a4181d36ae90c14a50cc79706 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 20 Nov 2022 04:06:12 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- flair/utils/archival.py | 21 ++++++++++++++++++++- utils/archival.py | 21 ++++++++++++++++++++- utils/flair/utils/archival.py | 21 ++++++++++++++++++++- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/flair/utils/archival.py b/flair/utils/archival.py index 568aab8..6aa9f3e 100644 --- a/flair/utils/archival.py +++ b/flair/utils/archival.py @@ -92,7 +92,26 @@ def load_archive(archive_file: str, tempdir = tempfile.mkdtemp() logger.info(f"extracting archive file {resolved_archive_file} to temp dir {tempdir}") with tarfile.open(resolved_archive_file, 'r:gz') as archive: - archive.extractall(tempdir) + 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(archive, tempdir) serialization_dir = tempdir diff --git a/utils/archival.py b/utils/archival.py index 568aab8..6aa9f3e 100644 --- a/utils/archival.py +++ b/utils/archival.py @@ -92,7 +92,26 @@ def load_archive(archive_file: str, tempdir = tempfile.mkdtemp() logger.info(f"extracting archive file {resolved_archive_file} to temp dir {tempdir}") with tarfile.open(resolved_archive_file, 'r:gz') as archive: - archive.extractall(tempdir) + 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(archive, tempdir) serialization_dir = tempdir diff --git a/utils/flair/utils/archival.py b/utils/flair/utils/archival.py index 568aab8..6aa9f3e 100644 --- a/utils/flair/utils/archival.py +++ b/utils/flair/utils/archival.py @@ -92,7 +92,26 @@ def load_archive(archive_file: str, tempdir = tempfile.mkdtemp() logger.info(f"extracting archive file {resolved_archive_file} to temp dir {tempdir}") with tarfile.open(resolved_archive_file, 'r:gz') as archive: - archive.extractall(tempdir) + 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(archive, tempdir) serialization_dir = tempdir