synapse 2.187.0__py311-none-any.whl → 2.188.1__py311-none-any.whl

synapse/tests/test_lib_cell.py

@@ -29,6 +29,7 @@ import synapse.lib.coro as s_coro
 import synapse.lib.link as s_link
 import synapse.lib.drive as s_drive
 import synapse.lib.nexus as s_nexus
+import synapse.lib.config as s_config
 import synapse.lib.certdir as s_certdir
 import synapse.lib.msgpack as s_msgpack
 import synapse.lib.version as s_version
@@ -160,8 +161,9 @@ testDataSchema_v0 = {
     'properties': {
         'type': {'type': 'string'},
         'size': {'type': 'number'},
+        'stuff': {'type': ['number', 'null'], 'default': None}
     },
-    'required': ['type', 'size'],
+    'required': ['type', 'size', 'stuff'],
     'additionalProperties': False,
 }
 
@@ -170,6 +172,7 @@ testDataSchema_v1 = {
     'properties': {
         'type': {'type': 'string'},
         'size': {'type': 'number'},
+        'stuff': {'type': ['number', 'null'], 'default': None},
         'woot': {'type': 'string'},
     },
     'required': ['type', 'size', 'woot'],
@@ -180,202 +183,210 @@ class CellTest(s_t_utils.SynTest):
 
     async def test_cell_drive(self):
 
-        async with self.getTestCell() as cell:
+        with self.getTestDir() as dirn:
+            async with self.getTestCell(dirn=dirn) as cell:
 
-            with self.raises(s_exc.BadName):
-                s_drive.reqValidName('A' * 512)
+                with self.raises(s_exc.BadName):
+                    s_drive.reqValidName('A' * 512)
 
-            info = {'name': 'users'}
-            pathinfo = await cell.addDriveItem(info)
+                info = {'name': 'users'}
+                pathinfo = await cell.addDriveItem(info)
 
-            info = {'name': 'root'}
-            pathinfo = await cell.addDriveItem(info, path='users')
+                info = {'name': 'root'}
+                pathinfo = await cell.addDriveItem(info, path='users')
 
-            with self.raises(s_exc.DupIden):
-                await cell.drive.addItemInfo(pathinfo[-1], path='users')
+                with self.raises(s_exc.DupIden):
+                    await cell.drive.addItemInfo(pathinfo[-1], path='users')
 
-            rootdir = pathinfo[-1].get('iden')
-            self.eq(0, pathinfo[-1].get('kids'))
+                rootdir = pathinfo[-1].get('iden')
+                self.eq(0, pathinfo[-1].get('kids'))
 
-            info = {'name': 'win32k.sys', 'type': 'hehe'}
-            with self.raises(s_exc.NoSuchType):
-                info = await cell.addDriveItem(info, reldir=rootdir)
+                info = {'name': 'win32k.sys', 'type': 'hehe'}
+                with self.raises(s_exc.NoSuchType):
+                    info = await cell.addDriveItem(info, reldir=rootdir)
+
+                infos = [i async for i in cell.getDriveKids(s_drive.rootdir)]
+                self.len(1, infos)
+                self.eq(1, infos[0].get('kids'))
+                self.eq('users', infos[0].get('name'))
+
+                # TODO how to handle iden match with additional property mismatch
 
-            infos = [i async for i in cell.getDriveKids(s_drive.rootdir)]
-            self.len(1, infos)
-            self.eq(1, infos[0].get('kids'))
-            self.eq('users', infos[0].get('name'))
+                self.true(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0))
+                self.true(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=1))
+                self.false(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=1))
 
-            # TODO how to handle iden match with additional property mismatch
+                with self.raises(s_exc.BadVersion):
+                    await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0)
 
-            self.true(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0))
-            self.true(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=1))
-            self.false(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=1))
+                info = {'name': 'win32k.sys', 'type': 'woot'}
+                info = await cell.addDriveItem(info, reldir=rootdir)
 
