synapse 2.190.0__py311-none-any.whl → 2.191.0__py311-none-any.whl

synapse/models/person.py

@@ -377,10 +377,12 @@ class PsModule(s_module.CoreModule):
                         'doc': 'The service accounts associated with this contact.'}),
 
                     ('web:acct', ('inet:web:acct', {}), {
-                        'doc': 'The social media account for this contact.',
+                        'deprecated': True,
+                        'doc': 'Deprecated. Use :service:accounts.',
                     }),
                     ('web:group', ('inet:web:group', {}), {
-                        'doc': 'A web group representing this contact.',
+                        'deprecated': True,
+                        'doc': 'Deprecated. Use inet:service:group:profile to link to a group.',
                     }),
                     ('birth:place', ('geo:place', {}), {
                         'doc': 'A fully resolved place of birth for this contact.',
@@ -463,7 +465,8 @@ class PsModule(s_module.CoreModule):
                         'doc': 'An array of secondary/associated email addresses.',
                     }),
                     ('web:accts', ('array', {'type': 'inet:web:acct', 'uniq': True, 'sorted': True}), {
-                        'doc': 'An array of secondary/associated web accounts.',
+                        'deprecated': True,
+                        'doc': 'Deprecated. Use :service:accounts.',
                     }),
                     ('id:numbers', ('array', {'type': 'ou:id:number', 'uniq': True, 'sorted': True}), {
                         'doc': 'An array of secondary/associated IDs.',
@@ -511,7 +514,11 @@ class PsModule(s_module.CoreModule):
                         'doc': 'The file from which the contact list was extracted.',
                     }),
                     ('source:acct', ('inet:web:acct', {}), {
-                        'doc': 'The web account from which the contact list was extracted.',
+                        'deprecated': True,
+                        'doc': 'Deprecated. Use :source:account.',
+                    }),
+                    ('source:account', ('inet:service:account', {}), {
+                        'doc': 'The service account from which the contact list was extracted.',
                     }),
                 )),
 

synapse/models/risk.py

@@ -279,6 +279,9 @@ class RiskModule(s_module.CoreModule):
                     ('active', ('ival', {}), {
                         'doc': 'An interval for when the threat cluster is assessed to have been active.'}),
 
+                    ('activity', ('meta:activity', {}), {
+                        'doc': 'The most recently assessed activity level of the threat cluster.'}),
+
                     ('reporter', ('ou:org', {}), {
                         'doc': 'The organization reporting on the threat cluster.'}),
 
@@ -1078,6 +1081,9 @@ class RiskModule(s_module.CoreModule):
                         'ex': 'nature.earthquake',
                         'doc': 'The outage cause type.'}),
 
+                    ('attack', ('risk:attack', {}), {
+                        'doc': 'An attack which caused the outage.'}),
+
                     ('provider', ('ou:org', {}), {
                         'doc': 'The organization which experienced the outage event.'}),
 

synapse/models/syn.py

@@ -83,23 +83,28 @@ class SynModule(s_module.CoreModule):
 
     async def _liftRuntSynCmd(self, full, valu=None, cmpr=None, view=None):
 
-        genr = self.core.stormcmds.values
+        def iterStormCmds():
+            for item in self.core.getStormCmds():
+                yield item[1]
 
-        async for node in self._doRuntLift(genr, full, valu, cmpr):
+        async for node in self._doRuntLift(iterStormCmds, full, valu, cmpr):
             yield node
 
     async def _liftRuntSynCron(self, full, valu=None, cmpr=None, view=None):
 
-        genr = self.core.agenda.appts.values
+        def iterAppts():
+            for item in self.core.agenda.list():
+                yield item[1]
 
-        async for node in self._doRuntLift(genr, full, valu, cmpr):
+        async for node in self._doRuntLift(iterAppts, full, valu, cmpr):
             yield node
 
     async def _liftRuntSynForm(self, full, valu=None, cmpr=None, view=None):
 
-        genr = self.model.forms.values
+        def getForms():
+            return list(self.model.forms.values())
 
