Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Exposed conditiion to report template and moved html encoding the TM.… #151

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

Merged
izar merged 1 commit into from
Apr 7, 2021
Merged

Exposed conditiion to report template and moved html encoding the TM.… #151

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
40 changes: 35 additions & 5 deletions pytm/pytm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import sys
import uuid
import html
import copy

from collections import Counter, defaultdict
from collections.abc import Iterable
Expand Down Expand Up @@ -534,6 +535,7 @@ class Finding:
example = varString("", required=True, doc="Threat example")
id = varString("", required=True, doc="Threat ID")
references = varString("", required=True, doc="Threat references")
condition = varString("", required=True, doc="Threat condition")
response = varString(
"",
required=False,
Expand Down Expand Up @@ -567,6 +569,7 @@ def __init__(
"example",
"id",
"references",
"condition",
]
threat = kwargs.pop("threat", None)
if threat:
Expand Down Expand Up @@ -658,9 +661,6 @@ def _add_threats(self):
threats_json = json.load(threat_file)

for i in threats_json:
for k, v in i.items():
if isinstance(v, str) and k != "condition":
i[k] = html.escape(i[k])
TM._threats.append(Threat(**i))

def resolve(self):
Expand Down Expand Up @@ -863,15 +863,20 @@ def report(self, template_path):
with open(template_path) as file:
template = file.read()


threats = encode_threat_data(TM._threats)
findings = encode_threat_data(self.findings)

data = {
"tm": self,
"dataflows": TM._flows,
"threats": TM._threats,
"findings": self.findings,
"threats": threats,
"findings": findings,
"elements": TM._elements,
"boundaries": TM._boundaries,
"data": TM._data,
}

return self._sf.format(template, **data)

def process(self):
Expand Down Expand Up @@ -1664,6 +1669,31 @@ def serialize(obj, nested=False):
result[i.lstrip("_")] = value
return result

def encode_threat_data(obj):
"""Used to html encode threat data from a list of threats or findings"""
encoded_threat_data = []

attrs = [
"description",
"details",
"severity",
"mitigations",
"example",
"id",
"references",
"condition",
]

for e in obj:
t = copy.deepcopy(e)

for a in attrs:
v = getattr(e, a)
setattr(t, a, html.escape(v))

encoded_threat_data.append(t)

return encoded_threat_data

def get_args():
_parser = argparse.ArgumentParser()
Expand Down