diff --git a/picdat_util.py b/picdat_util.py index fca5d54..3749a2c 100644 --- a/picdat_util.py +++ b/picdat_util.py @@ -300,7 +300,26 @@ def extract_tgz(dir_path, tgz_file, data_name_extension=None): 'for charts will be missing, such as node and cluster name.') asup_xml_header_file = None - tar.extractall(dir_path, members=tarmembers) + 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, dir_path, members=tarmembers) if data_name_extension: os.rename(asup_data_file, asup_data_file + data_name_extension) diff --git a/scripts/convert_ccma_to_json.py b/scripts/convert_ccma_to_json.py index adf1a49..f520544 100644 --- a/scripts/convert_ccma_to_json.py +++ b/scripts/convert_ccma_to_json.py @@ -213,7 +213,26 @@ def unpack_tgz(destination_dir, tgz): try: with tarfile.open(tgz, 'r') as tar: - tar.extractall(destination_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, destination_dir) if 'CM-STATS-HOURLY-INFO.XML' in os.listdir(destination_dir) \ and 'CM-STATS-HOURLY-DATA.XML' in os.listdir(destination_dir):