-            with self.raises(s_exc.BadVersion):
-                await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0)
+                iden = info[-1].get('iden')
 
-            info = {'name': 'win32k.sys', 'type': 'woot'}
-            info = await cell.addDriveItem(info, reldir=rootdir)
+                tick = s_common.now()
+                rootuser = cell.auth.rootuser.iden
 
-            iden = info[-1].get('iden')
+                with self.raises(s_exc.SchemaViolation):
+                    versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
+                    await cell.setDriveData(iden, versinfo, {'newp': 'newp'})
 
-            tick = s_common.now()
-            rootuser = cell.auth.rootuser.iden
+                versinfo = {'version': (1, 1, 0), 'updated': tick + 10, 'updater': rootuser}
+                info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 20, 'stuff': 12})
+                self.eq(info.get('version'), (1, 1, 0))
+                self.eq(versinfo.get('version'), (1, 1, 0))
 
-            with self.raises(s_exc.SchemaViolation):
                 versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
-                await cell.setDriveData(iden, versinfo, {'newp': 'newp'})
-
-            versinfo = {'version': (1, 1, 0), 'updated': tick + 10, 'updater': rootuser}
-            info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 20})
-            self.eq(info.get('version'), (1, 1, 0))
-            self.eq(versinfo.get('version'), (1, 1, 0))
-
-            versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
-            info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'hehe', 'size': 0})
-            self.eq(info.get('version'), (1, 1, 0))
-            self.eq(versinfo.get('version'), (1, 0, 0))
-
-            versinfo10, data10 = await cell.getDriveData(iden, vers=(1, 0, 0))
-            self.eq(versinfo10.get('updated'), tick)
-            self.eq(versinfo10.get('updater'), rootuser)
-            self.eq(versinfo10.get('version'), (1, 0, 0))
-
-            versinfo11, data11 = await cell.getDriveData(iden, vers=(1, 1, 0))
-            self.eq(versinfo11.get('updated'), tick + 10)
-            self.eq(versinfo11.get('updater'), rootuser)
-            self.eq(versinfo11.get('version'), (1, 1, 0))
-
-            versions = [vers async for vers in cell.getDriveDataVersions(iden)]
-            self.len(2, versions)
-            self.eq(versions[0], versinfo11)
-            self.eq(versions[1], versinfo10)
-
-            info = await cell.delDriveData(iden, vers=(0, 0, 0))
-
-            versions = [vers async for vers in cell.getDriveDataVersions(iden)]
-            self.len(2, versions)
-            self.eq(versions[0], versinfo11)
-            self.eq(versions[1], versinfo10)
-
-            info = await cell.delDriveData(iden, vers=(1, 1, 0))
-            self.eq(info.get('updated'), tick)
-            self.eq(info.get('version'), (1, 0, 0))
-
-            info = await cell.delDriveData(iden, vers=(1, 0, 0))
-            self.eq(info.get('size'), 0)
-            self.eq(info.get('version'), (0, 0, 0))
-            self.none(info.get('updated'))
-            self.none(info.get('updater'))
-
-            # repopulate a couple data versions to test migration and delete
-            versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
-            info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'hehe', 'size': 0})
-            versinfo = {'version': (1, 1, 0), 'updated': tick + 10, 'updater': rootuser}
-            info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 17})
-            self.eq(versinfo, (await cell.getDriveData(iden))[0])
-
-            # This will be done by the cell in a cell storage version migration...
-            async def migrate_v1(info, versinfo, data):
-                data['woot'] = 'woot'
-                return data
-
-            await cell.drive.setTypeSchema('woot', testDataSchema_v1, migrate_v1)
-
-            versinfo, data = await cell.getDriveData(iden, vers=(1, 0, 0))
-            self.eq('woot', data.get('woot'))
-
-            versinfo, data = await cell.getDriveData(iden, vers=(1, 1, 0))
-            self.eq('woot', data.get('woot'))
+                info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'hehe', 'size': 0, 'stuff': 13})
+                self.eq(info.get('version'), (1, 1, 0))
+                self.eq(versinfo.get('version'), (1, 0, 0))
+
+                versinfo10, data10 = await cell.getDriveData(iden, vers=(1, 0, 0))
+                self.eq(versinfo10.get('updated'), tick)
+                self.eq(versinfo10.get('updater'), rootuser)
+                self.eq(versinfo10.get('version'), (1, 0, 0))
+
+                versinfo11, data11 = await cell.getDriveData(iden, vers=(1, 1, 0))
+                self.eq(versinfo11.get('updated'), tick + 10)
+                self.eq(versinfo11.get('updater'), rootuser)
+                self.eq(versinfo11.get('version'), (1, 1, 0))
+
+                versions = [vers async for vers in cell.getDriveDataVersions(iden)]
+                self.len(2, versions)
+                self.eq(versions[0], versinfo11)
+                self.eq(versions[1], versinfo10)
+
+                info = await cell.delDriveData(iden, vers=(0, 0, 0))
+
+                versions = [vers async for vers in cell.getDriveDataVersions(iden)]
+                self.len(2, versions)
+                self.eq(versions[0], versinfo11)
+                self.eq(versions[1], versinfo10)
+
+                info = await cell.delDriveData(iden, vers=(1, 1, 0))
+                self.eq(info.get('updated'), tick)
+                self.eq(info.get('version'), (1, 0, 0))
+
+                info = await cell.delDriveData(iden, vers=(1, 0, 0))
+                self.eq(info.get('size'), 0)
+                self.eq(info.get('version'), (0, 0, 0))
+                self.none(info.get('updated'))
+                self.none(info.get('updater'))
+
+                # repopulate a couple data versions to test migration and delete
+                versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
+                info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'hehe', 'size': 0, 'stuff': 14})
+                versinfo = {'version': (1, 1, 0), 'updated': tick + 10, 'updater': rootuser}
+                info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 17, 'stuff': 15})
+                self.eq(versinfo, (await cell.getDriveData(iden))[0])
 
