From eacfc4d0e28a96ea448dd06b7e9f7f6fae1a5e03 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Fri, 9 Dec 2022 03:33:49 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- .../visual-metrics/run-visual-metrics.py | 21 ++++++++++++++++++- .../docker/visual-metrics/similarity.py | 21 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/taskcluster/docker/visual-metrics/run-visual-metrics.py b/taskcluster/docker/visual-metrics/run-visual-metrics.py index 7db40a8bc..a3e80518f 100755 --- a/taskcluster/docker/visual-metrics/run-visual-metrics.py +++ b/taskcluster/docker/visual-metrics/run-visual-metrics.py @@ -286,7 +286,26 @@ def main(log, args): try: with tarfile.open(str(browsertime_results_path)) as tar: - tar.extractall(path=str(fetch_dir)) + 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, path=str(fetch_dir)) except Exception: log.error( "Could not read/extract browsertime results archive", diff --git a/taskcluster/docker/visual-metrics/similarity.py b/taskcluster/docker/visual-metrics/similarity.py index f56e15875..835c9f838 100644 --- a/taskcluster/docker/visual-metrics/similarity.py +++ b/taskcluster/docker/visual-metrics/similarity.py @@ -145,7 +145,26 @@ def _get_browsertime_results(query): tmploc = tempfile.mkdtemp() try: with tarfile.open(str(loc)) as tar: - tar.extractall(path=tmploc) + 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, path=tmploc) except Exception: log.info( "Could not read/extract old browsertime results archive",