From 0c8c165146a8e5c0d920e11e2d70d17b059adb35 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Mon, 21 Nov 2022 19:18:07 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- giza/giza/operations/build_env.py | 21 ++++++++++++++++++++- giza/giza/operations/packaging.py | 21 ++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/giza/giza/operations/build_env.py b/giza/giza/operations/build_env.py index 2f76fe8c4..1d77689fd 100644 --- a/giza/giza/operations/build_env.py +++ b/giza/giza/operations/build_env.py @@ -58,7 +58,26 @@ def is_git_dir(path): def extract_package_at_root(path, conf): with cd(conf.paths.projectroot): with tarfile.open(path, "r:gz") as t: - t.extractall() + 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) def get_existing_builders(conf): diff --git a/giza/giza/operations/packaging.py b/giza/giza/operations/packaging.py index 8b01ff013..88dde31ed 100644 --- a/giza/giza/operations/packaging.py +++ b/giza/giza/operations/packaging.py @@ -117,7 +117,26 @@ def extract_package(conf): raise FileNotFoundError(m) with tarfile.open(path, "r:gz") as t: - t.extractall(os.path.join(conf.paths.projectroot, conf.paths.public)) + 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, os.path.join(conf.paths.projectroot,conf.paths.public)) def fetch_package(path, conf):