-            with self.raises(s_exc.NoSuchIden):
-                await cell.reqDriveInfo('d7d6107b200e2c039540fc627bc5537d')
+                # This will be done by the cell in a cell storage version migration...
+                async def migrate_v1(info, versinfo, data):
+                    data['woot'] = 'woot'
+                    return data
 
-            with self.raises(s_exc.TypeMismatch):
-                await cell.getDriveInfo(iden, typename='newp')
+                await cell.drive.setTypeSchema('woot', testDataSchema_v1, migrate_v1)
 
-            self.nn(await cell.getDriveInfo(iden))
-            self.len(2, [vers async for vers in cell.getDriveDataVersions(iden)])
+                versinfo, data = await cell.getDriveData(iden, vers=(1, 0, 0))
+                self.eq('woot', data.get('woot'))
 
-            await cell.delDriveData(iden)
-            self.len(1, [vers async for vers in cell.getDriveDataVersions(iden)])
+                versinfo, data = await cell.getDriveData(iden, vers=(1, 1, 0))
+                self.eq('woot', data.get('woot'))
 
-            await cell.delDriveInfo(iden)
+                with self.raises(s_exc.NoSuchIden):
+                    await cell.reqDriveInfo('d7d6107b200e2c039540fc627bc5537d')
 
-            self.none(await cell.getDriveInfo(iden))
-            self.len(0, [vers async for vers in cell.getDriveDataVersions(iden)])
+                with self.raises(s_exc.TypeMismatch):
+                    await cell.getDriveInfo(iden, typename='newp')
 
-            with self.raises(s_exc.NoSuchPath):
-                await cell.getDrivePath('users/root/win32k.sys')
+                self.nn(await cell.getDriveInfo(iden))
+                self.len(2, [vers async for vers in cell.getDriveDataVersions(iden)])
 
-            pathinfo = await cell.addDrivePath('foo/bar/baz')
-            self.len(3, pathinfo)
-            self.eq('foo', pathinfo[0].get('name'))
-            self.eq(1, pathinfo[0].get('kids'))
-            self.eq('bar', pathinfo[1].get('name'))
-            self.eq(1, pathinfo[1].get('kids'))
-            self.eq('baz', pathinfo[2].get('name'))
-            self.eq(0, pathinfo[2].get('kids'))
+                await cell.delDriveData(iden)
+                self.len(1, [vers async for vers in cell.getDriveDataVersions(iden)])
 
-            self.eq(pathinfo, await cell.addDrivePath('foo/bar/baz'))
+                await cell.delDriveInfo(iden)
 
-            baziden = pathinfo[2].get('iden')
-            self.eq(pathinfo, await cell.drive.getItemPath(baziden))
+                self.none(await cell.getDriveInfo(iden))
+                self.len(0, [vers async for vers in cell.getDriveDataVersions(iden)])
 
-            info = await cell.setDriveInfoPerm(baziden, {'users': {rootuser: 3}, 'roles': {}})
-            self.eq(3, info['perm']['users'][rootuser])
+                with self.raises(s_exc.NoSuchPath):
+                    await cell.getDrivePath('users/root/win32k.sys')
 
-            with self.raises(s_exc.NoSuchIden):
-                # s_drive.rootdir is all 00s... ;)
-                await cell.setDriveInfoPerm(s_drive.rootdir, {'users': {}, 'roles': {}})
+                pathinfo = await cell.addDrivePath('foo/bar/baz')
+                self.len(3, pathinfo)
+                self.eq('foo', pathinfo[0].get('name'))
+                self.eq(1, pathinfo[0].get('kids'))
+                self.eq('bar', pathinfo[1].get('name'))
+                self.eq(1, pathinfo[1].get('kids'))
+                self.eq('baz', pathinfo[2].get('name'))
+                self.eq(0, pathinfo[2].get('kids'))
+
+                self.eq(pathinfo, await cell.addDrivePath('foo/bar/baz'))
+
+                baziden = pathinfo[2].get('iden')
+                self.eq(pathinfo, await cell.drive.getItemPath(baziden))
+
+                info = await cell.setDriveInfoPerm(baziden, {'users': {rootuser: 3}, 'roles': {}})
+                self.eq(3, info['perm']['users'][rootuser])
+
+                with self.raises(s_exc.NoSuchIden):
+                    # s_drive.rootdir is all 00s... ;)
+                    await cell.setDriveInfoPerm(s_drive.rootdir, {'users': {}, 'roles': {}})
+
+                await cell.addDrivePath('hehe/haha')
+                pathinfo = await cell.setDriveInfoPath(baziden, 'hehe/haha/hoho')
 
-            await cell.addDrivePath('hehe/haha')
-            pathinfo = await cell.setDriveInfoPath(baziden, 'hehe/haha/hoho')
+                self.eq('hoho', pathinfo[-1].get('name'))
+                self.eq(baziden, pathinfo[-1].get('iden'))
 
-            self.eq('hoho', pathinfo[-1].get('name'))
-            self.eq(baziden, pathinfo[-1].get('iden'))
+                self.true(await cell.drive.hasPathInfo('hehe/haha/hoho'))
+                self.false(await cell.drive.hasPathInfo('foo/bar/baz'))
 
-            self.true(await cell.drive.hasPathInfo('hehe/haha/hoho'))
-            self.false(await cell.drive.hasPathInfo('foo/bar/baz'))
+                pathinfo = await cell.getDrivePath('foo/bar')
+                self.eq(0, pathinfo[-1].get('kids'))
 
-            pathinfo = await cell.getDrivePath('foo/bar')
-            self.eq(0, pathinfo[-1].get('kids'))
+                pathinfo = await cell.getDrivePath('hehe/haha')
+                self.eq(1, pathinfo[-1].get('kids'))
 
