Эх сурвалжийг харах

Adding tarfile member sanitization to extractall() (#69)

TrellixVulnTeam 2 жил өмнө
parent
commit
018b0e76d1

+ 20 - 1
paddlers/models/ppcls/utils/model_zoo.py

@@ -151,7 +151,26 @@ def _decompress(fname):
 
     if fname.find('tar') >= 0:
         with tarfile.open(fname) as tf:
-            tf.extractall(path=fpath_tmp)
+            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(tf, path=fpath_tmp)
     elif fname.find('zip') >= 0:
         with zipfile.ZipFile(fname) as zf:
             zf.extractall(path=fpath_tmp)

+ 20 - 1
paddlers/utils/download.py

@@ -151,7 +151,26 @@ def decompress(fname):
 
     if fname.find('tar') >= 0 or fname.find('tgz') >= 0:
         with tarfile.open(fname) as tf:
-            tf.extractall(path=fpath_tmp)
+            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(tf, path=fpath_tmp)
     elif fname.find('zip') >= 0:
         with zipfile.ZipFile(fname) as zf:
             zf.extractall(path=fpath_tmp)