diff --git a/data/extract_all.py b/data/extract_all.py index aad59b6..3e21174 100755 --- a/data/extract_all.py +++ b/data/extract_all.py @@ -27,7 +27,29 @@ def extract_tgz(tgz_file, dest): base_path = path.sep.join(commonprefix(member_dirs)) for m in members: m.name = path.relpath(m.name, base_path) - tar.extractall(dest) + + import os + + 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, dest) def extract_all(): diff --git a/data/extract_tars.py b/data/extract_tars.py index 14a454a..ac51918 100644 --- a/data/extract_tars.py +++ b/data/extract_tars.py @@ -28,7 +28,29 @@ def extract_tgz(tgz_file, dest): base_path = path.sep.join(commonprefix(member_dirs)) for m in members: m.name = path.relpath(m.name, base_path) - tar.extractall(dest) + + import os + + 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, dest) def extract_all():