diff --git a/prepare.py b/prepare.py index e5f1357..8fb52df 100644 --- a/prepare.py +++ b/prepare.py @@ -54,7 +54,26 @@ # Extraction print("Extracting files to {}".format(outdir)) with tarfile.open(outfile, "r") as t: - t.extractall(outdir) + 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(t, outdir) # Cleanup if not args.keep_archive: