diff --git a/harvester/harvester.py b/harvester/harvester.py index 6e5bfb12..ffeafef4 100644 --- a/harvester/harvester.py +++ b/harvester/harvester.py @@ -116,7 +116,26 @@ tarlist = [] for member in tar.getmembers(): tarlist.append(member) - tar.extractall(temp_path, tarlist) + 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, temp_path, tarlist) tar.close() os.remove(full_filename.split(".gz")[0])