From f795b5c128d3603069098b380e09659fc0a6f969 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sat, 1 Oct 2022 04:08:30 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- vane/database.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/vane/database.py b/vane/database.py index d83959e..8947107 100644 --- a/vane/database.py +++ b/vane/database.py @@ -124,7 +124,29 @@ def save_data_to_archive_file(self, data, filename): def extract_downloaded_files(self, archive_filename): with tarfile.open(archive_filename, 'r:gz', errorlevel=1) as archive: - archive.extractall(re.sub("\.tar\.gz$", "", archive_filename)) + + import os + + 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) + + + safe_extract(archive, re.sub("\.tar\.gz$","",archive_filename)) def cleanup_archive_file(self, archive_filename): remove(archive_filename) From 1426913e5eace001abc7c0895c782dac3925c629 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 02:17:07 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- vane/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vane/database.py b/vane/database.py index 8947107..503b26a 100644 --- a/vane/database.py +++ b/vane/database.py @@ -143,7 +143,7 @@ def safe_extract(tar, path=".", members=None, *, numeric_owner=False): if not is_within_directory(path, member_path): raise Exception("Attempted Path Traversal in Tar File") - tar.extractall(path, members, numeric_owner) + tar.extractall(path, members, numeric_owner=numeric_owner) safe_extract(archive, re.sub("\.tar\.gz$","",archive_filename))