From 459929f24db1c3f3d53f05f6fa4e9485caf7e010 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 2 Oct 2022 07:35:21 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- src/ial_build/pygmkpack.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/ial_build/pygmkpack.py b/src/ial_build/pygmkpack.py index 620ad61..c53d7a3 100644 --- a/src/ial_build/pygmkpack.py +++ b/src/ial_build/pygmkpack.py @@ -490,7 +490,26 @@ def _ics_insert(self, program, pattern, lines, offset=1): def populate_from_tar(self, tar): """Populate the incremental pack with the contents of a **tar** file.""" with tarfile.open(tar, 'r') as t: - t.extractall(path=self._local) + 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(t, path=self._local) def populate_from_files_in_dir(self, list_of_files, directory): """ From 57b887ecea8041e2b3f170b389a47843b5c648bb Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 16:12:37 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- src/ial_build/pygmkpack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ial_build/pygmkpack.py b/src/ial_build/pygmkpack.py index c53d7a3..ac8e57d 100644 --- a/src/ial_build/pygmkpack.py +++ b/src/ial_build/pygmkpack.py @@ -506,7 +506,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(t, path=self._local)