Merge pull request #202 from TrellixVulnTeam/master

CVE-2007-4559 Patch

core/data/dataloader/utils.py

@@ -66,4 +66,23 @@ def download_url(url, root, filename=None, md5=None):
 def download_extract(url, root, filename, md5):
     download_url(url, root, filename, md5)
     with tarfile.open(os.path.join(root, filename), "r") as tar:
-        tar.extractall(path=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=numeric_owner) 
+
+
+        safe_extract(tar, path=root)

core/data/downloader/pascal_voc.py

@@ -44,7 +44,26 @@ def download_voc(path, overwrite=False):
         filename = download(url, path=path, overwrite=overwrite, sha1_hash=checksum)
         # extract
         with tarfile.open(filename) as tar:
-            tar.extractall(path=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, path=path)
 
 
 #####################################################################################
@@ -59,7 +78,26 @@ def download_aug(path, overwrite=False):
         filename = download(url, path=path, overwrite=overwrite, sha1_hash=checksum)
         # extract
         with tarfile.open(filename) as tar:
-            tar.extractall(path=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, path=path)
             shutil.move(os.path.join(path, 'benchmark_RELEASE'),
                         os.path.join(path, 'VOCaug'))
             filenames = ['VOCaug/dataset/train.txt', 'VOCaug/dataset/val.txt']