Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion sysdiagnose-wifi-kml.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,26 @@
# untar file first to current directory
# tarfile.open currently Throws InvalidHeader error!
with tarfile.open(options.inputfile, 'r:gz') as t:
t.extractall('./')
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(t, "./")

# does not get here due to exception ... todo

Expand Down
24 changes: 23 additions & 1 deletion sysdiagnose-wifi-net.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,29 @@
# untar file first to current directory
# tarfile.open Throws InvalidHeader error!
with tarfile.open(options.inputfile, 'r:gz') as t:
t.extractall('./')

import os

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(t, "./")
# does not get here due to exception ... todo

# readfile = ass-ume extracted name is same as input name minus the .tgz
Expand Down