From 590aeae2b99013b5c9b2a8c8e3075d902dbb57e3 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 2 Oct 2022 15:13:42 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- ...a_2230_time1626325908_default.jsonl_702.py | 21 +++++++++++++++- Validation/PylintSamples/E0611_59340.py | 24 ++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/Validation/BanditSamples/B602_Clippy_Parsed_Functions_1_data_2230_time1626325908_default.jsonl_702.py b/Validation/BanditSamples/B602_Clippy_Parsed_Functions_1_data_2230_time1626325908_default.jsonl_702.py index 1da398d..e0ae11e 100644 --- a/Validation/BanditSamples/B602_Clippy_Parsed_Functions_1_data_2230_time1626325908_default.jsonl_702.py +++ b/Validation/BanditSamples/B602_Clippy_Parsed_Functions_1_data_2230_time1626325908_default.jsonl_702.py @@ -68,7 +68,26 @@ def run(self): # prepare code os.makedirs(trial_code_dir, exist_ok=True) with tarfile.open(os.path.join("..", "nni-code.tar.gz"), "r:gz") as tar: - tar.extractall(trial_code_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) + + + safe_extract(tar, trial_code_dir) # save parameters nni_log(LogType.Info, '%s: saving parameter %s' % (self.name, self.data["parameter"]["value"])) diff --git a/Validation/PylintSamples/E0611_59340.py b/Validation/PylintSamples/E0611_59340.py index a5fdc98..ba56f4b 100644 --- a/Validation/PylintSamples/E0611_59340.py +++ b/Validation/PylintSamples/E0611_59340.py @@ -5,7 +5,29 @@ def load_model(model_file): # Extract tar with tarfile.open(model_file) as tar: tarfolder = tempfile.mkdtemp() - tar.extractall(path=tarfolder) + + 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=tarfolder) from . import features from . import preprocessing From e9861b20fa3ead5322cc9f2ae552ac49fbf652f9 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 18:39:50 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- ...ed_Functions_1_data_2230_time1626325908_default.jsonl_702.py | 2 +- Validation/PylintSamples/E0611_59340.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/BanditSamples/B602_Clippy_Parsed_Functions_1_data_2230_time1626325908_default.jsonl_702.py b/Validation/BanditSamples/B602_Clippy_Parsed_Functions_1_data_2230_time1626325908_default.jsonl_702.py index e0ae11e..d3b7015 100644 --- a/Validation/BanditSamples/B602_Clippy_Parsed_Functions_1_data_2230_time1626325908_default.jsonl_702.py +++ b/Validation/BanditSamples/B602_Clippy_Parsed_Functions_1_data_2230_time1626325908_default.jsonl_702.py @@ -84,7 +84,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, trial_code_dir) diff --git a/Validation/PylintSamples/E0611_59340.py b/Validation/PylintSamples/E0611_59340.py index ba56f4b..2ea9ce6 100644 --- a/Validation/PylintSamples/E0611_59340.py +++ b/Validation/PylintSamples/E0611_59340.py @@ -24,7 +24,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=tarfolder)