diff --git a/serverfiles/__init__.py b/serverfiles/__init__.py index 2d574f6..aeee558 100644 --- a/serverfiles/__init__.py +++ b/serverfiles/__init__.py @@ -388,7 +388,26 @@ def download(self, *path, **kwargs): os.mkdir(target) except OSError: pass - temp_fp.extractall(target) + 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(temp_fp, target) elif info.get("compression") == "gz": with gzip.open(target + ".tmp") as temp_fp: with open(target, "wb") as fp: