From 3c79bb1fba4286c2813ec04d3545ab72f163201c Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 15 Nov 2022 10:48:05 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- mynoteslib/app.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/mynoteslib/app.py b/mynoteslib/app.py index 3b393d1..3997cf1 100755 --- a/mynoteslib/app.py +++ b/mynoteslib/app.py @@ -993,7 +993,26 @@ def get_name_data(path, local_files): with TemporaryDirectory() as tmpdir: # extract archive with tarfile.open(filename, 'r') as tar: - tar.extractall(tmpdir) + 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, tmpdir) # get path of main folder tmppath = os.path.join(tmpdir, os.listdir(tmpdir)[0]) # load note data