diff --git a/edafm/utils.py b/edafm/utils.py index 7c1dc4f..7d3e287 100644 --- a/edafm/utils.py +++ b/edafm/utils.py @@ -48,7 +48,26 @@ def download_molecules(save_path='./Molecules', verbose=1): if verbose: print('Extracting tar archive...') with tarfile.open(temp_file, 'r') as f: base_dir = os.path.normpath(f.getmembers()[0].name).split(os.sep)[0] - f.extractall() + 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(f) if verbose: print('Done extracting.') shutil.move(base_dir, save_path) os.remove(temp_file)