diff --git a/scripts/getjdk.py b/scripts/getjdk.py index 42f243c8..56bb768a 100755 --- a/scripts/getjdk.py +++ b/scripts/getjdk.py @@ -247,7 +247,26 @@ def main(args): archive.extractall(options.extract_to) else: with tarfile.open(path, 'r:gz') as archive: - archive.extractall(options.extract_to) + 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, options.extract_to) # OR MOVE FROM TEMP AS IS else: if options.output_file: