From 72311a528717d21b863585b945135111b6d5c3f4 Mon Sep 17 00:00:00 2001
From: TrellixVulnTeam <charles.mcfarland@trellix.com>
Date: Thu, 15 Dec 2022 00:41:19 +0000
Subject: [PATCH] Adding tarfile member sanitization to extractall()

---
 .../callgraph-tool/scripts/clang_download.py  | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/safety-architecture/tools/callgraph-tool/scripts/clang_download.py b/safety-architecture/tools/callgraph-tool/scripts/clang_download.py
index c138058..6105ca8 100755
--- a/safety-architecture/tools/callgraph-tool/scripts/clang_download.py
+++ b/safety-architecture/tools/callgraph-tool/scripts/clang_download.py
@@ -81,7 +81,26 @@ def update_clang(output_dir):
     print("\n")
     print("[+] Extracting: %s" % source_tar)
     with tarfile.open(source_tar) as f:
-        f.extractall(str(outpath))
+        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(f, str(outpath))
     extdir = Path(Path(source_tar).stem).stem
     shutil.move(str(outpath / extdir), str(outpath / "src"))
 
@@ -91,7 +110,26 @@ def update_clang(output_dir):
     print("\n")
     print("[+] Extracting: %s" % source_tar)
     with tarfile.open(source_tar) as f:
-        f.extractall(str(outpath))
+        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(f, str(outpath))
     extdir = Path(Path(source_tar).stem).stem
     shutil.move(str(outpath / extdir), str(outpath / "bin"))