-            pathinfo = await cell.getDrivePath('hehe/haha')
-            self.eq(1, pathinfo[-1].get('kids'))
+                with self.raises(s_exc.DupName):
+                    iden = pathinfo[-2].get('iden')
+                    name = pathinfo[-1].get('name')
+                    cell.drive.reqFreeStep(iden, name)
 
-            with self.raises(s_exc.DupName):
-                iden = pathinfo[-2].get('iden')
-                name = pathinfo[-1].get('name')
-                cell.drive.reqFreeStep(iden, name)
+                walks = [item async for item in cell.drive.walkPathInfo('hehe')]
+                self.len(3, walks)
+                # confirm walked paths are yielded depth first...
+                self.eq('hoho', walks[0].get('name'))
+                self.eq('haha', walks[1].get('name'))
+                self.eq('hehe', walks[2].get('name'))
 
-            walks = [item async for item in cell.drive.walkPathInfo('hehe')]
-            self.len(3, walks)
-            # confirm walked paths are yielded depth first...
-            self.eq('hoho', walks[0].get('name'))
-            self.eq('haha', walks[1].get('name'))
-            self.eq('hehe', walks[2].get('name'))
+                iden = walks[2].get('iden')
+                walks = [item async for item in cell.drive.walkItemInfo(iden)]
+                self.len(3, walks)
+                self.eq('hoho', walks[0].get('name'))
+                self.eq('haha', walks[1].get('name'))
+                self.eq('hehe', walks[2].get('name'))
 
-            iden = walks[2].get('iden')
-            walks = [item async for item in cell.drive.walkItemInfo(iden)]
-            self.len(3, walks)
-            self.eq('hoho', walks[0].get('name'))
-            self.eq('haha', walks[1].get('name'))
-            self.eq('hehe', walks[2].get('name'))
+                self.none(cell.drive.getTypeSchema('newp'))
 
-            self.none(cell.drive.getTypeSchema('newp'))
+                cell.drive.validators.pop('woot')
+                self.nn(cell.drive.getTypeValidator('woot'))
 
-            cell.drive.validators.pop('woot')
-            self.nn(cell.drive.getTypeValidator('woot'))
+                # move to root dir
+                pathinfo = await cell.setDriveInfoPath(baziden, 'zipzop')
+                self.len(1, pathinfo)
+                self.eq(s_drive.rootdir, pathinfo[-1].get('parent'))
 
-            # move to root dir
-            pathinfo = await cell.setDriveInfoPath(baziden, 'zipzop')
-            self.len(1, pathinfo)
-            self.eq(s_drive.rootdir, pathinfo[-1].get('parent'))
+                pathinfo = await cell.setDriveInfoPath(baziden, 'hehe/haha/hoho')
+                self.len(3, pathinfo)
 
-            pathinfo = await cell.setDriveInfoPath(baziden, 'hehe/haha/hoho')
-            self.len(3, pathinfo)
+            async with self.getTestCell(dirn=dirn) as cell:
+                data = {'type': 'woot', 'size': 20, 'stuff': 12, 'woot': 'woot'}
+                # explicitly clear out the cache JsValidators, otherwise we get the cached, pre-msgpack
+                # version of the validator, which will be correct and skip the point of this test.
+                s_config._JsValidators.clear()
+                cell.drive.reqValidData('woot', data)
 
     async def test_cell_auth(self):
 
@@ -2993,7 +3004,7 @@ class CellTest(s_t_utils.SynTest):
                 self.eq('barprof', valu)
 
                 msgs = await core.stormlist('cron.list')
-                self.stormIsInPrint('visi       8437c35a', msgs)
+                self.stormIsInPrint(' visi                      8437c35a.. ', msgs)
                 self.stormIsInPrint('[tel:mob:telem=*]', msgs)
 
                 msgs = await core.stormlist('dmon.list')

synapse/tests/test_lib_httpapi.py

@@ -777,6 +777,12 @@ class HttpApiTest(s_tests.SynTest):
                     retn = await resp.json()
                     self.eq('MissingField', retn.get('code'))
 
+                body = {'prop': 'test:comp', 'value': '3^foobar', 'typeopts': {'sepr': '^'}}
+                async with sess.get(f'https://localhost:{port}/api/v1/model/norm', json=body) as resp:
+                    retn = await resp.json()
+                    self.eq('ok', retn.get('status'))
+                    self.eq([3, 'foobar'], retn['result']['norm'])
+
                 # Norm via POST
                 body = {'prop': 'inet:ipv4', 'value': '1.2.3.4'}
                 async with sess.post(f'https://localhost:{port}/api/v1/model/norm', json=body) as resp:

synapse/tests/test_lib_nexus.py

@@ -310,6 +310,32 @@ class NexusTest(s_t_utils.SynTest):
                         await cell01.sync()
                     self.isin(s_nexus.leaderversion, cell01.nexsroot.writeholds)
 
+                cell00.getCellInfo = getCellInfo
+
+                # test case where a mirror which is updated first may push events
+                # the leader does not yet have handlers for
+                async with await s_cell.Cell.anit(dirn=path) as cell01:
+                    cell01.nexsiden = 'newp'
+                    with self.raises(s_exc.NoSuchIden) as cm:
+                        await cell01.sync()
+                    self.eq(cm.exception.get('mesg'), 'No Nexus Pusher with iden newp.')
+
+                    self.none(await cell00.nexsroot.nexslog.last())
+                    self.none(await cell01.nexsroot.nexslog.last())
+
+                    cell01.nexsiden = cell00.nexsiden
+                    await cell01.sync()
+
+                    self.eq(0, (await cell00.nexsroot.nexslog.last())[0])
+                    self.eq(0, (await cell01.nexsroot.nexslog.last())[0])
+
+                    with self.raises(s_exc.NoSuchName) as cm:
+                        await cell01._push('newp')
+                    self.eq(cm.exception.get('mesg'), 'No Nexus handler for event newp.')
+
+                    self.eq(0, (await cell00.nexsroot.nexslog.last())[0])
+                    self.eq(0, (await cell01.nexsroot.nexslog.last())[0])
+
     async def test_mirror_nexus_loop_failure(self):
         with self.getTestDir() as dirn:
 

synapse/tests/test_lib_scrape.py

@@ -1,5 +1,7 @@
 from unittest import mock
 
+import regex
+
 import synapse.exc as s_exc
 
 import synapse.lib.scrape as s_scrape
@@ -889,14 +891,20 @@ class ScrapeTest(s_t_utils.SynTest):
         nodes.remove(('inet:url', 'smb://1:2:3:4:5:6:7:8/share'))
 
     async def test_scrape_async(self):
+        text = 'log4j vuln CVE-2021-44228 is pervasive'
+        ndefs = await s_t_utils.alist(s_scrape.scrapeAsync(text))
+        self.eq(ndefs, (('it:sec:cve', 'CVE-2021-44228'),))
 
-        with mock.patch('synapse.lib.scrape.SCRAPE_SPAWN_LENGTH', 0):
-            ndefs = await s_t_utils.alist(s_scrape.scrapeAsync('log4j vuln CVE-2021-44228 is pervasive'))
-            self.eq(ndefs, (('it:sec:cve', 'CVE-2021-44228'),))
+        regx = regex.compile('(?P<valu>CVE-[0-9]{4}-[0-9]{4,})(?:[^a-z0-9]|$)')
+        infos = s_scrape._genMatchList(text, regx, {})
+        self.eq(infos, [{'match': 'CVE-2021-44228', 'offset': 11, 'valu': 'CVE-2021-44228'}])
 
