Skip to content

CVE-2007-4559 Patch #41

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.

Sign up for GitHub

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

Open
TrellixVulnTeam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CVE-2007-4559 Patch #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/olympe/mission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,29 @@ def _open(self, mission, verify=True, raw=False, ca_pub_key_der=None):
verify = verify or bool(ca_pub_key_der)
with tempfile.TemporaryDirectory() as root_tmp_dir:
with tarfile.open(mission.filepath) as f:
f.extractall(root_tmp_dir)

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)


safe_extract(f, root_tmp_dir)
signature = None
for signature_path in Path(root_tmp_dir).glob("signature.ecdsa*"):
signature = MissionSignature.from_file(signature_path)
Expand All @@ -268,7 +290,26 @@ def _open(self, mission, verify=True, raw=False, ca_pub_key_der=None):
with tempfile.TemporaryDirectory() as payload_tmp_dir:
payload_proto_path = Path(payload_tmp_dir) / "share" / "protobuf"
with tarfile.open(Path(root_tmp_dir) / "payload.tar.gz") as f:
f.extractall(payload_tmp_dir)
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)


safe_extract(f, payload_tmp_dir)
features, messages, enums, modules = self._load_protos(
mission.filepath,
mission_json.uid,
Expand Down