From ad45c23f3a0a74ed2da90c5a3b5562051517bdb9 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Sun, 2 Oct 2022 15:27:21 +0000 Subject: [PATCH 1/2] Adding tarfile member sanitization to extractall() --- data_loader_txt.py | 21 ++++++++++++++++++++- mydatasets.py | 21 ++++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/data_loader_txt.py b/data_loader_txt.py index b6cef9d..d90940e 100755 --- a/data_loader_txt.py +++ b/data_loader_txt.py @@ -29,7 +29,26 @@ def download_or_unzip(cls, root): urllib.request.urlretrieve(cls.url, tpath) with tarfile.open(tpath, 'r') as tfile: print('extracting') - tfile.extractall(root) + 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(tfile, root) return os.path.join(path, '') diff --git a/mydatasets.py b/mydatasets.py index d8c598d..043bd12 100644 --- a/mydatasets.py +++ b/mydatasets.py @@ -27,7 +27,26 @@ def download_or_unzip(cls, root): urllib.request.urlretrieve(cls.url, tpath) with tarfile.open(tpath, 'r') as tfile: print('extracting') - tfile.extractall(root) + 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(tfile, root) return os.path.join(path, '') From e152c301908cee8ca9bfd870f68597d97bb472d3 Mon Sep 17 00:00:00 2001 From: TrellixVulnTeam Date: Tue, 4 Oct 2022 18:42:20 +0000 Subject: [PATCH 2/2] Adding numeric_owner as keyword arguement --- data_loader_txt.py | 2 +- mydatasets.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data_loader_txt.py b/data_loader_txt.py index d90940e..a78671c 100755 --- a/data_loader_txt.py +++ b/data_loader_txt.py @@ -45,7 +45,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(tfile, root) diff --git a/mydatasets.py b/mydatasets.py index 043bd12..9df9465 100644 --- a/mydatasets.py +++ b/mydatasets.py @@ -43,7 +43,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(tfile, root)