From 3586bbd514d63b0286ba8e823a5d1c54ad0d6460 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Wed, 16 Nov 2022 00:40:50 +0000 Subject: [PATCH] Adding tarfile member sanitization to extractall() --- cluster_fixture/base.py | 21 +++++++++++++++- protocol_generator/generate_api_definition.py | 24 ++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/cluster_fixture/base.py b/cluster_fixture/base.py index c46c0ad..4d1210b 100644 --- a/cluster_fixture/base.py +++ b/cluster_fixture/base.py @@ -507,7 +507,26 @@ def should_extract(member: tarfile.TarInfo) -> bool: logger.info(f"Extracting kafka archive to {destination}") with tarfile.open(tmpfile.name) as tar: members = [mem for mem in tar.getmembers() if should_extract(mem)] - tar.extractall(members=members, path=str(destination)) + 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, members=members, path=str(destination)) async def netcat_async_string(loop: asyncio.AbstractEventLoop, hostname: str, port: int, content: str) -> str: diff --git a/protocol_generator/generate_api_definition.py b/protocol_generator/generate_api_definition.py index ac31b61..4642c67 100644 --- a/protocol_generator/generate_api_definition.py +++ b/protocol_generator/generate_api_definition.py @@ -75,7 +75,29 @@ def is_lib(member: tarfile.TarInfo) -> bool: log.info("extracting jars") with tarfile.open(tmpfile.name) as tar: members = [mem for mem in tar.getmembers() if is_lib(mem)] - tar.extractall(members=members, path=PARENT_DIR) + + import os + + 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, members=members, path=PARENT_DIR) if __name__ == "__main__":