From 201f41cba219fc4759d451f4fa2d0e2ecef7cd18 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sat, 1 Oct 2022 18:23:14 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- app/ws/ws_io.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/app/ws/ws_io.py b/app/ws/ws_io.py index 89510b7e..5b5bf80e 100644 --- a/app/ws/ws_io.py +++ b/app/ws/ws_io.py @@ -97,7 +97,29 @@ def importWS(vault_h, ds_name, tar_content): return { "error": f"Bad dataset archive: file {fname} is required"} os.mkdir(ds_dir) - tar.extractall(path = ds_dir) + + 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(tar, path=ds_dir) try: with open(ds_dir + "/dsinfo.json", "r", encoding = "utf-8") as inp: From 071691671b48228988fccbe2f4daacabf09f356d Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 06:39:42 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- app/ws/ws_io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ws/ws_io.py b/app/ws/ws_io.py index 5b5bf80e..0d51189c 100644 --- a/app/ws/ws_io.py +++ b/app/ws/ws_io.py @@ -116,7 +116,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(tar, path=ds_dir)