diff --git a/munin/session.py b/munin/session.py index 8f28ea6..e61f3e4 100644 --- a/munin/session.py +++ b/munin/session.py @@ -296,7 +296,26 @@ def from_archive_path(full_path): base_path, _ = os.path.splitext(full_path) try: with tarfile.open(full_path, 'r:*') as tar: - tar.extractall(base_path) + 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, base_path) with open(os.path.join(base_path, 'session.pickle'), 'rb') as handle: return pickle.load(handle)