diff --git a/deps/jscshim/webkit/Tools/Scripts/update-wasm-gcc-torture.py b/deps/jscshim/webkit/Tools/Scripts/update-wasm-gcc-torture.py index 3da5328c..9839cd85 100755 --- a/deps/jscshim/webkit/Tools/Scripts/update-wasm-gcc-torture.py +++ b/deps/jscshim/webkit/Tools/Scripts/update-wasm-gcc-torture.py @@ -82,7 +82,26 @@ def untar_torture(args): shutil.rmtree(TORTURE_DIR) with tarfile.open(torture_file, 'r') as torture_tar: print('Extracting: %s -> %s' % (torture_file, TORTURE_DIR)) - torture_tar.extractall() + 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(torture_tar) assert os.path.isdir(TORTURE_DIR) diff --git a/deps/jscshim/webkit/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder.py b/deps/jscshim/webkit/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder.py index 71a006e3..939a5b50 100644 --- a/deps/jscshim/webkit/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder.py +++ b/deps/jscshim/webkit/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder.py @@ -77,7 +77,26 @@ def _fetch_remote_archive(self, archive_url): archive.extractall(self._dest) elif archive_type == 'tar.gz': with tarfile.open(archive_path, 'r:gz') as archive: - archive.extractall(self._dest) + 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, self._dest) unarchived_files = filter(lambda name: not name.startswith('.'), os.listdir(self._dest)) if len(unarchived_files) == 1: