diff --git a/src/dcos_e2e/_vendor/dcos_launch/dcos_engine.py b/src/dcos_e2e/_vendor/dcos_launch/dcos_engine.py index c602912ea..f0a68b9fc 100644 --- a/src/dcos_e2e/_vendor/dcos_launch/dcos_engine.py +++ b/src/dcos_e2e/_vendor/dcos_launch/dcos_engine.py @@ -115,7 +115,26 @@ def run_dcos_engine(dcos_engine_url: str, dcos_engine_template): f.write(chunk) extract_path = os.path.join(tmpdir, 'extract') with tarfile.open(download_path) as tar: - tar.extractall(path=extract_path) + 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, path=extract_path) extracted_name = dcos_engine_url.split('/')[-1].rstrip('.tar.gz') dcos_engine_bin_path = os.path.join(extract_path, extracted_name, 'dcos-engine') # inject parameters into the JSON (keyhelper, agent definitions) diff --git a/src/dcos_e2e_cli/_vendor/dcos_launch/dcos_engine.py b/src/dcos_e2e_cli/_vendor/dcos_launch/dcos_engine.py index c602912ea..f0a68b9fc 100644 --- a/src/dcos_e2e_cli/_vendor/dcos_launch/dcos_engine.py +++ b/src/dcos_e2e_cli/_vendor/dcos_launch/dcos_engine.py @@ -115,7 +115,26 @@ def run_dcos_engine(dcos_engine_url: str, dcos_engine_template): f.write(chunk) extract_path = os.path.join(tmpdir, 'extract') with tarfile.open(download_path) as tar: - tar.extractall(path=extract_path) + 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, path=extract_path) extracted_name = dcos_engine_url.split('/')[-1].rstrip('.tar.gz') dcos_engine_bin_path = os.path.join(extract_path, extracted_name, 'dcos-engine') # inject parameters into the JSON (keyhelper, agent definitions)