Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CVE-2007-4559 Patch #67

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
45 changes: 43 additions & 2 deletions hcpannot/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,29 @@ def load_subdata(sid, h, load_path=None, osf_url=None):
outpath = os.path.join(load_path, 'annot-images')
import tarfile
with tarfile.open(path) as fl:
fl.extractall(outpath)

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(fl, outpath)
# We can go ahead and delete that tarball after we have extracted it;
# it's just a temporary file anyway.
os.remove(path)
Expand Down Expand Up @@ -345,7 +367,26 @@ def prep_legends(load_path=None, osf_url=None):
path = pp.local_path('annot-images', 'legends.tar.gz')
import tarfile
with tarfile.open(path) as fl:
fl.extractall(load_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(fl, load_path)
ims = {
h: pimms.lmap(
{cd['name']: curry_load_legimage(load_path, h, cd['legend'])
Expand Down