diff --git a/build/lib/vltk/abc/adapter.py b/build/lib/vltk/abc/adapter.py index 58c956d..aac61b3 100644 --- a/build/lib/vltk/abc/adapter.py +++ b/build/lib/vltk/abc/adapter.py @@ -122,7 +122,26 @@ def bar_progress(current, total, width=80): if ".tar.gz" in filename: with tarfile.open(filename) as tar_ref: print(f"Extracting {filename}") - tar_ref.extractall(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_ref, path) elif ".zip" in filename: with zipfile.ZipFile(filename, "r") as zip_ref: diff --git a/vltk/abc/adapter.py b/vltk/abc/adapter.py index d76e202..2517d18 100644 --- a/vltk/abc/adapter.py +++ b/vltk/abc/adapter.py @@ -122,7 +122,26 @@ def bar_progress(current, total, width=80): if ".tar.gz" in filename: with tarfile.open(filename) as tar_ref: print(f"Extracting {filename}") - tar_ref.extractall(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_ref, path) elif ".zip" in filename: with zipfile.ZipFile(filename, "r") as zip_ref: