From c2088e339ac2abd537623406187f442ff806dab6 Mon Sep 17 00:00:00 2001
From: Jan Was <jan@was.net.pl>
Date: Fri, 30 Apr 2021 19:32:28 +0000
Subject: [PATCH] Update docs

---
 docs/pytm/index.html | 282 +++++++++++++++++++++++++++++++++++--------
 docs/threats.md      |  12 +-
 2 files changed, 235 insertions(+), 59 deletions(-)

diff --git a/docs/pytm/index.html b/docs/pytm/index.html
index bde34e6..f54328a 100644
--- a/docs/pytm/index.html
+++ b/docs/pytm/index.html
@@ -191,7 +191,7 @@ <h3>Class variables</h3>
 
     port = varInt(-1, doc=&#34;Default TCP port for outgoing data flows&#34;)
     protocol = varString(&#34;&#34;, doc=&#34;Default network protocol for outgoing data flows&#34;)
-    data = varData([], doc=&#34;Default type of data in outgoing data flows&#34;)
+    data = varData([], doc=&#34;pytm.Data object(s) in outgoing data flows&#34;)
     inputs = varElements([], doc=&#34;incoming Dataflows&#34;)
     outputs = varElements([], doc=&#34;outgoing Dataflows&#34;)
     authenticatesDestination = varBool(
@@ -209,7 +209,8 @@ <h3>Class variables</h3>
     providesIntegrity = False
 
     def __init__(self, name, **kwargs):
-        super().__init__(name, **kwargs)</code></pre>
+        super().__init__(name, **kwargs)
+        TM._actors.append(self)</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">
@@ -260,7 +261,7 @@ <h3>Instance variables</h3>
 </dd>
 <dt id="pytm.Actor.data"><code class="name">var <span class="ident">data</span></code></dt>
 <dd>
-<div class="desc"><p>Default type of data in outgoing data flows</p></div>
+<div class="desc"><p>pytm.Data object(s) in outgoing data flows</p></div>
 <details class="source">
 <summary>
 <span>Expand source code</span>
@@ -512,8 +513,9 @@ <h3>Class variables</h3>
 
     name = varString(&#34;&#34;, required=True)
     description = varString(&#34;&#34;)
+    format = varString(&#34;&#34;)
     classification = varClassification(
-        Classification.PUBLIC,
+        Classification.UNKNOWN,
         required=True,
         doc=&#34;Level of classification for this piece of data&#34;,
     )
@@ -564,7 +566,13 @@ <h3>Class variables</h3>
         )
 
     def __str__(self):
-        return &#34;{0}({1})&#34;.format(type(self).__name__, self.name)</code></pre>
+        return &#34;{0}({1})&#34;.format(type(self).__name__, self.name)
+
+    def _safeset(self, attr, value):
+        try:
+            setattr(self, attr, value)
+        except ValueError:
+            pass</code></pre>
 </details>
 <h3>Instance variables</h3>
 <dl>
@@ -641,6 +649,22 @@ <h3>Instance variables</h3>
     return self.data.get(instance, self.default)</code></pre>
 </details>
 </dd>
+<dt id="pytm.Data.format"><code class="name">var <span class="ident">format</span></code></dt>
+<dd>
+<div class="desc"></div>
+<details class="source">
+<summary>
+<span>Expand source code</span>
+</summary>
+<pre><code class="python">def __get__(self, instance, owner):
+    # when x.d is called we get here
+    # instance = x
+    # owner = type(x)
+    if instance is None:
+        return self
+    return self.data.get(instance, self.default)</code></pre>
+</details>
+</dd>
 <dt id="pytm.Data.isCredentials"><code class="name">var <span class="ident">isCredentials</span></code></dt>
 <dd>
 <div class="desc"><p>Does the data contain authentication information,
@@ -787,7 +811,7 @@ <h3>Instance variables</h3>
         doc=&#34;TLS version used.&#34;,
     )
     protocol = varString(&#34;&#34;, doc=&#34;Protocol used in this data flow&#34;)
-    data = varData([], doc=&#34;Default type of data in incoming data flows&#34;)
+    data = varData([], doc=&#34;pytm.Data object(s) in incoming data flows&#34;)
     authenticatesDestination = varBool(
         False,
         doc=&#34;&#34;&#34;Verifies the identity of the destination,
@@ -823,11 +847,7 @@ <h3>Instance variables</h3>
     color = {color};
     fontcolor = {color};
     dir = {direction};
-    label = &lt;
-        &lt;table border=&#34;0&#34; cellborder=&#34;0&#34; cellpadding=&#34;2&#34;&gt;
-            &lt;tr&gt;&lt;td&gt;&lt;font color=&#34;{color}&#34;&gt;&lt;b&gt;{label}&lt;/b&gt;&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;
-        &lt;/table&gt;
-    &gt;;
+    label = &#34;{label}&#34;;
 ]
 &#34;&#34;&#34;
 
@@ -846,7 +866,7 @@ <h3>Instance variables</h3>
         label = self._label()
         if mergeResponses and self.response is not None:
             direction = &#34;both&#34;
-            label += &#34;&lt;br/&gt;&#34; + self.response._label()
+            label += &#34;\n&#34; + self.response._label()
 
         return self._dfd_template().format(
             source=self.source._uniq_name(),
@@ -938,7 +958,7 @@ <h3>Instance variables</h3>
 </dd>
 <dt id="pytm.Dataflow.data"><code class="name">var <span class="ident">data</span></code></dt>
 <dd>
-<div class="desc"><p>Default type of data in incoming data flows</p></div>
+<div class="desc"><p>pytm.Data object(s) in incoming data flows</p></div>
 <details class="source">
 <summary>
 <span>Expand source code</span>
@@ -1293,18 +1313,33 @@ <h3>Methods</h3>
     def _dfd_template(self):
         return &#34;&#34;&#34;{uniq_name} [
     shape = {shape};
+    fixedsize = shape;
+    image = &#34;{image}&#34;;
+    imagescale = true;
     color = {color};
     fontcolor = {color};
-    label = &lt;
-        &lt;table sides=&#34;TB&#34; cellborder=&#34;0&#34; cellpadding=&#34;2&#34;&gt;
-            &lt;tr&gt;&lt;td&gt;&lt;b&gt;{label}&lt;/b&gt;&lt;/td&gt;&lt;/tr&gt;
-        &lt;/table&gt;
-    &gt;;
+    xlabel = &#34;{label}&#34;;
+    label = &#34;&#34;;
 ]
 &#34;&#34;&#34;
 
     def _shape(self):
-        return &#34;none&#34;</code></pre>
+        return &#34;none&#34;
+
+    def dfd(self, **kwargs):
+        self._is_drawn = True
+
+        levels = kwargs.get(&#34;levels&#34;, None)
+        if levels and not levels &amp; self.levels:
+            return &#34;&#34;
+
+        return self._dfd_template().format(
+            uniq_name=self._uniq_name(),
+            label=self._label(),
+            color=self._color(),
+            shape=self._shape(),
+            image=os.path.join(os.path.dirname(__file__), &#34;images&#34;, &#34;datastore.png&#34;),
+        )</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">
@@ -1586,8 +1621,7 @@ <h3>Instance variables</h3>
     minTLSVersion = varTLSVersion(
         TLSVersion.NONE,
         required=False,
-        doc=&#34;&#34;&#34;Minimum required TLS version required.
-Note that currently only TLS 1.2 and 1.3 are considered secure.&#34;&#34;&#34;,
+        doc=&#34;&#34;&#34;Minimum TLS version required.&#34;&#34;&#34;,
     )
     findings = varFindings([], doc=&#34;Threats that apply to this element&#34;)
     overrides = varFindings(
@@ -1596,6 +1630,11 @@ <h3>Instance variables</h3>
 a custom response, CVSS score or override other attributes.&#34;&#34;&#34;,
     )
     levels = varInts({0}, doc=&#34;List of levels (0, 1, 2, ...) to be drawn in the model.&#34;)
+    sourceFiles = varStrings(
+        [],
+        required=False,
+        doc=&#34;Location of the source code that describes this element relative to the directory of the model script.&#34;,
+    )
 
     def __init__(self, name, **kwargs):
         for key, value in kwargs.items():
@@ -1627,11 +1666,8 @@ <h3>Instance variables</h3>
     shape = {shape};
     color = {color};
     fontcolor = {color};
-    label = &lt;
-        &lt;table border=&#34;0&#34; cellborder=&#34;0&#34; cellpadding=&#34;2&#34;&gt;
-            &lt;tr&gt;&lt;td&gt;&lt;b&gt;{label}&lt;/b&gt;&lt;/td&gt;&lt;/tr&gt;
-        &lt;/table&gt;
-    &gt;;
+    label = &#34;{label}&#34;;
+    margin = 0.02;
 ]
 &#34;&#34;&#34;
 
@@ -1659,7 +1695,7 @@ <h3>Instance variables</h3>
         return self.name
 
     def _label(self):
-        return &#34;&lt;br/&gt;&#34;.join(wrap(self.display_name(), 18))
+        return &#34;\\n&#34;.join(wrap(self.display_name(), 18))
 
     def _shape(self):
         return &#34;square&#34;
@@ -1846,8 +1882,7 @@ <h3>Instance variables</h3>
 </dd>
 <dt id="pytm.Element.minTLSVersion"><code class="name">var <span class="ident">minTLSVersion</span></code></dt>
 <dd>
-<div class="desc"><p>Minimum required TLS version required.
-Note that currently only TLS 1.2 and 1.3 are considered secure.</p></div>
+<div class="desc"><p>Minimum TLS version required.</p></div>
 <details class="source">
 <summary>
 <span>Expand source code</span>
@@ -1894,6 +1929,22 @@ <h3>Instance variables</h3>
     return self.data.get(instance, self.default)</code></pre>
 </details>
 </dd>
+<dt id="pytm.Element.sourceFiles"><code class="name">var <span class="ident">sourceFiles</span></code></dt>
+<dd>
+<div class="desc"><p>Location of the source code that describes this element relative to the directory of the model script.</p></div>
+<details class="source">
+<summary>
+<span>Expand source code</span>
+</summary>
+<pre><code class="python">def __get__(self, instance, owner):
+    # when x.d is called we get here
+    # instance = x
+    # owner = type(x)
+    if instance is None:
+        return self
+    return self.data.get(instance, self.default)</code></pre>
+</details>
+</dd>
 </dl>
 <h3>Methods</h3>
 <dl>
@@ -2090,8 +2141,10 @@ <h3>Instance variables</h3>
     severity = varString(&#34;&#34;, required=True, doc=&#34;Threat severity&#34;)
     mitigations = varString(&#34;&#34;, required=True, doc=&#34;Threat mitigations&#34;)
     example = varString(&#34;&#34;, required=True, doc=&#34;Threat example&#34;)
-    id = varString(&#34;&#34;, required=True, doc=&#34;Threat ID&#34;)
+    id = varInt(&#34;&#34;, required=True, doc=&#34;Finding ID&#34;)
+    threat_id = varString(&#34;&#34;, required=True, doc=&#34;Threat ID&#34;)
     references = varString(&#34;&#34;, required=True, doc=&#34;Threat references&#34;)
+    condition = varString(&#34;&#34;, required=True, doc=&#34;Threat condition&#34;)
     response = varString(
         &#34;&#34;,
         required=False,
@@ -2123,18 +2176,19 @@ <h3>Instance variables</h3>
             &#34;severity&#34;,
             &#34;mitigations&#34;,
             &#34;example&#34;,
-            &#34;id&#34;,
             &#34;references&#34;,
+            &#34;condition&#34;,
         ]
         threat = kwargs.pop(&#34;threat&#34;, None)
         if threat:
+            kwargs[&#34;threat_id&#34;] = getattr(threat, &#34;id&#34;)
             for a in attrs:
                 # copy threat attrs into kwargs to allow to override them in next step
                 kwargs[a] = getattr(threat, a)
 
-        threat_id = kwargs.get(&#34;id&#34;, None)
+        threat_id = kwargs.get(&#34;threat_id&#34;, None)
         for f in element.overrides:
-            if f.id != threat_id:
+            if f.threat_id != threat_id:
                 continue
             for i in dir(f.__class__):
                 attr = getattr(f.__class__, i)
@@ -2152,6 +2206,12 @@ <h3>Instance variables</h3>
         for k, v in kwargs.items():
             setattr(self, k, v)
 
+    def _safeset(self, attr, value):
+        try:
+            setattr(self, attr, value)
+        except ValueError:
+            pass
+
     def __repr__(self):
         return &#34;&lt;{0}.{1}({2}) at {3}&gt;&#34;.format(
             self.__module__, type(self).__name__, self.id, hex(id(self))
@@ -2162,6 +2222,22 @@ <h3>Instance variables</h3>
 </details>
 <h3>Instance variables</h3>
 <dl>
+<dt id="pytm.Finding.condition"><code class="name">var <span class="ident">condition</span></code></dt>
+<dd>
+<div class="desc"><p>Threat condition</p></div>
+<details class="source">
+<summary>
+<span>Expand source code</span>
+</summary>
+<pre><code class="python">def __get__(self, instance, owner):
+    # when x.d is called we get here
+    # instance = x
+    # owner = type(x)
+    if instance is None:
+        return self
+    return self.data.get(instance, self.default)</code></pre>
+</details>
+</dd>
 <dt id="pytm.Finding.cvss"><code class="name">var <span class="ident">cvss</span></code></dt>
 <dd>
 <div class="desc"><p>The CVSS score and/or vector</p></div>
@@ -2244,7 +2320,7 @@ <h3>Instance variables</h3>
 </dd>
 <dt id="pytm.Finding.id"><code class="name">var <span class="ident">id</span></code></dt>
 <dd>
-<div class="desc"><p>Threat ID</p></div>
+<div class="desc"><p>Finding ID</p></div>
 <details class="source">
 <summary>
 <span>Expand source code</span>
@@ -2343,6 +2419,22 @@ <h3>Instance variables</h3>
     return self.data.get(instance, self.default)</code></pre>
 </details>
 </dd>
+<dt id="pytm.Finding.threat_id"><code class="name">var <span class="ident">threat_id</span></code></dt>
+<dd>
+<div class="desc"><p>Threat ID</p></div>
+<details class="source">
+<summary>
+<span>Expand source code</span>
+</summary>
+<pre><code class="python">def __get__(self, instance, owner):
+    # when x.d is called we get here
+    # instance = x
+    # owner = type(x)
+    if instance is None:
+        return self
+    return self.data.get(instance, self.default)</code></pre>
+</details>
+</dd>
 </dl>
 </dd>
 <dt id="pytm.Lambda"><code class="flex name class">
@@ -2368,9 +2460,7 @@ <h3>Instance variables</h3>
     def _dfd_template(self):
         return &#34;&#34;&#34;{uniq_name} [
     shape = {shape};
-    fixedsize = shape;
-    image = &#34;{image}&#34;;
-    imagescale = true;
+
     color = {color};
     fontcolor = {color};
     label = &lt;
@@ -2393,11 +2483,10 @@ <h3>Instance variables</h3>
             label=self._label(),
             color=self._color(),
             shape=self._shape(),
-            image=os.path.join(os.path.dirname(__file__), &#34;images&#34;, &#34;lambda.png&#34;),
         )
 
     def _shape(self):
-        return &#34;none&#34;</code></pre>
+        return &#34;rectangle; style=rounded&#34;</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">
@@ -3435,6 +3524,8 @@ <h3>Class variables</h3>
 
     _flows = []
     _elements = []
+    _actors = []
+    _assets = []
     _threats = []
     _boundaries = []
     _data = []
@@ -3471,6 +3562,8 @@ <h3>Class variables</h3>
     def reset(cls):
         cls._flows = []
         cls._elements = []
+        cls._actors = []
+        cls._assets = []
         cls._threats = []
         cls._boundaries = []
         cls._data = []
@@ -3487,24 +3580,29 @@ <h3>Class variables</h3>
             TM._threats.append(Threat(**i))
 
     def resolve(self):
+        finding_count = 0
         findings = []
         elements = defaultdict(list)
         for e in TM._elements:
             if not e.inScope:
                 continue
 
-            override_ids = set(f.id for f in e.overrides)
+            override_ids = set(f.threat_id for f in e.overrides)
             # if element is a dataflow filter out overrides from source and sink
             # because they will be always applied there anyway
             try:
-                override_ids -= set(f.id for f in e.source.overrides + e.sink.overrides)
+                override_ids -= set(
+                    f.threat_id for f in e.source.overrides + e.sink.overrides
+                )
             except AttributeError:
                 pass
 
             for t in TM._threats:
                 if not t.apply(e) and t.id not in override_ids:
                     continue
-                f = Finding(e, threat=t)
+
+                finding_count += 1
+                f = Finding(e, id=finding_count, threat=t)
                 findings.append(f)
                 elements[e].append(f)
         self.findings = findings
@@ -3525,7 +3623,7 @@ <h3>Class variables</h3>
         _apply_defaults(TM._flows, TM._data)
 
         for e in TM._elements:
-            top = Counter(f.id for f in e.overrides).most_common(1)
+            top = Counter(f.threat_id for f in e.overrides).most_common(1)
             if not top:
                 continue
             threat_id, count = top[0]
@@ -3686,15 +3784,21 @@ <h3>Class variables</h3>
         with open(template_path) as file:
             template = file.read()
 
+        threats = encode_threat_data(TM._threats)
+        findings = encode_threat_data(self.findings)
+
         data = {
             &#34;tm&#34;: self,
             &#34;dataflows&#34;: TM._flows,
-            &#34;threats&#34;: TM._threats,
-            &#34;findings&#34;: self.findings,
+            &#34;threats&#34;: threats,
+            &#34;findings&#34;: findings,
             &#34;elements&#34;: TM._elements,
+            &#34;assets&#34;: TM._assets,
+            &#34;actors&#34;: TM._actors,
             &#34;boundaries&#34;: TM._boundaries,
             &#34;data&#34;: TM._data,
         }
+
         return self._sf.format(template, **data)
 
     def process(self):
@@ -3715,6 +3819,7 @@ <h3>Class variables</h3>
             result.report is not None
             or result.json is not None
             or result.sqldump is not None
+            or result.stale_days is not None
         ):
             self.resolve()
 
@@ -3737,6 +3842,50 @@ <h3>Class variables</h3>
         if result.list is True:
             [print(&#34;{} - {}&#34;.format(t.id, t.description)) for t in TM._threats]
 
+        if result.stale_days is not None:
+            print(self._stale(result.stale_days))
+
+    def _stale(self, days):
+        try:
+            base_path = os.path.dirname(sys.argv[0])
+            tm_mtime = datetime.fromtimestamp(
+                os.stat(base_path + f&#34;/{sys.argv[0]}&#34;).st_mtime
+            )
+        except os.error as err:
+            sys.stderr.write(f&#34;{sys.argv[0]} - {err}\n&#34;)
+            sys.stderr.flush()
+            return &#34;[ERROR]&#34;
+
+        print(f&#34;Checking for code {days} days older than this model.&#34;)
+
+        for e in TM._elements:
+
+            for src in e.sourceFiles:
+                try:
+                    src_mtime = datetime.fromtimestamp(
+                        os.stat(base_path + f&#34;/{src}&#34;).st_mtime
+                    )
+                except os.error as err:
+                    sys.stderr.write(f&#34;{sys.argv[0]} - {err}\n&#34;)
+                    sys.stderr.flush()
+                    continue
+
+                age = (src_mtime - tm_mtime).days
+
+                # source code is older than model by more than the speficied delta
+                if (age) &gt;= days:
+                    print(f&#34;This model is {age} days older than {base_path}/{src}.&#34;)
+                elif age &lt;= -days:
+                    print(
+                        f&#34;Model script {sys.argv[0]}&#34;
+                        + &#34; is only &#34;
+                        + str(-1 * age)
+                        + &#34; days newer than source code file &#34;
+                        + f&#34;{base_path}/{src}&#34;
+                    )
+
+        return &#34;&#34;
+
     def sqlDump(self, filename):
         try:
             rmtree(&#34;./sqldump&#34;)
@@ -3772,7 +3921,7 @@ <h3>Class variables</h3>
             for k, v in serialize(e).items():
                 if k == &#34;id&#34;:
                     k = &#34;SID&#34;
-                row[k] = &#34;, &#34;.join(v) if isinstance(v, list) else v
+                row[k] = &#34;, &#34;.join(str(i) for i in v) if isinstance(v, list) else v
             db[table].bulk_insert([row])
 
         db.close()
@@ -3802,6 +3951,8 @@ <h3>Static methods</h3>
 def reset(cls):
     cls._flows = []
     cls._elements = []
+    cls._actors = []
+    cls._assets = []
     cls._threats = []
     cls._boundaries = []
     cls._data = []</code></pre>
@@ -3989,6 +4140,7 @@ <h3>Methods</h3>
         result.report is not None
         or result.json is not None
         or result.sqldump is not None
+        or result.stale_days is not None
     ):
         self.resolve()
 
@@ -4009,7 +4161,10 @@ <h3>Methods</h3>
         _describe_classes(result.describe.split())
 
     if result.list is True:
-        [print(&#34;{} - {}&#34;.format(t.id, t.description)) for t in TM._threats]</code></pre>
+        [print(&#34;{} - {}&#34;.format(t.id, t.description)) for t in TM._threats]
+
+    if result.stale_days is not None:
+        print(self._stale(result.stale_days))</code></pre>
 </details>
 </dd>
 <dt id="pytm.TM.report"><code class="name flex">
@@ -4025,15 +4180,21 @@ <h3>Methods</h3>
     with open(template_path) as file:
         template = file.read()
 
+    threats = encode_threat_data(TM._threats)
+    findings = encode_threat_data(self.findings)
+
     data = {
         &#34;tm&#34;: self,
         &#34;dataflows&#34;: TM._flows,
-        &#34;threats&#34;: TM._threats,
-        &#34;findings&#34;: self.findings,
+        &#34;threats&#34;: threats,
+        &#34;findings&#34;: findings,
         &#34;elements&#34;: TM._elements,
+        &#34;assets&#34;: TM._assets,
+        &#34;actors&#34;: TM._actors,
         &#34;boundaries&#34;: TM._boundaries,
         &#34;data&#34;: TM._data,
     }
+
     return self._sf.format(template, **data)</code></pre>
 </details>
 </dd>
@@ -4047,24 +4208,29 @@ <h3>Methods</h3>
 <span>Expand source code</span>
 </summary>
 <pre><code class="python">def resolve(self):
+    finding_count = 0
     findings = []
     elements = defaultdict(list)
     for e in TM._elements:
         if not e.inScope:
             continue
 
-        override_ids = set(f.id for f in e.overrides)
+        override_ids = set(f.threat_id for f in e.overrides)
         # if element is a dataflow filter out overrides from source and sink
         # because they will be always applied there anyway
         try:
-            override_ids -= set(f.id for f in e.source.overrides + e.sink.overrides)
+            override_ids -= set(
+                f.threat_id for f in e.source.overrides + e.sink.overrides
+            )
         except AttributeError:
             pass
 
         for t in TM._threats:
             if not t.apply(e) and t.id not in override_ids:
                 continue
-            f = Finding(e, threat=t)
+
+            finding_count += 1
+            f = Finding(e, id=finding_count, threat=t)
             findings.append(f)
             elements[e].append(f)
     self.findings = findings
@@ -4116,7 +4282,7 @@ <h3>Methods</h3>
         for k, v in serialize(e).items():
             if k == &#34;id&#34;:
                 k = &#34;SID&#34;
-            row[k] = &#34;, &#34;.join(v) if isinstance(v, list) else v
+            row[k] = &#34;, &#34;.join(str(i) for i in v) if isinstance(v, list) else v
         db[table].bulk_insert([row])
 
     db.close()</code></pre>
@@ -4167,6 +4333,12 @@ <h3>Methods</h3>
         self.example = kwargs.get(&#34;example&#34;, &#34;&#34;)
         self.references = kwargs.get(&#34;references&#34;, &#34;&#34;)
 
+    def _safeset(self, attr, value):
+        try:
+            setattr(self, attr, value)
+        except ValueError:
+            pass
+
     def __repr__(self):
         return &#34;&lt;{0}.{1}({2}) at {3}&gt;&#34;.format(
             self.__module__, type(self).__name__, self.id, hex(id(self))
@@ -4401,6 +4573,7 @@ <h4><code><a title="pytm.Data" href="#pytm.Data">Data</a></code></h4>
 <li><code><a title="pytm.Data.classification" href="#pytm.Data.classification">classification</a></code></li>
 <li><code><a title="pytm.Data.credentialsLife" href="#pytm.Data.credentialsLife">credentialsLife</a></code></li>
 <li><code><a title="pytm.Data.description" href="#pytm.Data.description">description</a></code></li>
+<li><code><a title="pytm.Data.format" href="#pytm.Data.format">format</a></code></li>
 <li><code><a title="pytm.Data.isCredentials" href="#pytm.Data.isCredentials">isCredentials</a></code></li>
 <li><code><a title="pytm.Data.isDestEncryptedAtRest" href="#pytm.Data.isDestEncryptedAtRest">isDestEncryptedAtRest</a></code></li>
 <li><code><a title="pytm.Data.isPII" href="#pytm.Data.isPII">isPII</a></code></li>
@@ -4477,6 +4650,7 @@ <h4><code><a title="pytm.Element" href="#pytm.Element">Element</a></code></h4>
 <li><code><a title="pytm.Element.name" href="#pytm.Element.name">name</a></code></li>
 <li><code><a title="pytm.Element.oneOf" href="#pytm.Element.oneOf">oneOf</a></code></li>
 <li><code><a title="pytm.Element.overrides" href="#pytm.Element.overrides">overrides</a></code></li>
+<li><code><a title="pytm.Element.sourceFiles" href="#pytm.Element.sourceFiles">sourceFiles</a></code></li>
 </ul>
 </li>
 <li>
@@ -4488,6 +4662,7 @@ <h4><code><a title="pytm.ExternalEntity" href="#pytm.ExternalEntity">ExternalEnt
 <li>
 <h4><code><a title="pytm.Finding" href="#pytm.Finding">Finding</a></code></h4>
 <ul class="two-column">
+<li><code><a title="pytm.Finding.condition" href="#pytm.Finding.condition">condition</a></code></li>
 <li><code><a title="pytm.Finding.cvss" href="#pytm.Finding.cvss">cvss</a></code></li>
 <li><code><a title="pytm.Finding.description" href="#pytm.Finding.description">description</a></code></li>
 <li><code><a title="pytm.Finding.details" href="#pytm.Finding.details">details</a></code></li>
@@ -4499,6 +4674,7 @@ <h4><code><a title="pytm.Finding" href="#pytm.Finding">Finding</a></code></h4>
 <li><code><a title="pytm.Finding.response" href="#pytm.Finding.response">response</a></code></li>
 <li><code><a title="pytm.Finding.severity" href="#pytm.Finding.severity">severity</a></code></li>
 <li><code><a title="pytm.Finding.target" href="#pytm.Finding.target">target</a></code></li>
+<li><code><a title="pytm.Finding.threat_id" href="#pytm.Finding.threat_id">threat_id</a></code></li>
 </ul>
 </li>
 <li>
diff --git a/docs/threats.md b/docs/threats.md
index cbf91cf..33853d0 100644
--- a/docs/threats.md
+++ b/docs/threats.md
@@ -228,7 +228,7 @@ An attacker targets a system that uses JavaScript Object Notation (JSON) as a tr
   <dd>https://capec.mitre.org/data/definitions/111.html, http://cwe.mitre.org/data/definitions/345.html, http://cwe.mitre.org/data/definitions/346.html, http://cwe.mitre.org/data/definitions/352.html</dd>
 
   <dt>Condition</dt>
-  <dd>target.implementsNonce is False and target.data =='JSON'</dd>
+  <dd>target.implementsNonce is False and any(d.format == 'JSON' for d in target.data)</dd>
 </dl>
 
 
@@ -748,7 +748,7 @@ An adversary corrupts or modifies the content of XML schema information passed b
   <dd>https://capec.mitre.org/data/definitions/146.html, http://cwe.mitre.org/data/definitions/15.html, http://cwe.mitre.org/data/definitions/472.html</dd>
 
   <dt>Condition</dt>
-  <dd>target.data == 'XML' and target.authorizesSource is False</dd>
+  <dd>any(d.format == 'XML' for d in target.data) and target.authorizesSource is False</dd>
 </dl>
 
 
@@ -774,7 +774,7 @@ An attacker initiates a resource depletion attack where a large number of small
   <dd>https://capec.mitre.org/data/definitions/147.html, http://cwe.mitre.org/data/definitions/400.html, http://cwe.mitre.org/data/definitions/770.html</dd>
 
   <dt>Condition</dt>
-  <dd>target.data == 'XML'</dd>
+  <dd>any(d.format == 'XML' for d in target.data)</dd>
 </dl>
 
 
@@ -1268,7 +1268,7 @@ An attacker submits an XML document to a target application where the XML docume
   <dd>https://capec.mitre.org/data/definitions/197.html, http://cwe.mitre.org/data/definitions/400.html, http://cwe.mitre.org/data/definitions/770.html</dd>
 
   <dt>Condition</dt>
-  <dd>target.data == 'XML' and target.handlesResources is False</dd>
+  <dd>any(d.format == 'XML' for d in target.data) and target.handlesResources is False</dd>
 </dl>
 
 
@@ -1606,7 +1606,7 @@ An attacker subverts an intermediate system used to process XML content and forc
   <dd>https://capec.mitre.org/data/definitions/219.html</dd>
 
   <dt>Condition</dt>
-  <dd>target.protocol == 'HTTP' and target.data =='XML'</dd>
+  <dd>target.protocol == 'HTTP' and any(d.format == 'XML' for d in target.data)</dd>
 </dl>
 
 
@@ -2620,7 +2620,7 @@ An attacker can access data in transit or at rest that is not sufficiently prote
   <dd>https://cwe.mitre.org/data/definitions/311.html, https://cwe.mitre.org/data/definitions/312.html, https://cwe.mitre.org/data/definitions/916.html, https://cwe.mitre.org/data/definitions/653.html</dd>
 
   <dt>Condition</dt>
-  <dd>target.hasDataLeaks</dd>
+  <dd>target.hasDataLeaks()</dd>
 </dl>