diff --git a/create-ext4.rootfs.py b/create-ext4.rootfs.py index 2897c03..241b574 100755 --- a/create-ext4.rootfs.py +++ b/create-ext4.rootfs.py @@ -40,7 +40,26 @@ def main(args): # Unpack the rootfs.tar file into a temporary directory with tempfile.TemporaryDirectory() as rootfs_dir: with tarfile.open(rootfs_tar, 'r:xz') as tf: - tf.extractall(rootfs_dir) + 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(tf, rootfs_dir) part.set_initial_data_root(rootfs_dir)