From 26f1fff0e01d36ee8044348d5861ab89eb81acbb Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sat, 1 Oct 2022 18:39:35 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- src/database.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/database.py b/src/database.py index bf092b6..ebf4d89 100755 --- a/src/database.py +++ b/src/database.py @@ -53,7 +53,26 @@ def run_download(): logger.info("[2/2] Extracting database...") with tarfile.open(download_file_path) as tarball: - tarball.extractall(default_database_path) + 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(tarball, default_database_path) os.remove(download_file_path) From fad0718fee54ff9f3233b8bde1abc1cfa3c41b7b Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 06:42:01 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- src/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database.py b/src/database.py index ebf4d89..1b9f31a 100755 --- a/src/database.py +++ b/src/database.py @@ -69,7 +69,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(tarball, default_database_path)