diff --git a/ojs_updater/ojsinstance.py b/ojs_updater/ojsinstance.py index c409813..e7a45ab 100644 --- a/ojs_updater/ojsinstance.py +++ b/ojs_updater/ojsinstance.py @@ -264,7 +264,29 @@ def _rewind(self): if www_backup.endswith('.bz2'): with tarfile.open(str(www_backup), mode='r:bz2') as www_tar: self.logger.info('Extract to: %s', self.base_folder.parent) - www_tar.extractall(path=self.base_folder.parent) + + 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(www_tar, path=self.base_folder.parent) @contextmanager def lock(self):