Merge branch 'master' into epiphyte-storm-http-errs

Author: vEpiphyte

changes/8077de946625725db35cb9af9e73bebf.yaml

@@ -0,0 +1,6 @@
+---
+desc: Added a ``targets`` light edge between ``risk:compromise`` and ``ou:industry``
+  forms.
+prs: []
+type: model
+...

changes/cb518ea29bf8bff1acbe52bb15faff73.yaml

@@ -0,0 +1,5 @@
+---
+desc: Added a ``uses`` light edge between ``it:prod:soft`` and ``risk:vuln`` forms.
+prs: []
+type: model
+...

synapse/models/infotech.py

@@ -1101,6 +1101,8 @@ def getModelDefs(self):
             'edges': (
                 (('it:prod:soft', 'uses', 'ou:technique'), {
                     'doc': 'The software uses the technique.'}),
+                (('it:prod:soft', 'uses', 'risk:vuln'), {
+                    'doc': 'The software uses the vulnerability.'}),
                 (('it:exec:query', 'found', None), {
                     'doc': 'The target node was returned as a result of running the query.'}),
                 (('it:app:snort:rule', 'detects', None), {

synapse/models/risk.py

@@ -211,6 +211,8 @@ def getModelDefs(self):
 
                 (('risk:attack', 'targets', 'ou:industry'), {
                     'doc': 'The attack targeted the industry.'}),
+                (('risk:compromise', 'targets', 'ou:industry'), {
+                    'doc': "The compromise was assessed to be based on the victim's role in the industry."}),
                 (('risk:threat', 'targets', 'ou:industry'), {
                     'doc': 'The threat cluster targets the industry.'}),