diff --git a/igor/daemon/backends/files.py b/igor/daemon/backends/files.py index e0ea502..e2df1af 100644 --- a/igor/daemon/backends/files.py +++ b/igor/daemon/backends/files.py @@ -152,7 +152,26 @@ def create_item(self, dname, testplan_archive_file): if subdirs != set("plans", "suites"): raise RuntimeError("There must be two top-level dir") - archive.extractall(path=self.__temporary_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(archive, path=self.__temporary_path) tdir = os.path.join(self.__temporary_path, dname) self.paths.append(tdir)