diff --git a/pagent/test/test_agent.py b/pagent/test/test_agent.py index 7c1da6c..794bf5f 100644 --- a/pagent/test/test_agent.py +++ b/pagent/test/test_agent.py @@ -516,7 +516,26 @@ async def get_archive(path, include_mask=None, arc.write(data) # Unpack it. with tarfile.open(arcpath, 'r') as arc: - arc.extractall(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(arc, path) def compare_dirs(lhs, rhs): assert os.path.isdir(lhs)