-        async for node in self._doRuntLift(genr, full, valu, cmpr):
+        async for node in self._doRuntLift(getForms, full, valu, cmpr):
             yield node
 
     async def _liftRuntSynProp(self, full, valu=None, cmpr=None, view=None):
@@ -111,24 +116,29 @@ class SynModule(s_module.CoreModule):
 
     async def _liftRuntSynType(self, full, valu=None, cmpr=None, view=None):
 
-        genr = self.model.types.values
+        def getTypes():
+            return list(self.model.types.values())
 
-        async for node in self._doRuntLift(genr, full, valu, cmpr):
+        async for node in self._doRuntLift(getTypes, full, valu, cmpr):
             yield node
 
     async def _liftRuntSynTagProp(self, full, valu=None, cmpr=None, view=None):
 
-        genr = self.model.tagprops.values
+        def getTagProps():
+            return list(self.model.tagprops.values())
 
-        async for node in self._doRuntLift(genr, full, valu, cmpr):
+        async for node in self._doRuntLift(getTagProps, full, valu, cmpr):
             yield node
 
     async def _liftRuntSynTrigger(self, full, valu=None, cmpr=None, view=None):
 
         view = self.core.getView(iden=view)
-        genr = view.triggers.triggers.values
 
-        async for node in self._doRuntLift(genr, full, valu, cmpr):
+        def iterTriggers():
+            for item in view.triggers.list():
+                yield item[1]
+
+        async for node in self._doRuntLift(iterTriggers, full, valu, cmpr):
             yield node
 
     async def _doRuntLift(self, genr, full, valu=None, cmpr=None):

synapse/models/telco.py

@@ -376,7 +376,9 @@ class TelcoModule(s_module.CoreModule):
                     # User related data
                     ('name', ('ps:name', {}), {}),
                     ('email', ('inet:email', {}), {}),
-                    ('acct', ('inet:web:acct', {}), {}),
+                    ('acct', ('inet:web:acct', {}), {
+                        'doc': 'Deprecated, use :account.',
+                        'deprecated': True}),
 
                     ('account', ('inet:service:account', {}), {
                         'doc': 'The service account which is associated with the tracked device.'}),

synapse/tests/test_cortex.py

@@ -1,6 +1,5 @@
 import os
 import copy
-import json
 import time
 import asyncio
 import hashlib
@@ -36,10 +35,6 @@ from synapse.tests.utils import alist
 
 logger = logging.getLogger(__name__)
 
-def jsonlines(text):
-    lines = [k for k in text.split('\n') if k]
-    return [json.loads(line) for line in lines]
-
 class CortexTest(s_t_utils.SynTest):
     '''
     The tests that should be run with different types of layers
@@ -1117,8 +1112,7 @@ class CortexTest(s_t_utils.SynTest):
                 ''')
                 self.true(await stream.wait(6))
 
-            buf = stream.getvalue()
-            mesg = json.loads(buf.split('\n')[0])
+            mesg = stream.jsonlines()[0]
             self.eq(mesg.get('message'), f'Running dmon {iden}')
             self.eq(mesg.get('iden'), iden)
 
@@ -3368,8 +3362,7 @@ class CortexBasicTest(s_t_utils.SynTest):
                 await alist(core.storm('help foo', opts={'show': ('init', 'fini', 'print',)}))
                 self.true(await stream.wait(4))
 
-            buf = stream.getvalue()
-            mesg = json.loads(buf.split('\n')[0])
+            mesg = stream.jsonlines()[0]
             self.eq(mesg.get('view'), view)
 
     async def test_strict(self):
@@ -7904,8 +7897,7 @@ class CortexBasicTest(s_t_utils.SynTest):
                     self.eq('admin', whoami)
                     self.eq('lowuser', udef.get('name'))
 
-                raw_mesgs = [m for m in stream.getvalue().split('\n') if m]
-                msgs = [json.loads(m) for m in raw_mesgs]
+                msgs = stream.jsonlines()
                 mesg = [m for m in msgs if 'Added user' in m.get('message')][0]
                 self.eq('Added user=lowuser', mesg.get('message'))
                 self.eq('admin', mesg.get('username'))
@@ -7919,8 +7911,7 @@ class CortexBasicTest(s_t_utils.SynTest):
                         msgs.append(mesg)
                     self.stormHasNoWarnErr(msgs)
 
-                raw_mesgs = [m for m in stream.getvalue().split('\n') if m]
-                msgs = [json.loads(m) for m in raw_mesgs]
+                msgs = stream.jsonlines()
                 mesg = [m for m in msgs if 'Set admin' in m.get('message')][0]
                 self.isin('Set admin=True for lowuser', mesg.get('message'))
                 self.eq('admin', mesg.get('username'))
@@ -8128,7 +8119,7 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                     data = stream.getvalue()
                     self.notin('Timeout', data)
-                    msgs = jsonlines(data)
+                    msgs = stream.jsonlines()
                     self.len(2, msgs)
 
                     self.eq(msgs[0].get('message'), f'Offloading Storm query to mirror 01.core.{ahanet}.')
@@ -8147,7 +8138,7 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                     data = stream.getvalue()
                     self.notin('Timeout', data)
-                    msgs = jsonlines(data)
+                    msgs = stream.jsonlines()
                     self.len(2, msgs)
 
                     self.eq(msgs[0].get('message'), f'Offloading Storm query to mirror 01.core.{ahanet}.')
@@ -8166,7 +8157,7 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                     data = stream.getvalue()
                     self.notin('Timeout', data)
-                    msgs = jsonlines(data)
+                    msgs = stream.jsonlines()
                     self.len(2, msgs)
 
                     self.eq(msgs[0].get('message'), f'Offloading Storm query to mirror 01.core.{ahanet}.')
@@ -8185,7 +8176,7 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                     data = stream.getvalue()
                     self.notin('Timeout', data)
-                    msgs = jsonlines(data)
+                    msgs = stream.jsonlines()
                     self.len(2, msgs)
 
                     self.eq(msgs[0].get('message'), f'Offloading Storm query to mirror 01.core.{ahanet}.')

synapse/tests/test_lib_agenda.py

@@ -1,4 +1,3 @@
-import json
 import asyncio
 import hashlib
 import datetime
@@ -9,8 +8,6 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.tests.utils as s_t_utils
 
-import synapse.lib.hive as s_hive
-import synapse.lib.lmdbslab as s_lmdbslab
 import synapse.tools.backup as s_tools_backup
 
 import synapse.lib.agenda as s_agenda
@@ -401,9 +398,7 @@ class AgendaTest(s_t_utils.SynTest):
                     self.eq((12, 'bar'), await asyncio.wait_for(core.callStorm('return($lib.queue.gen(visi).pop(wait=$lib.true))'), timeout=5))
                 core.stormlog = False
 
-                data = stream.getvalue()
-                raw_mesgs = [m for m in data.split('\n') if m]
-                msgs = [json.loads(m) for m in raw_mesgs]
+                msgs = stream.jsonlines()
                 msgs = [m for m in msgs if m['text'] == '$lib.queue.gen(visi).put(bar)']
                 self.gt(len(msgs), 0)
                 for m in msgs:

synapse/tests/test_lib_cell.py

@@ -115,6 +115,14 @@ class EchoAuthApi(s_cell.CellApi):
         await self._reqUserAllowed(path)
         return True
 
+    @s_cell.adminapi()
+    async def adminOnly(self):
+        return True
+
+    @s_cell.adminapi(log=True)
+    async def adminOnlyLog(self, arg1, arg2, **kwargs):
+        return arg1, arg2, kwargs
+
 class EchoAuth(s_cell.Cell):
     cellapi = EchoAuthApi
 
@@ -428,6 +436,16 @@ class CellTest(s_t_utils.SynTest):
                     self.eq(info.get('user').get('name'), 'root')
                     self.eq(info.get('user').get('iden'), root.iden)
 
