From dbecacee774d2ce2300928b56fd66e7a0d31f5c2 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Thu, 29 Sep 2022 16:51:10 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- pyopenjtalk/__init__.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pyopenjtalk/__init__.py b/pyopenjtalk/__init__.py index 299ac29..6e53507 100644 --- a/pyopenjtalk/__init__.py +++ b/pyopenjtalk/__init__.py @@ -67,7 +67,26 @@ def _extract_dic(): t.total = t.n print("Extracting tar file {}".format(filename)) with tarfile.open(filename, mode="r|gz") as f: - f.extractall(path=pkg_resources.resource_filename(__name__, "")) + 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) + + + safe_extract(f, path=pkg_resources.resource_filename(__name__,"")) OPEN_JTALK_DICT_DIR = pkg_resources.resource_filename( __name__, "open_jtalk_dic_utf_8-1.11" ).encode("utf-8") From 35bd6ab97d5821acd0c4f2c6e495ec41e1b69411 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Mon, 3 Oct 2022 19:01:06 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- pyopenjtalk/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyopenjtalk/__init__.py b/pyopenjtalk/__init__.py index 6e53507..c151244 100644 --- a/pyopenjtalk/__init__.py +++ b/pyopenjtalk/__init__.py @@ -83,7 +83,7 @@ def safe_extract(tar, path=".", members=None, *, numeric_owner=False): if not is_within_directory(path, member_path): raise Exception("Attempted Path Traversal in Tar File") - tar.extractall(path, members, numeric_owner) + tar.extractall(path, members, numeric_owner=numeric_owner) safe_extract(f, path=pkg_resources.resource_filename(__name__,""))