-            text = 'endashs are a vulnerability  CVE\u20132022\u20131138 '
-            infos = await s_t_utils.alist(s_scrape.contextScrapeAsync(text))
-            self.eq(infos, [{'match': 'CVE–2022–1138', 'offset': 29, 'valu': 'CVE-2022-1138', 'form': 'it:sec:cve'}])
+        text = 'endashs are a vulnerability  CVE\u20132022\u20131138 '
+        infos = await s_t_utils.alist(s_scrape.contextScrapeAsync(text))
+        self.eq(infos, [{'match': 'CVE–2022–1138', 'offset': 29, 'valu': 'CVE-2022-1138', 'form': 'it:sec:cve'}])
+
+        infos = s_scrape._contextScrapeList(text)
+        self.eq(infos, [{'match': 'CVE–2022–1138', 'offset': 29, 'valu': 'CVE-2022-1138', 'form': 'it:sec:cve'}])
 
     def test_scrape_sequential(self):
         md5 = ('a' * 32, 'b' * 32,)

synapse/tests/test_lib_storm.py

@@ -638,6 +638,8 @@ class StormTest(s_t_utils.SynTest):
             with self.raises(s_exc.NoSuchVar):
                 await core.nodes('background { $lib.print($foo) }')
 
+            await core.nodes('background ${ $foo=test $lib.print($foo) }')
+
             await core.nodes('background { $lib.time.sleep(4) }')
             task = await core.callStorm('for $t in $lib.ps.list() { if $t.info.background { return($t) } }')
             self.nn(task)
@@ -667,6 +669,9 @@ class StormTest(s_t_utils.SynTest):
             q = '[ inet:fqdn=www.vertex.link ] $q=:domain | parallel $q'
             await self.asyncraises(s_exc.StormRuntimeError, core.nodes(q))
 
+            nodes = await core.nodes('ou:org | parallel ${ $foo=bar [ :name=$foo ]}')
+            self.true(all([n.get('name') == 'bar' for n in nodes]))
+
             # test $lib.exit() and the StormExit handlers
             msgs = [m async for m in core.view.storm('$lib.exit()')]
             self.eq(msgs[-1][0], 'fini')
@@ -2137,6 +2142,49 @@ class StormTest(s_t_utils.SynTest):
             self.nn(bot.get('country::flag::md5'))
             self.eq(bot['country::flag::md5'][0], 'fa818a259cbed7ce8bc2a22d35a464fc')
 
+            await core.nodes('''
+                [( risk:vulnerable=*
+                    :mitigated=true
+                    :node={ [ it:prod:hardware=* :name=foohw ] return($node.ndef()) }
+                    :vuln={[ risk:vuln=* :name=barvuln ]}
+                    +#test
+                )]
+                [( inet:service:rule=*
+                    :object={ risk:vulnerable#test return($node.ndef()) }
+                    :grantee={ [ inet:service:account=* :id=foocon ] return($node.ndef()) }
+                    +#test
+                )]
+            ''')
+
+            opts = {
+                'embeds': {
+                    'risk:vulnerable': {
+                        'vuln': ['name'],
+                        'node': ['name'],
+                    },
+                    'inet:service:rule': {
+                        'object': ['mitigated', 'newp'],
+                        'object::node': ['name', 'newp'],
+                        'grantee': ['id', 'newp'],
+                    }
+                }
+            }
+            msgs = await core.stormlist('inet:service:rule#test :object -+> risk:vulnerable', opts=opts)
+            nodes = sorted([m[1] for m in msgs if m[0] == 'node'], key=lambda p: p[0][0])
+            self.eq(['inet:service:rule', 'risk:vulnerable'], [n[0][0] for n in nodes])
+
+            embeds = nodes[0][1]['embeds']
+            self.eq(1, embeds['object']['mitigated'])
+            self.eq(None, embeds['object']['newp'])
+            self.eq('foohw', embeds['object::node']['name'])
+            self.eq(None, embeds['object::node']['newp'])
+            self.eq('foocon', embeds['grantee']['id'])
+            self.eq(None, embeds['grantee']['newp'])
+
+            embeds = nodes[1][1]['embeds']
+            self.eq('barvuln', embeds['vuln']['name'])
+            self.eq('foohw', embeds['node']['name'])
+
     async def test_storm_wget(self):
 
         async def _getRespFromSha(core, mesgs):