diff --git a/src/octoprint/server/api/languages.py b/src/octoprint/server/api/languages.py index 1d9c7e9..8e54757 100755 --- a/src/octoprint/server/api/languages.py +++ b/src/octoprint/server/api/languages.py @@ -142,7 +142,26 @@ def _unpack_uploaded_tarball(path, target): map(_validate_archive_name, tar.getmembers()) # unpack everything - tar.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(tar, target) def _validate_archive_name(name): if name.startswith("/") or ".." in name: