synapse 2.195.1__py311-none-any.whl → 2.197.0__py311-none-any.whl

synapse/tests/test_lib_stormlib_aha.py

@@ -6,6 +6,8 @@ import synapse.lib.cell as s_cell
 
 import synapse.tests.utils as s_test
 
+import unittest.mock as mock
+
 class AhaLibTest(s_test.SynTest):
 
     async def test_stormlib_aha_basics(self):
@@ -193,3 +195,189 @@ Connection information:
 
                 with self.raises(s_exc.NoSuchName):
                     await core00.callStorm('$lib.aha.del(axon...)')
+
+    async def test_stormlib_aha_mirror(self):
+
+        async with self.getTestAha() as aha:
+
+            with self.getTestDir() as dirn:
+
+                dirn00 = s_common.genpath(dirn, 'cell00')
+                dirn01 = s_common.genpath(dirn, 'cell01')
+                dirn02 = s_common.genpath(dirn, 'cell02')
+
+                async with aha.waiter(3, 'aha:svcadd', timeout=10):
+
+                    cell00 = await aha.enter_context(self.addSvcToAha(aha, '00.cell', s_cell.Cell, dirn=dirn00))
+                    cell01 = await aha.enter_context(self.addSvcToAha(aha, '01.cell', s_cell.Cell, dirn=dirn01,
+                                                                      provinfo={'mirror': 'cell'}))
+                    core00 = await aha.enter_context(self.addSvcToAha(aha, 'core', s_cortex.Cortex, dirn=dirn02))
+                    await cell01.sync()
+
+                # PeerGenr
+                resp = await core00.callStorm('''
+                    $resps = $lib.list()
+                    $todo = $lib.utils.todo('getTasks')
+                    for ($name, $info) in $lib.aha.callPeerGenr(cell..., $todo) {
+                        $resps.append(($name, $info))
+                    }
+                    return($resps)
+                ''')
+                self.len(0, resp)
+
+                resp = await core00.callStorm('''
+                    $resps = $lib.list()
+                    $todo = $lib.utils.todo('getNexusChanges', (0), wait=(false))
+                    for ($name, $info) in $lib.aha.callPeerGenr(cell..., $todo) {
+                        $resps.append(($name, $info))
+                    }
+                    return($resps)
+                ''')
+                self.len(4, resp)
+
+                cell00_rid = (await cell00.getCellInfo())['cell']['run']
+                resp = await core00.callStorm('''
+                    $resps = $lib.list()
+                    $todo = $lib.utils.todo('getNexusChanges', (0), wait=(false))
+                    for $info in $lib.aha.callPeerGenr(cell..., $todo, skiprun=$skiprun) {
+                        $resps.append($info)
+                    }
+                    return($resps)
+                ''', opts={'vars': {'skiprun': cell00_rid}})
+                self.len(2, resp)
+
+                await self.asyncraises(s_exc.NoSuchName, core00.callStorm('''
+                    $todo = $lib.utils.todo('getTasks')
+                    $lib.aha.callPeerGenr(null, $todo)
+                '''))
+
+                # PeerApi
+                resp = await core00.callStorm('''
+                    $resps = $lib.list()
+                    $todo = $lib.utils.todo('getCellInfo')
+                    for ($name, $info) in $lib.aha.callPeerApi(cell..., $todo) {
+                        $resps.append(($name, $info))
+                    }
+                    return($resps)
+                ''')
+                self.len(2, resp)
+                self.eq(resp[0][0], '00.cell.synapse')
+                self.eq(resp[0][1][0], True)
+                self.isinstance(resp[0][1][1], dict)
+
+                resp = await core00.callStorm('''
+                    $resps = $lib.list()
+                    $todo = $lib.utils.todo(getCellInfo)
+                    for ($name, $info) in $lib.aha.callPeerApi(cell..., $todo) {
+                        $resps.append(($name, $info))
+                    }
+                    return($resps)
+                ''')
+                self.len(2, resp)
+
+                resp = await core00.callStorm('''
+                    $resps = $lib.list()
+                    $todo = $lib.utils.todo(getCellInfo)
+                    for ($name, $info) in $lib.aha.callPeerApi(cell..., $todo, skiprun=$skiprun) {
+                        $resps.append(($name, $info))
+                    }
+                    return($resps)
+                ''', opts={'vars': {'skiprun': cell00_rid}})
+                self.len(1, resp)
+
+                resp = await core00.callStorm('''
+                    $resps = $lib.list()
+                    $todo = $lib.utils.todo('getCellInfo')
+                    for ($name, $info) in $lib.aha.callPeerApi(cell..., $todo, timeout=(10)) {
+                        $resps.append(($name, $info))
+                    }
+                    return($resps)
+                ''')
+                self.len(2, resp)
+
+                await self.asyncraises(s_exc.NoSuchName, core00.callStorm('''
+                    $todo = $lib.utils.todo('getCellInfo')
+                    $lib.aha.callPeerApi(newp..., $todo)
+                '''))
+
+                await self.asyncraises(s_exc.NoSuchName, core00.callStorm('''
+                    $todo = $lib.utils.todo('getCellInfo')
+                    $lib.aha.callPeerApi(null, $todo)
+                '''))
+
+                await self.asyncraises(s_exc.NoSuchMeth, core00.callStorm('''
+                    $todo = $lib.utils.todo('bogusMethod')
+                    for $info in $lib.aha.callPeerApi(cell..., $todo) {
+                        ($ok, $info) = $info.1
+                        if (not $ok) {
+                            $lib.raise($info.err, $info.errmsg)
+                        }
+                    }
+                '''))
+
+                await aha.addAhaSvc('noiden.cell', info={'urlinfo': {'scheme': 'tcp',
+                                                                     'host': '0.0.0.0',
+                                                                     'port': '3030'}},
+                                  network='synapse')
+                await self.asyncraises(s_exc.NoSuchName, core00.callStorm('''
+                    $todo = $lib.utils.todo('getTasks')
+                    $lib.aha.callPeerGenr(noiden.cell..., $todo)
+                '''))
+                await self.asyncraises(s_exc.NoSuchName, core00.callStorm('''
+                    $todo = $lib.utils.todo('getCellInfo')
+                    $lib.aha.callPeerApi(noiden.cell..., $todo)
+                '''))
+
+                msgs = await core00.stormlist('aha.svc.mirror')
+                self.stormIsInPrint('Service Mirror Groups:', msgs)
+                self.stormIsInPrint('cell.synapse', msgs)
+                self.stormIsInPrint('00.cell.synapse', msgs)
+                self.stormIsInPrint('01.cell.synapse', msgs)
+                self.stormIsInPrint('Group Status: In Sync', msgs)
+
+                msgs = await core00.stormlist('aha.svc.mirror --timeout 30')
+                self.stormIsInPrint('Service Mirror Groups:', msgs)
+                self.stormIsInPrint('Group Status: In Sync', msgs)
+
+                async def mockCellInfo():
+                    return {
+                        'cell': {'ready': True, 'nexsindx': 10, 'uplink': None},
+                        'synapse': {'verstring': '2.190.0'},
+                    }
+
+                async def mockOutOfSyncCellInfo():
+                    return {
+                        'cell': {'ready': True, 'nexsindx': 5, 'uplink': cell00.iden},
+                        'synapse': {'verstring': '2.190.0'},
+                    }
+
+                with mock.patch.object(cell00, 'getCellInfo', mockCellInfo):
+                    with mock.patch.object(cell01, 'getCellInfo', mockOutOfSyncCellInfo):
+                        async def mock_call_aha(*args, **kwargs):
+                            todo = args[1]
+                            if todo[0] == 'waitNexsOffs':
+                                yield ('00.cell.synapse', (True, True))
+                                yield ('01.cell.synapse', (True, True))
+                            elif todo[0] == 'getCellInfo':
+                                if not hasattr(mock_call_aha, 'called'):
+                                    mock_call_aha.called = True
+                                    yield ('00.cell.synapse', (True, await mockCellInfo()))
+                                    yield ('01.cell.synapse', (True, await mockOutOfSyncCellInfo()))
+                                else:
+                                    yield ('00.cell.synapse', (True, await mockCellInfo()))
+                                    yield ('01.cell.synapse', (True, await mockCellInfo()))
+
+                        with mock.patch.object(aha, 'callAhaPeerApi', mock_call_aha):
+                            msgs = await core00.stormlist('aha.svc.mirror --wait')
+                            self.stormIsInPrint('Group Status: Out of Sync', msgs)
+                            self.stormIsInPrint('Updated status:', msgs)
+                            self.stormIsInPrint('Group Status: In Sync', msgs)
+
+                with mock.patch.object(cell00, 'getCellInfo', mockCellInfo):
+                    with mock.patch.object(cell01, 'getCellInfo', mockOutOfSyncCellInfo):
+                        msgs = await core00.stormlist('aha.svc.mirror --timeout 1')
+                        self.stormIsInPrint('Group Status: Out of Sync', msgs)
+
+                await aha.delAhaSvc('00.cell', network='synapse')
+                msgs = await core00.stormlist('aha.svc.mirror')
+                self.stormNotInPrint('Service Mirror Groups:', msgs)

synapse/tests/test_lib_stormlib_index.py

@@ -0,0 +1,39 @@
+import synapse.tests.utils as s_test
+
+count_prop_00 = '''
+ Count        | Layer Iden                       | Layer Name
+==============|==================================|============
+ 16           | 5cc56afbb22fad9b96c51110812af8f7 |
+ 16           | 2371390b1fd0162ba6820f85a863e7b2 | default
+Total: 32
+'''
+
+count_prop_01 = '''
+ Count        | Layer Iden                       | Layer Name
+==============|==================================|============
+ 16           | 9782c920718d3059b8806fddaf917bd8 |
+ 0            | 511122a9b2d576c5be2cdfcaef541bb9 | default
+Total: 16
+'''
+
+class StormIndexTest(s_test.SynTest):
+
+    async def test_lib_stormlib_index(self):
+
+        async with self.getTestCore() as core:
+            viewiden = await core.callStorm('return($lib.view.get().fork().iden)')
+            viewopts = {'view': viewiden}
+            await core.nodes('[ inet:ipv4=1.2.3.0/28 :asn=19 ]')
+            await core.nodes('[ inet:ipv4=1.2.4.0/28 :asn=42 ]', opts=viewopts)
+
+            msgs = await core.stormlist('index.count.prop inet:ipv4', opts=viewopts)
+            self.stormIsInPrint(count_prop_00, msgs, deguid=True, whitespace=False)
+
+            msgs = await core.stormlist('index.count.prop inet:ipv4:asn', opts=viewopts)
+            self.stormIsInPrint(count_prop_00, msgs, deguid=True, whitespace=False)
+
+            msgs = await core.stormlist('index.count.prop inet:ipv4:asn --value 42', opts=viewopts)
+            self.stormIsInPrint(count_prop_01, msgs, deguid=True, whitespace=False)
+
+            msgs = await core.stormlist('index.count.prop inet:ipv4:newp', opts=viewopts)
+            self.stormIsInErr('No property named inet:ipv4:newp', msgs)

synapse/tests/test_lib_stormlib_utils.py

@@ -0,0 +1,14 @@
+import synapse.exc as s_exc
+import synapse.tests.utils as s_test
+
+class UtilsTest(s_test.SynTest):
+
+    async def test_lib_stormlib_utils_todo(self):
+
+        async with self.getTestCore() as core:
+
+            valu = await core.callStorm('return($lib.utils.todo(foo))')
+            self.eq(valu, ('foo', (), {}))
+
+            valu = await core.callStorm('return($lib.utils.todo(fooName, arg1, arg2, keyword=bar, anotherkeyword=hehe))')
+            self.eq(valu, ('fooName', ('arg1', 'arg2'), {'keyword': 'bar', 'anotherkeyword': 'hehe'}))

synapse/tests/test_lib_stormtypes.py

@@ -3,6 +3,7 @@ import bz2
 import gzip
 import json
 import base64
+import struct
 import asyncio
 import hashlib
 import binascii
@@ -6467,13 +6468,29 @@ words\tword\twrd'''
         async with self.getTestCore() as core:
 
             viewiden = await core.callStorm('return($lib.view.get().fork().iden)')
-            await core.nodes('[ ou:org=* :name=foobar +#hehe ]')
+            q = '[ ou:org=* :name=foobar +#hehe ] $node.data.set(foo, bar) return($node.iden())'
+            basenode = await core.callStorm(q)
 
             opts = {'view': viewiden}
-            nodeiden = await core.callStorm('[ ou:org=* :name=foobar +#hehe ] return($node.iden())', opts=opts)
+            nodeiden = await core.callStorm('''
+                [ ou:org=* :name=foobar +#hehe ]
+                $node.data.set(foo, bar)
+                return($node.iden())
+            ''', opts=opts)
+
+            nodeiden2 = await core.callStorm('[test:str=yup] $node.data.set(foo, yup) return ($node.iden())',
+                                             opts=opts)
 
             self.len(2, await core.nodes('ou:org +:name=foobar +#hehe', opts=opts))
 
+            nodes = await core.nodes('yield $lib.layer.get().liftByNodeData(foo)', opts=opts)
+            self.len(2, nodes)
+            self.eq(set((nodeiden, nodeiden2)), {node.iden() for node in nodes})
+
+            nodes = await core.nodes('yield $lib.layer.get().liftByNodeData(foo)')
+            self.len(1, nodes)
+            self.eq(nodes[0].iden(), basenode)
+
             nodes = await core.nodes('yield $lib.layer.get().liftByProp(ou:org)', opts=opts)
             self.len(1, nodes)
             self.eq(nodes[0].iden(), nodeiden)
@@ -6487,7 +6504,7 @@ words\tword\twrd'''
             self.eq(nodes[0].iden(), nodeiden)
 
             nodes = await core.nodes('yield $lib.layer.get().liftByProp(".created")', opts=opts)
-            self.len(1, nodes)
+            self.len(2, nodes)
             self.eq(nodes[0].iden(), nodeiden)
 
             nodes = await core.nodes('yield $lib.layer.get().liftByTag(hehe)', opts=opts)
@@ -7084,3 +7101,73 @@ words\tword\twrd'''
 
             with self.raises(s_exc.BadState):
                 await core.callStorm(merging)
+
+    async def test_storm_lib_axon_read_unpack(self):
+
+        async with self.getTestCore() as core:
+
+            visi = await core.auth.addUser('visi')
+
+            orig_axoninfo = core.axoninfo
+            core.axoninfo = {'features': {}}
+            data = struct.pack('>Q', 1)
+            size, sha256 = await core.axon.put(data)
+            sha256_s = s_common.ehex(sha256)
+            q = 'return($lib.axon.unpack($sha256, fmt=">Q"))'
+            await self.asyncraises(s_exc.FeatureNotSupported,
+                                   core.callStorm(q, opts={'vars': {'sha256': sha256_s}}))
+            core.axoninfo = orig_axoninfo
+
+            data = b'vertex.link'
+            size, sha256 = await core.axon.put(data)
+            sha256_s = s_common.ehex(sha256)
+
+            _, emptyhash = await core.axon.put(b'')
+            emptyhash = s_common.ehex(emptyhash)
+
+            opts = {'user': visi.iden, 'vars': {'sha256': sha256_s, 'emptyhash': emptyhash}}
+            await self.asyncraises(s_exc.AuthDeny,
+                core.callStorm('return($lib.axon.read($sha256, offs=3, size=3))', opts=opts))
+            await visi.addRule((True, ('storm', 'lib', 'axon', 'get')))
+
+            q = 'return($lib.axon.read($sha256, offs=3, size=3))'
+            self.eq(b'tex', await core.callStorm(q, opts=opts))
+            q = 'return($lib.axon.read($sha256, offs=7, size=4))'
+            self.eq(b'link', await core.callStorm(q, opts=opts))
+            q = 'return($lib.axon.read($sha256, offs=11, size=1))'
+            self.eq(b'', await core.callStorm(q, opts=opts))
+
+            q = 'return($lib.axon.read($emptyhash))'
+            self.eq(b'', await core.callStorm(q, opts=opts))
+
+            q = 'return($lib.axon.read($sha256, size=0))'
+            await self.asyncraises(s_exc.BadArg, core.callStorm(q, opts=opts))
+            q = 'return($lib.axon.read($sha256, offs=-1, size=1))'
+            await self.asyncraises(s_exc.BadArg, core.callStorm(q, opts=opts))
+            q = 'return($lib.axon.read($sha256, size=2097152))'
+            await self.asyncraises(s_exc.BadArg, core.callStorm(q, opts=opts))
+
+            intdata = struct.pack('>QQQ', 1, 2, 3)
+            size, sha256 = await core.axon.put(intdata)
+            sha256_s = s_common.ehex(sha256)
+            opts = {'user': visi.iden, 'vars': {'sha256': sha256_s}}
+
+            await visi.delRule((True, ('storm', 'lib', 'axon', 'get')))
+            q = 'return($lib.axon.unpack($sha256, fmt=">Q"))'
+            await self.asyncraises(s_exc.AuthDeny, core.callStorm(q, opts=opts))
+            await visi.addRule((True, ('storm', 'lib', 'axon', 'get')))
+
+            q = 'return($lib.axon.unpack($sha256, fmt=">Q"))'
+            self.eq((1,), await core.callStorm(q, opts=opts))
+            q = 'return($lib.axon.unpack($sha256, fmt=">Q", offs=8))'
+            self.eq((2,), await core.callStorm(q, opts=opts))
+            q = 'return($lib.axon.unpack($sha256, fmt=">Q", offs=16))'
+            self.eq((3,), await core.callStorm(q, opts=opts))
+            q = 'return($lib.axon.unpack($sha256, fmt=">QQ", offs=8))'
+            self.eq((2, 3), await core.callStorm(q, opts=opts))
+
+            q = 'return($lib.axon.unpack($sha256, fmt="not a valid format"))'
+            await self.asyncraises(s_exc.BadArg, core.callStorm(q, opts=opts))
+
+            q = 'return($lib.axon.unpack($sha256, fmt=">Q", offs=24))'
+            await self.asyncraises(s_exc.BadDataValu, core.callStorm(q, opts=opts))

synapse/tests/test_lib_task.py

@@ -2,12 +2,14 @@ import asyncio
 
 import synapse.exc as s_exc
 import synapse.lib.boss as s_boss
+import synapse.lib.cell as s_cell
 import synapse.lib.task as s_task
 import synapse.tests.utils as s_test
 
-class FakeUser:
-    def __init__(self, name):
-        self.name = name
+class BossCell(s_cell.Cell):
+    async def initServiceRuntime(self):
+        self.cboss = await s_boss.Boss.anit()
+        self.onfini(self.cboss)
 
 class TaskTest(s_test.SynTest):
 
@@ -19,15 +21,27 @@ class TaskTest(s_test.SynTest):
 
     async def test_task_module(self):
 
-        async with await s_boss.Boss.anit() as boss:
+        async with self.getTestCell(BossCell) as bcell:
+            boss = bcell.cboss
+            root = await bcell.auth.getUserByName('root')
 
-            user = FakeUser('visi')
+            synt = await boss.promote('test', root, info={'hehe': 'haha'})
 
-            synt = await boss.promote('test', user, info={'hehe': 'haha'})
-
-            self.eq(s_task.user(), user)
+            self.eq(s_task.user(), root)
             self.eq(s_task.current(), synt)
-            self.eq(s_task.username(), 'visi')
+            self.eq(s_task.username(), 'root')
+
+            ret = synt.pack()
+            self.nn(ret.pop('iden'))
+            self.nn(ret.pop('tick'))
+            self.eq(ret, {'name': 'test', 'info': {'hehe': 'haha'},
+                          'user': 'root', 'kids': {}})
+
+            ret = synt.packv2()
+            self.nn(ret.pop('iden'))
+            self.nn(ret.pop('tick'))
+            self.eq(ret, {'name': 'test', 'info': {'hehe': 'haha'},
+                          'user': root.iden, 'username': 'root', 'kids': {}})
 
     async def test_taskvars(self):
         s_task.varset('test', 'foo')
@@ -51,7 +65,11 @@ class TaskTest(s_test.SynTest):
         self.eq(s_task.varget('test'), 'foo')
 
     async def test_task_iden(self):
-        with self.raises(s_exc.BadArg):
-            await s_task.Task.anit(None, asyncio.current_task(), None, None, iden=10)
-        with self.raises(s_exc.BadArg):
-            await s_task.Task.anit(None, asyncio.current_task(), None, None, iden='woot')
+        async with self.getTestCell(BossCell) as bcell:
+            root = await bcell.auth.getUserByName('root')
+            boss = bcell.cboss
+
+            with self.raises(s_exc.BadArg):
+                await s_task.Task.anit(boss, asyncio.current_task(), None, root, iden=10)
+            with self.raises(s_exc.BadArg):
+                await s_task.Task.anit(boss, asyncio.current_task(), None, root, iden='woot')

synapse/tests/test_model_base.py

@@ -227,6 +227,7 @@ class BaseTest(s_t_utils.SynTest):
                     :name="FOO Bar"
                     :type=osint
                     :url="https://foo.bar/index.html"
+                    :ingest:cursor="Woot Woot "
                     :ingest:latest=20241205
                     :ingest:offset=17
                 ]
@@ -238,6 +239,7 @@ class BaseTest(s_t_utils.SynTest):
             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:cursor'), 'Woot Woot ')
             self.eq(sorc.get('ingest:latest'), 1733356800000)
 
             valu = (sorc.ndef[1], ('inet:fqdn', 'woot.com'))

synapse/tests/test_model_doc.py

@@ -49,3 +49,41 @@ class DocModelTest(s_tests.SynTest):
             self.eq('V-99', nodes[0].get('id'))
             self.nn(nodes[0].get('policy'))
             self.len(1, await core.nodes('doc:standard -> doc:policy'))
+
+            nodes = await core.nodes('''
+                [ doc:requirement=*
+                    :id=V-99
+                    :priority=low
+                    :optional=(false)
+                    :summary="Some requirement text."
+                    :standard={doc:standard}
+                ]
+            ''')
+            self.eq('V-99', nodes[0].get('id'))
+            self.eq('Some requirement text.', nodes[0].get('summary'))
+            self.eq(20, nodes[0].get('priority'))
+            self.false(nodes[0].get('optional'))
+            self.nn(nodes[0].get('standard'))
+            self.len(1, await core.nodes('doc:requirement -> doc:standard'))
+
+            nodes = await core.nodes('''
+                [ doc:resume=*
+                    :id=V-99
+                    :contact={[ ps:contact=* :name=visi ]}
+                    :summary="Thought leader seeks..."
+                    :workhist={[ ps:workhist=* ]}
+                    :education={[ ps:education=* ]}
+                    :achievements={[ ps:achievement=* ]}
+                ]
+            ''')
+            self.eq('V-99', nodes[0].get('id'))
+            self.eq('Thought leader seeks...', nodes[0].get('summary'))
+            self.nn(nodes[0].get('contact'))
+            self.len(1, nodes[0].get('workhist'))
+            self.len(1, nodes[0].get('education'))
+            self.len(1, nodes[0].get('achievements'))
+
+            self.len(1, await core.nodes('doc:resume :contact -> ps:contact'))
+            self.len(1, await core.nodes('doc:resume :workhist -> ps:workhist'))
+            self.len(1, await core.nodes('doc:resume :education -> ps:education'))
+            self.len(1, await core.nodes('doc:resume :achievements -> ps:achievement'))

synapse/tests/test_model_infotech.py

@@ -342,6 +342,7 @@ class InfotechModelTest(s_t_utils.SynTest):
                     :verdict=suspicious
                     :scanner={[ it:prod:softver=* :name="visi scan" ]}
                     :scanner:name="visi scan"
+                    :categories=("Foo  Bar", "baz faz")
                     :signame=omgwtfbbq
                     :target:file=*
                     :target:proc={[ it:exec:proc=* :cmd="foo.exe --bar" ]}
@@ -367,6 +368,7 @@ class InfotechModelTest(s_t_utils.SynTest):
             self.eq(0x01020304, nodes[0].get('target:ipv4'))
             self.eq('::1', nodes[0].get('target:ipv6'))
             self.eq('omgwtfbbq', nodes[0].get('signame'))
+            self.eq(('baz faz', 'foo bar'), nodes[0].get('categories'))
 
             self.len(1, await core.nodes('it:av:scan:result:scanner:name="visi scan" -> it:host'))
             self.len(1, await core.nodes('it:av:scan:result:scanner:name="visi scan" -> inet:url'))
@@ -617,11 +619,36 @@ class InfotechModelTest(s_t_utils.SynTest):
             node = nodes[0]
             self.eq(node.ndef, ('it:dev:int', 1640531528))
 
-            nodes = await core.nodes('[it:sec:cve=CVE-2013-9999 :desc="Some words."]')
+            nodes = await core.nodes('''[
+                it:sec:cve=CVE-2013-9999
+                    :desc="Some words."
+
+                    :nist:nvd:source=NistSource
+                    :nist:nvd:published=2021-10-11
+                    :nist:nvd:modified=2021-10-11
+
+                    :cisa:kev:name=KevName
+                    :cisa:kev:desc=KevDesc
+                    :cisa:kev:action=KevAction
+                    :cisa:kev:vendor=KevVendor
+                    :cisa:kev:product=KevProduct
+                    :cisa:kev:added=2022-01-02
+                    :cisa:kev:duedate=2022-01-02
+            ]''')
             self.len(1, nodes)
             node = nodes[0]
             self.eq(node.ndef, ('it:sec:cve', 'cve-2013-9999'))
             self.eq(node.get('desc'), 'Some words.')
+            self.eq(node.get('nist:nvd:source'), 'nistsource')
+            self.eq(node.get('nist:nvd:published'), 1633910400000)
+            self.eq(node.get('nist:nvd:modified'), 1633910400000)
+            self.eq(node.get('cisa:kev:name'), 'KevName')
+            self.eq(node.get('cisa:kev:desc'), 'KevDesc')
+            self.eq(node.get('cisa:kev:action'), 'KevAction')
+            self.eq(node.get('cisa:kev:vendor'), 'kevvendor')
+            self.eq(node.get('cisa:kev:product'), 'kevproduct')
+            self.eq(node.get('cisa:kev:added'), 1641081600000)
+            self.eq(node.get('cisa:kev:duedate'), 1641081600000)
 
             nodes = await core.nodes('[it:sec:cve=$valu]', opts={'vars': {'valu': 'CVE\u20122013\u20131138'}})
             self.len(1, nodes)

synapse/tests/test_model_orgs.py

@@ -183,6 +183,13 @@ class OuModelTest(s_t_utils.SynTest):
             self.eq(t.norm('HAHA1')[0], 'haha1')
             self.eq(t.norm('GOV_MFA')[0], 'gov_mfa')
 
+            # ou:org:alias (unicode test)
+            nodes = await core.nodes('''
+                [ ou:org=* :alias="ÅÆØåæø" ]
+            ''')
+            self.len(1, nodes)
+            self.eq(t.norm('ÅÆØåæø')[0], 'åæøåæø')
+
             # ou:position / ou:org:subs
             orgiden = s_common.guid()
             contact = s_common.guid()
@@ -640,6 +647,7 @@ class OuModelTest(s_t_utils.SynTest):
                 ou:contest:result=(*, *)
                     :rank=1
                     :score=20
+                    :period=(20250101, 20250102)
                     :url=http://vertex.link/contest/result
             ]''')
             self.len(1, nodes)