+                    # @adminApi methods are allowed
+                    self.true(await proxy.adminOnly())
+                    mesg = "Executing [EchoAuthApi.adminOnlyLog] as [root] with args [(1, 2)[{'three': 4}]"
+                    with self.getStructuredAsyncLoggerStream('synapse.lib.cell', mesg) as stream:
+                        self.eq(await proxy.adminOnlyLog(1, 2, three=4), (1, 2, {'three': 4}))
+                        self.true(await stream.wait(timeout=10))
+                    msgs = stream.jsonlines()
+                    self.len(1, msgs)
+                    self.eq('EchoAuthApi.adminOnlyLog', msgs[0].get('wrapped_func'))
+
                 visi = await echo.auth.addUser('visi')
                 await visi.setPasswd('foo')
                 await visi.addRule((True, ('foo', 'bar')))
@@ -454,6 +472,15 @@ class CellTest(s_t_utils.SynTest):
                     with self.raises(s_exc.NoSuchUser):
                         await proxy.getUserInfo('newp')
 
+                    # @adminApi methods are not allowed
+                    with self.raises(s_exc.AuthDeny) as cm:
+                        await proxy.adminOnly()
+                    self.eq(cm.exception.get('mesg'), 'User is not an admin [visi]')
+                    self.eq(cm.exception.get('user'), visi.iden)
+                    self.eq(cm.exception.get('username'), visi.name)
+                    with self.raises(s_exc.AuthDeny) as cm:
+                        await proxy.adminOnlyLog(1, 2, three=4)
+
                     # User cannot get authinfo for other items since they are
                     # not an admin or do not have those roles.
                     await self.asyncraises(s_exc.AuthDeny, proxy.getUserInfo('root'))
@@ -3064,10 +3091,7 @@ class CellTest(s_t_utils.SynTest):
                 async with self.getTestCore(conf={'health:sysctl:checks': True}):
                     pass
 
-        stream.seek(0)
-        data = stream.getvalue()
-        raw_mesgs = [m for m in data.split('\n') if m]
-        msgs = [json.loads(m) for m in raw_mesgs]
+        msgs = stream.jsonlines()
 
         self.len(1, msgs)
 

synapse/tests/test_lib_httpapi.py

@@ -1722,10 +1722,8 @@ class HttpApiTest(s_tests.SynTest):
 
     async def test_request_logging(self):
 
-        def get_mesg(stream):
-            data = stream.getvalue()
-            raw_mesgs = [m for m in data.split('\n') if m]
-            msgs = [json.loads(m) for m in raw_mesgs]
+        def get_mesg(stream: s_tests.AsyncStreamEvent) -> dict:
+            msgs = stream.jsonlines()
             self.len(1, msgs)
             return msgs[0]
 

synapse/tests/test_lib_lmdbslab.py

@@ -1,5 +1,4 @@
 import os
-import json
 import asyncio
 import pathlib
 import multiprocessing
@@ -15,7 +14,6 @@ import synapse.lib.lmdbslab as s_lmdbslab
 import synapse.lib.thisplat as s_thisplat
 
 import synapse.tests.utils as s_t_utils
-from synapse.tests.utils import alist
 
 def getFileMapCount(filename):
     filename = str(filename)
@@ -360,8 +358,7 @@ class LmdbSlabTest(s_t_utils.SynTest):
                         slab.put(b'\xff\xff\xff\xff' + s_common.guid(i).encode('utf8'), byts, db=foo)
                 self.true(await stream.wait(timeout=1))
 
-            data = stream.getvalue()
-            msgs = [json.loads(m) for m in data.split('\\n') if m]
+            msgs = stream.jsonlines()
             self.gt(len(msgs), 0)
             self.nn(msgs[0].get('delta'))
             self.nn(msgs[0].get('path'))

synapse/tests/test_lib_stormlib_cortex.py

@@ -304,9 +304,7 @@ $request.reply(206, headers=$headers, body=({"no":"body"}))
                     resp = await sess.get(url)
                     self.eq(resp.status, 200)
                     self.true(await stream.wait(timeout=12))
-                data = stream.getvalue()
-                raw_mesgs = [m for m in data.split('\n') if m]
-                msgs = [json.loads(m) for m in raw_mesgs]
+                msgs = stream.jsonlines()
                 self.eq(msgs[0].get('httpapi'), echoiden)
                 core.stormlog = False
 

synapse/tests/test_lib_stormlib_log.py

@@ -1,5 +1,3 @@
-import json
-
 import synapse.exc as s_exc
 
 import synapse.tests.utils as s_test
@@ -49,10 +47,7 @@ class LogTest(s_test.SynTest):
                 await core.callStorm('$lib.log.debug("struct1 message")')
                 await core.callStorm('$lib.log.debug("struct2 message", extra=({"key": "valu"}))')
                 self.true(await stream.wait(6))
-
-            data = stream.getvalue()
-            raw_mesgs = [m for m in data.split('\n') if m]
-            msgs = [json.loads(m) for m in raw_mesgs]
+            msgs = stream.jsonlines()
             self.len(2, msgs)
             mesg = msgs[0]
             self.eq(mesg.get('logger').get('name'), 'synapse.storm.log')

synapse/tests/test_lib_stormlib_model.py

@@ -704,3 +704,31 @@ class StormlibModelTest(s_test.SynTest):
             self.eq(nodes[0].get('cert'), cert3.ndef[1])
             self.isin('ssl.migration.three', nodes[0].tags)
             self.eq(nodes[0].nodedata, {'foo': None})
+
+    async def test_stormlib_model_migrations_inet_service_message_client(self):
+
+        async with self.getTestCore() as core:
+
+            await core.nodes('''[
+                (inet:service:message=* :client:address=1.2.3.4 :client=2.3.4.5)
+                (inet:service:message=* :client:address=3.4.5.6)
+                (inet:service:message=* :client=4.5.6.7)
+            ]''')
+
+            nodes = await core.nodes('''
+                inet:service:message
+                $lib.model.migration.s.inetServiceMessageClientAddress($node)
+            ''')
+
+            self.len(3, nodes)
+
+            for node in nodes:
+                self.none(node.get('client:address'))
+
+            exp = ['tcp://2.3.4.5', 'tcp://3.4.5.6', 'tcp://4.5.6.7']
+            self.sorteq(exp, [n.get('client') for n in nodes])
+
+            ndata = [n for n in nodes if await n.getData('migration:inet:service:message:client:address')]
+            self.len(1, ndata)
+            self.eq(ndata[0].get('client'), 'tcp://2.3.4.5')
+            self.eq(await ndata[0].getData('migration:inet:service:message:client:address'), 'tcp://1.2.3.4')

synapse/tests/test_lib_stormtypes.py

@@ -4920,8 +4920,7 @@ class StormTypesTest(s_test.SynTest):
                         unixtime += 7 * MINSECS
                         self.eq('m3', await getNextFoo())
                         self.true(await stream.wait(6))
-                    buf = stream.getvalue()
-                    mesg = json.loads(buf.split('\n')[0])
+                    mesg = stream.jsonlines()[0]
                     self.eq(mesg['message'], f'm3 cron {guid}')
                     self.eq(mesg['iden'], guid)
 

synapse/tests/test_lib_trigger.py

@@ -1,5 +1,4 @@
 import os
-import json
 import synapse.exc as s_exc
 import synapse.common as s_common
 
@@ -253,8 +252,8 @@ class TrigTest(s_t_utils.SynTest):
             with self.getStructuredAsyncLoggerStream('synapse.storm.log', 'test trigger') as stream:
                 await core.nodes('[ test:str=logit ]')
                 self.true(await stream.wait(6))
-            buf = stream.getvalue()
-            mesg = json.loads(buf.split('\n')[-2])
+            msgs = stream.jsonlines()
+            mesg = [m for m in msgs if m.get('iden') == tdef.get('iden')][0]
             self.eq(mesg['message'], f'test trigger {tdef.get("iden")}')
             self.eq(mesg['iden'], tdef.get('iden'))
 

synapse/tests/test_model_base.py

@@ -222,13 +222,23 @@ class BaseTest(s_t_utils.SynTest):
 
         async with self.getTestCore() as core:
 