@@ -647,6 +655,7 @@ class OuModelTest(s_t_utils.SynTest):
             self.nn(nodes[0].get('participant'))
             self.eq(1, nodes[0].get('rank'))
             self.eq(20, nodes[0].get('score'))
+            self.eq((1735689600000, 1735776000000), nodes[0].get('period'))
             self.eq('http://vertex.link/contest/result', nodes[0].get('url'))
             self.len(1, await core.nodes('ou:contest:result -> ps:contact'))
             self.len(1, await core.nodes('ou:contest:result -> ou:contest'))

synapse/tests/test_model_risk.py

@@ -111,12 +111,14 @@ class RiskModelTest(s_t_utils.SynTest):
                 :cvss:v3 ?= "newp3.1"
                 :priority=high
                 :severity=high
+                :tag=cno.vuln.woot
             ]''')
 
             self.none(node.get('cvss:v2'))
             self.none(node.get('cvss:v3'))
             self.eq(40, node.get('severity'))
             self.eq(40, node.get('priority'))
+            self.eq('cno.vuln.woot', node.get('tag'))
 
             with self.raises(s_exc.BadTypeValu):
                 node = await addNode(f'''[

synapse/tests/test_model_transport.py

@@ -110,6 +110,7 @@ class TransportTest(s_test.SynTest):
             self.nn(vessel.get('operator'))
 
             self.len(1, await core.nodes('transport:sea:vessel:imo^="IMO 123"'))
+            self.len(1, await core.nodes('transport:sea:vessel :name -> entity:name'))
             self.len(1, await core.nodes('transport:sea:vessel -> transport:sea:vessel:type:taxonomy'))
 
             seatelem = (await core.nodes('''[