-            nodes = await core.nodes('[meta:source="*" :name="FOO Bar" :type=osint :url="https://foo.bar/index.html"]')
+            nodes = await core.nodes('''
+                [meta:source="*"
+                    :name="FOO Bar"
+                    :type=osint
+                    :url="https://foo.bar/index.html"
+                    :ingest:latest=20241205
+                    :ingest:offset=17
+                ]
+            ''')
             self.len(1, nodes)
             sorc = nodes[0]
 
             self.eq(sorc.get('type'), 'osint')
             self.eq(sorc.get('name'), 'foo bar')
             self.eq(sorc.get('url'), 'https://foo.bar/index.html')
+            self.eq(sorc.get('ingest:offset'), 17)
+            self.eq(sorc.get('ingest:latest'), 1733356800000)
 
             valu = (sorc.ndef[1], ('inet:fqdn', 'woot.com'))
             nodes = await core.nodes('[meta:seen=$valu]', opts={'vars': {'valu': valu}})
@@ -330,7 +340,7 @@ class BaseTest(s_t_utils.SynTest):
                 'tel:mob:telem:ipv6', 'tel:mob:telem:wifi', 'tel:mob:telem:wifi:ssid',
                 'tel:mob:telem:wifi:bssid', 'tel:mob:telem:adid', 'tel:mob:telem:aaid',
                 'tel:mob:telem:idfa', 'tel:mob:telem:name', 'tel:mob:telem:email',
-                'tel:mob:telem:acct', 'tel:mob:telem:app', 'tel:mob:telem:data',
+                'tel:mob:telem:app', 'tel:mob:telem:data',
                 'inet:http:request:response:time', 'inet:http:request:response:code',
                 'inet:http:request:response:reason', 'inet:http:request:response:body',
                 'gov:us:cage:street', 'gov:us:cage:city', 'gov:us:cage:state', 'gov:us:cage:zip',

synapse/tests/test_model_inet.py

@@ -2958,10 +2958,12 @@ class InetModelTest(s_t_utils.SynTest):
                 :platform={ inet:service:platform=(slack,) }
                 :url="https://v.vtx.lk/slack"
                 :name="Synapse users slack"
+                :tenant={[ inet:service:tenant=({"id": "VS-31337"}) ]}
             ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
+            self.nn(nodes[0].get('tenant'))
             self.eq(nodes[0].ndef, ('inet:service:instance', s_common.guid(('vertex', 'slack'))))
             self.eq(nodes[0].get('id'), 'T2XK1223Y')
             self.eq(nodes[0].get('platform'), platform.ndef[1])
@@ -2976,6 +2978,7 @@ class InetModelTest(s_t_utils.SynTest):
                     :user=blackout
                     :email=blackout@vertex.link
                     :profile={ gen.ps.contact.email vertex.employee blackout@vertex.link }
+                    :tenant={[ inet:service:tenant=({"id": "VS-31337"}) ]}
                 )
 
                 (inet:service:account=(visi, account, vertex, slack)
@@ -2989,6 +2992,8 @@ class InetModelTest(s_t_utils.SynTest):
             accounts = await core.nodes(q)
             self.len(2, accounts)
 
+            self.nn(accounts[0].get('tenant'))
+
             profiles = await core.nodes('ps:contact')
             self.len(2, profiles)
             self.eq(profiles[0].get('email'), 'blackout@vertex.link')
@@ -3068,14 +3073,17 @@ class InetModelTest(s_t_utils.SynTest):
             [ inet:service:session=*
                 :creator=$blckiden
                 :period=(202405160900, 202405161055)
+                :http:session=*
             ]
             '''
             opts = {'vars': {'blckiden': blckacct.ndef[1]}}
             nodes = await core.nodes(q, opts=opts)
             self.len(1, nodes)
+            self.nn(nodes[0].get('http:session'))
             self.eq(nodes[0].get('creator'), blckacct.ndef[1])
             self.eq(nodes[0].get('period'), (1715850000000, 1715856900000))
             blcksess = nodes[0]
+            self.len(1, await core.nodes('inet:service:session -> inet:http:session'))
 
             q = '''
             [ inet:service:login=*
@@ -3407,3 +3415,18 @@ class InetModelTest(s_t_utils.SynTest):
 
             with self.raises(s_exc.BadTypeValu):
                 await core.nodes('[ inet:service:relationship=* :source={[it:dev:str=foo]} ]')
+
+            nodes = await core.nodes('''
+                [ inet:service:subscription=*
+                    :level=vertex.synapse.enterprise
+                    :pay:instrument={[ econ:bank:account=* :contact={[ ps:contact=* :name=visi]} ]}
+                    :subscriber={[ inet:service:tenant=({"id": "VS-31337"}) ]}
+                ]
+            ''')
+            self.len(1, nodes)
+            self.eq('vertex.synapse.enterprise.', nodes[0].get('level'))
+            self.eq('econ:bank:account', nodes[0].get('pay:instrument')[0])
+            self.eq('inet:service:tenant', nodes[0].get('subscriber')[0])
+            self.len(1, await core.nodes('inet:service:subscription -> inet:service:subscription:level:taxonomy'))
+            self.len(1, await core.nodes('inet:service:subscription :pay:instrument -> econ:bank:account'))
+            self.len(1, await core.nodes('inet:service:subscription :subscriber -> inet:service:tenant'))

synapse/tests/test_model_person.py

@@ -278,12 +278,14 @@ class PsModelTest(s_t_utils.SynTest):
                     :source:host=*
                     :source:file=*
                     :source:acct=(twitter.com, invisig0th)
+                    :source:account=(twitter.com, invisig0th)
             ]''')
             self.len(1, nodes)
             self.len(1, await core.nodes('ps:contactlist -> it:host'))
             self.len(1, await core.nodes('ps:contactlist -> file:bytes'))
             self.len(2, await core.nodes('ps:contactlist -> ps:contact'))
             self.len(1, await core.nodes('ps:contactlist -> inet:web:acct'))
+            self.len(1, await core.nodes('ps:contactlist -> inet:service:account'))
 
             nodes = await core.nodes('''[
                 ps:workhist = *

synapse/tests/test_model_risk.py

@@ -379,6 +379,7 @@ class RiskModelTest(s_t_utils.SynTest):
                     :desc=VTX-APT1
                     :tag=cno.threat.apt1
                     :active=(2012,2023)
+                    :activity=high
                     :reporter=*
                     :reporter:name=mandiant
                     :reporter:discovered=202202
@@ -400,6 +401,7 @@ class RiskModelTest(s_t_utils.SynTest):
             self.len(1, nodes)
             self.eq('vtx-apt1', nodes[0].get('name'))
             self.eq('VTX-APT1', nodes[0].get('desc'))
+            self.eq(40, nodes[0].get('activity'))
             self.eq('apt1', nodes[0].get('org:name'))
             self.eq('ua', nodes[0].get('country:code'))
             self.eq('cn.shanghai', nodes[0].get('org:loc'))
@@ -546,11 +548,13 @@ class RiskModelTest(s_t_utils.SynTest):
                     :cause=nature.earthquake
                     :provider={[ ou:org=* :name="desert power" ]}
                     :provider:name="desert power"
+                    :attack={[ risk:attack=* ]}
                     :reporter={ ou:org:name=vertex }
                     :reporter:name=vertex
                 ]
             ''')
             self.len(1, nodes)
+            self.nn(nodes[0].get('attack'))
             self.nn(nodes[0].get('reporter'))
             self.eq('the big one', nodes[0].get('name'))
             self.eq('vertex', nodes[0].get('reporter:name'))
@@ -559,6 +563,7 @@ class RiskModelTest(s_t_utils.SynTest):
             self.eq('nature.earthquake.', nodes[0].get('cause'))
             self.eq((1672531200000, 1704067200000), nodes[0].get('period'))
 
+            self.len(1, await core.nodes('risk:outage -> risk:attack'))
             self.len(1, await core.nodes('risk:outage -> risk:outage:cause:taxonomy'))
             self.len(1, await core.nodes('risk:outage :reporter -> ou:org +:name=vertex'))
             self.len(1, await core.nodes('risk:outage :provider -> ou:org +:name="desert power"'))