synapse 2.160.0__py311-none-any.whl → 2.162.0__py311-none-any.whl

synapse/models/proj.py

@@ -52,8 +52,11 @@ class ProjectModule(s_module.CoreModule):
                         'doc': 'A collection of tickets related to a topic.',
                     }),
                     ('proj:ticket', ('guid', {}), {
-                        'doc': 'A ticket in a ticketing system.',
-                    }),
+                        'doc': 'A ticket in a ticketing system.'}),
+
+                    ('proj:project:type:taxonomy', ('taxonomy', {}), {
+                        'doc': 'A type taxonomy for projects.'}),
+
                     ('proj:sprint', ('guid', {}), {
                         'doc': 'A timeboxed period to complete a set amount of work.',
                     }),
@@ -70,11 +73,15 @@ class ProjectModule(s_module.CoreModule):
 
                 'forms': (
 
+                    ('proj:project:type:taxonomy', {}, {}),
                     ('proj:project', {}, (
 
                         ('name', ('str', {'lower': True, 'onespace': True}), {
                             'doc': 'The project name.'}),
 
+                        ('type', ('proj:project:type:taxonomy', {}), {
+                            'doc': 'The project type.'}),
+
                         ('desc', ('str', {}), {
                             'disp': {'hint': 'text'},
                             'doc': 'The project description.'}),

synapse/models/risk.py

@@ -23,6 +23,15 @@ class CvssV3(s_types.Str):
             mesg = exc.get('mesg')
             raise s_exc.BadTypeValu(name=self.name, valu=text, mesg=mesg) from None
 
+alertstatus = (
+    (0, 'new'),
+    (10, 'enrichment'),
+    (20, 'todo'),
+    (30, 'analysis'),
+    (40, 'remediation'),
+    (50, 'done'),
+)
+
 class RiskModule(s_module.CoreModule):
 
     def getModelDefs(self):
@@ -281,17 +290,31 @@ class RiskModule(s_module.CoreModule):
 
                 )),
                 ('risk:mitigation', {}, (
+
                     ('vuln', ('risk:vuln', {}), {
                         'doc': 'The vulnerability that this mitigation addresses.'}),
+
                     ('name', ('str', {}), {
                         'doc': 'A brief name for this risk mitigation.'}),
+
                     ('desc', ('str', {}), {
                         'disp': {'hint': 'text'},
                         'doc': 'A description of the mitigation approach for the vulnerability.'}),
+
                     ('software', ('it:prod:softver', {}), {
                         'doc': 'A software version which implements a fix for the vulnerability.'}),
+
                     ('hardware', ('it:prod:hardware', {}), {
                         'doc': 'A hardware version which implements a fix for the vulnerability.'}),
+
+                    ('reporter', ('ou:org', {}), {
+                        'doc': 'The organization reporting on the mitigation.'}),
+
+                    ('reporter:name', ('ou:name', {}), {
+                        'doc': 'The name of the organization reporting on the mitigation.'}),
+
+                    ('tag', ('syn:tag', {}), {
+                        'doc': 'The tag used to annotate nodes which have the mitigation in place.'}),
                 )),
                 ('risk:vulnname', {}, ()),
                 ('risk:vuln:type:taxonomy', {}, ()),
@@ -598,6 +621,9 @@ class RiskModule(s_module.CoreModule):
                         'disp': {'hint': 'text'},
                         'doc': 'A free-form description / overview of the alert.'}),
 
+                    ('status', ('int', {'enums': alertstatus}), {
+                        'doc': 'The status of the alert.'}),
+
                     ('benign', ('bool', {}), {
                         'doc': 'Set to true if the alert has been confirmed benign. Set to false if malicious.'}),
 
@@ -611,6 +637,12 @@ class RiskModule(s_module.CoreModule):
                         'ex': 'benign.false_positive',
                         'doc': 'A verdict about why the alert is malicious or benign, as a taxonomy entry.'}),
 
+                    ('assignee', ('syn:user', {}), {
+                        'doc': 'The Synapse user who is assigned to investigate the alert.'}),
+
+                    ('ext:assignee', ('ps:contact', {}), {
+                        'doc': 'The alert assignee contact information from an external system.'}),
+
                     ('engine', ('it:prod:softver', {}), {
                         'doc': 'The software that generated the alert.'}),
 

synapse/telepath.py

@@ -598,6 +598,7 @@ class Proxy(s_base.Base):
         self.tasks = {}
         self.shares = {}
 
+        self._ahainfo = {}
         self.sharinfo = {}
         self.methinfo = {}
 
@@ -902,6 +903,7 @@ class Proxy(s_base.Base):
             raise s_exc.LinkShutDown(mesg=mesg)
 
         self.sess = self.synack[1].get('sess')
+        self._ahainfo = self.synack[1].get('ahainfo', {})
         self.sharinfo = self.synack[1].get('sharinfo', {})
         self.methinfo = self.sharinfo.get('meths', {})
 
@@ -1018,6 +1020,9 @@ class Pool(s_base.Base):
         svcinfo = mesg[1].get('svcinfo')
         urlinfo = mergeAhaInfo(self.urlinfo, svcinfo.get('urlinfo', {}))
 
+        if (oldc := self.clients.pop(svcname, None)) is not None:
+            await oldc.fini()
+
         # one-off default user to root
         self.clients[svcname] = await Client.anit(urlinfo, onlink=self._onPoolLink)
         await self.fire('svc:add', **mesg[1])
@@ -1068,7 +1073,6 @@ class Pool(s_base.Base):
                 await reset()
 
                 async for mesg in ahaproxy.iterPoolTopo(poolname):
-
                     hand = self.mesghands.get(mesg[0])
                     if hand is None: # pragma: no cover
                         logger.warning(f'Unknown AHA pool topography message: {mesg}')
@@ -1078,7 +1082,7 @@ class Pool(s_base.Base):
 
             except Exception as e:
                 logger.warning(f'AHA pool topology task restarting: {e}')
-                await asyncio.sleep(1)
+                await self.waitfini(timeout=1)
 
     async def proxy(self, timeout=None):
 

synapse/tests/files/rstorm/testsvc.py

@@ -8,10 +8,17 @@ class TestsvcApi(s_cell.CellApi, s_stormsvc.StormSvc):
         {
             'name': 'testsvc',
             'version': (0, 0, 1),
+            'onload': '''
+                $lib.time.sleep($lib.globals.get(onload_sleep, 0))
+                $lib.globals.set(testsvc, testsvc-done)
+            ''',
             'commands': (
                 {
                     'name': 'testsvc.test',
-                    'storm': '$lib.print($lib.service.get($cmdconf.svciden).test())',
+                    'storm': '''
+                        $lib.print($lib.service.get($cmdconf.svciden).test())
+                        $lib.print($lib.globals.get(testsvc))
+                    ''',
                 },
             )
         },

synapse/tests/files/stormpkg/testpkg.yaml

@@ -31,6 +31,10 @@ modules:
               type: dict
               desc: A status dictionary.
 
+onload: |
+  $lib.time.sleep($lib.globals.get(onload_sleep, 0))
+  $lib.globals.set(testpkg, testpkg-done)
+
 external_modules:
     - name: testext
       package: synapse.tests.files

synapse/tests/test_axon.py

@@ -985,10 +985,10 @@ bar baz",vv
 
             q = f'''
             $fields = $lib.list(
-                $lib.dict(name=file, sha256=$sha256, filename=file),
-                $lib.dict(name=zip_password, value=test),
-                $lib.dict(name=dict, value=$lib.dict(foo=bar)),
-                $lib.dict(name=bytes, value=$bytes)
+                ({{'name':'file', 'sha256':$sha256, 'filename':'file'}}),
+                ({{'name':'zip_password', 'value':'test'}}),
+                ({{'name':'dict', 'value':({{'foo':'bar'}}) }}),
+                ({{'name':'bytes', 'value':$bytes}})
             )
             $resp = $lib.inet.http.post("https://127.0.0.1:{port}/api/v1/pushfile",
                                         fields=$fields, ssl_verify=(0))

synapse/tests/test_cortex.py

@@ -3947,6 +3947,60 @@ class CortexBasicTest(s_t_utils.SynTest):
             q = '$lib.graph.add(({"name": "foo", "forms": {"newp": {}}}))'
             await self.asyncraises(s_exc.NoSuchForm, core.nodes(q))
 
+            iden = await core.callStorm('''
+                $rules = ({
+                    "name": "graph proj",
+                    "forms": {
+                        "biz:deal": {
+                            "pivots": [" --> *", " <-- *"],
+                        },
+                        "pol:country": {
+                            "pivots": ["--> *", "<-- *"],
+                            "filters": ["-file:bytes"]
+                        },
+                        "*": {
+                            "pivots": ["-> #"]
+                        }
+                    },
+                })
+                return($lib.graph.add($rules).iden)
+            ''')
+
+            guids = {
+                'race': 'cdd9e140d78830fb46d880dd36b62961',
+                'biz': 'c5352253cb13545205664e088ad210f0',
+                'orgA': '2e5dcdb52552ca22fa7996158588ea01',
+                'orgB': '9ea20ce1375d0ff0d16acfe807289a95',
+                'pol': '111e3b57f9bbf973febe74b1e98e89f8'
+            }
+
+            await core.callStorm('''[
+                (pol:country=$pol
+                    :name="some government"
+                    :flag=fd0a257397ee841ccd3b6ba76ad59c70310fd402ea3c9392d363f754ddaa67b5
+                    <(running)+ { [ pol:race=$race ] }
+                    +#some.stuff)
+                (ou:org=$orgA
+                   :url=https://foo.bar.com/wat.html)
+                (ou:org=$orgB
+                   :url=https://neato.burrito.org/stuff.html
+                   +#rep.stuff)
+                (biz:deal=$biz
+                    :buyer:org=$orgA
+                    :seller:org=$orgB
+                    <(seen)+ { pol:country=$pol })
+            ]''', opts={'vars': guids})
+
+            nodes = await core.nodes('biz:deal | $lib.graph.activate($iden)', opts={'vars': {'iden': iden}})
+            self.len(4, nodes)
+            ndefs = set([n.ndef for n in nodes])
+            self.eq(ndefs, set([
+                ('biz:deal', guids['biz']),
+                ('ou:org', guids['orgA']),
+                ('ou:org', guids['orgB']),
+                ('pol:country', guids['pol']),
+            ]))
+
         with self.getTestDir() as dirn:
             async with self.getTestCore(dirn=dirn) as core:
                 visi = await core.auth.addUser('visi')
@@ -3974,7 +4028,7 @@ class CortexBasicTest(s_t_utils.SynTest):
             self.len(1, nodes)
             self.eq('baz', nodes[0].ndef[1])
 
-            q = '$d = $lib.dict("field 1"=foo, "field 2"=bar) [test:str=$d.\'field 1\']'
+            q = '$d = ({"field 1": "foo", "field 2": "bar"}) [test:str=$d.\'field 1\']'
             nodes = await core.nodes(q)
             self.len(1, nodes)
             self.eq('foo', nodes[0].ndef[1])
@@ -4852,7 +4906,7 @@ class CortexBasicTest(s_t_utils.SynTest):
             pode = podes[0]
             self.true(s_node.tagged(pode, '#foo'))
 
-            nodes = await core.nodes('$d = $lib.dict(foo=bar) [test:str=yop +#$d.foo]')
+            nodes = await core.nodes('$d = ({"foo": "bar"}) [test:str=yop +#$d.foo]')
             self.len(1, nodes)
             self.nn(nodes[0].getTag('bar'))
 
@@ -4898,7 +4952,7 @@ class CortexBasicTest(s_t_utils.SynTest):
             pode = podes[0]
             self.true(s_node.tagged(pode, '#timetag'))
 
-            nodes = await core.nodes('$d = $lib.dict(foo="") [test:str=yop +?#$d.foo +#tag1]')
+            nodes = await core.nodes('$d = ({"foo": ""}) [test:str=yop +?#$d.foo +#tag1]')
             self.len(1, nodes)
             self.none(nodes[0].getTag('foo.*'))
             self.nn(nodes[0].getTag('tag1'))
@@ -4937,7 +4991,7 @@ class CortexBasicTest(s_t_utils.SynTest):
             self.eq([n.ndef[0] for n in nodes], [*['test:str', 'inet:ipv4'] * 3])
 
             # non-runsafe iteration over a dictionary
-            q = '''$dict=$lib.dict(key1=valu1, key2=valu2) [(test:str=test1) (test:str=test2)]
+            q = '''$dict=({"key1": "valu1", "key2": "valu2"}) [(test:str=test1) (test:str=test2)]
             for ($key, $valu) in $dict {
                 [:hehe=$valu]
             }
@@ -4950,14 +5004,14 @@ class CortexBasicTest(s_t_utils.SynTest):
                 self.eq(node.get('hehe'), 'valu2')
 
             # None values don't yield anything
-            q = '''$foo = $lib.dict()
+            q = '''$foo = ({})
             for $name in $foo.bar { [ test:str=$name ] }
             '''
             nodes = await core.nodes(q)
             self.len(0, nodes)
 
             # Even with a inbound node, zero loop iterations will not yield inbound nodes.
-            q = '''test:str=test1 $foo = $lib.dict()
+            q = '''test:str=test1 $foo = ({})
             for $name in $foo.bar { [ test:str=$name ] }
             '''
             nodes = await core.nodes(q)
@@ -8005,6 +8059,9 @@ class CortexBasicTest(s_t_utils.SynTest):
                     self.true(core01.isactive)
                     self.false(core00.isactive)
 
+                    # Let the mirror reconnect
+                    self.true(await asyncio.wait_for(core01.stormpool.ready.wait(), timeout=12))
+
                     with self.getLoggerStream('synapse') as stream:
                         self.true(await core01.callStorm('inet:asn=0 return($lib.true)'))
 
@@ -8013,11 +8070,12 @@ class CortexBasicTest(s_t_utils.SynTest):
                     self.isin('Offloading Storm query', data)
                     self.notin('Timeout waiting for query mirror', data)
 
-                    waiter = core01.stormpool.waiter('svc:del', 1)
-                    msgs = await core01.stormlist('aha.pool.svc.del pool00... 01.core...')
+                    waiter = core01.stormpool.waiter(1, 'svc:del')
+                    msgs = await core01.stormlist('aha.pool.svc.del pool00... 01.core...', opts={'mirror': False})
                     self.stormHasNoWarnErr(msgs)
                     self.stormIsInPrint('AHA service (01.core...) removed from service pool (pool00.loop.vertex.link)', msgs)
 
+                    # TODO: this wait should not return None
                     await waiter.wait(timeout=3)
                     with self.getLoggerStream('synapse') as stream:
                         msgs = await alist(core01.storm('inet:asn=0'))

synapse/tests/test_daemon.py

@@ -56,6 +56,25 @@ class DaemonTest(s_t_utils.SynTest):
                 async with await s_telepath.openurl(f'tcp://127.0.0.1:{port}/foo') as foo:
                     pass
 
+    async def test_dmon_ahainfo(self):
+
+        async with await s_daemon.Daemon.anit() as dmon:
+
+            host, port = await dmon.listen('tcp://127.0.0.1:0')
+            dmon.share('*', Foo())
+
+            async with await s_telepath.openurl(f'tcp://127.0.0.1:{port}') as proxy:
+                self.eq(proxy._ahainfo, {})
+
+        ahainfo = {'name': 'test.loop.vertex.link'}
+        async with await s_daemon.Daemon.anit(ahainfo=ahainfo) as dmon:
+
+            host, port = await dmon.listen('tcp://127.0.0.1:0')
+            dmon.share('*', Foo())
+
+            async with await s_telepath.openurl(f'tcp://127.0.0.1:{port}') as proxy:
+                self.eq(proxy._ahainfo, ahainfo)
+
 class SvcApi(s_cell.CellApi, s_stormsvc.StormSvc):
     _storm_svc_name = 'foo'
     _storm_svc_pkgs = (  # type:  ignore

synapse/tests/test_lib_agenda.py

@@ -346,9 +346,11 @@ class AgendaTest(s_t_utils.SynTest):
                 adef = await agenda.add(cdef)
                 guid = adef.get('iden')
 
+                strt = await core.nexsroot.index()
                 # bypass the API because it would actually syntax check
                 unixtime += 60
                 self.eq((11, 'boom'), await asyncio.wait_for(core.callStorm('return($lib.queue.gen(visi).pop(wait=$lib.true))'), timeout=5))
+                await core.nexsroot.waitOffs(strt + 5)
 
                 appt = await agenda.get(guid)
                 self.eq(appt.isrunning, False)
@@ -399,6 +401,8 @@ class AgendaTest(s_t_utils.SynTest):
                 await agenda.add(cdef)
 
                 # Lock user and advance time
+                strt = await core.nexsroot.index()
+
                 await visi.setLocked(True)
 
                 with self.getLoggerStream('synapse.lib.agenda', 'locked') as stream:
@@ -408,6 +412,8 @@ class AgendaTest(s_t_utils.SynTest):
                     while not stream.wait(0.1):
                         await asyncio.sleep(0)
 
+                    await core.nexsroot.waitOffs(strt + 4)
+
                     self.eq(2, appt.startcount)
 
     async def test_agenda_persistence(self):
@@ -579,6 +585,7 @@ class AgendaTest(s_t_utils.SynTest):
             jobs = await core.callStorm('return($lib.cron.list())')
             self.len(1, jobs)
             self.eq(defview.iden, jobs[0]['view'])
+            self.nn(jobs[0].get('created'))
 
             core.agenda._addTickOff(60)
             retn = await core.callStorm('return($lib.queue.get(testq).get())', opts=asfail)
@@ -799,6 +806,7 @@ class AgendaTest(s_t_utils.SynTest):
 
                     nodes = await core01.nodes('syn:cron')
                     self.len(1, nodes)
+                    self.nn(nodes[0].props.get('.created'))
                     self.eq(nodes[0].props.get('name'), 'foo')
                     self.eq(nodes[0].props.get('doc'), 'bar')
 

synapse/tests/test_lib_aha.py

@@ -248,6 +248,11 @@ class AhaTest(s_test.SynTest):
             }
             async with self.getTestCryo(conf=conf) as cryo:
 
+                info = await cryo.getCellInfo()
+                cnfo = info.get('cell')
+                anfo = cnfo.get('aha')
+                self.eq(cnfo.get('aha'), {'name': '0.cryo', 'leader': 'cryo', 'network': 'foo'})
+
                 await cryo.auth.rootuser.setPasswd('secret')
 
                 await wait01.wait(timeout=2)
@@ -1160,7 +1165,14 @@ class AhaTest(s_test.SynTest):
 
                     async with await s_telepath.open('aha://pool00...') as pool:
 
-                        waiter = pool.waiter('svc:add', 2)
+                        replay = s_common.envbool('SYNDEV_NEXUS_REPLAY')
+                        nevents = 5 if replay else 3
+
+                        waiter = pool.waiter(nevents, 'svc:add')
+
+                        msgs = await core00.stormlist('aha.pool.svc.add pool00... 01...')
+                        self.stormHasNoWarnErr(msgs)
+                        self.stormIsInPrint('AHA service (01...) added to service pool (pool00.loop.vertex.link)', msgs)
 
                         msgs = await core00.stormlist('aha.pool.svc.add pool00... 01...')
                         self.stormHasNoWarnErr(msgs)
@@ -1179,12 +1191,15 @@ class AhaTest(s_test.SynTest):
                         self.eq(core00.auth.rootuser.iden, poolinfo['services']['00.loop.vertex.link']['creator'])
                         self.eq(core00.auth.rootuser.iden, poolinfo['services']['01.loop.vertex.link']['creator'])
 
+                        for client in pool.clients.values():
+                            await client.proxy(timeout=3)
+
                         proxy00 = await pool.proxy(timeout=3)
                         run00 = await (await pool.proxy(timeout=3)).getCellRunId()
                         run01 = await (await pool.proxy(timeout=3)).getCellRunId()
                         self.ne(run00, run01)
 
-                        waiter = pool.waiter('pool:reset', 1)
+                        waiter = pool.waiter(1, 'pool:reset')
 
                         ahaproxy = await pool.aha.proxy()
                         await ahaproxy.fini()
@@ -1192,7 +1207,7 @@ class AhaTest(s_test.SynTest):
                         await waiter.wait(timeout=3)
 
                         # wait for the pool to be notified of the topology change
-                        waiter = pool.waiter('svc:del', 1)
+                        waiter = pool.waiter(1, 'svc:del')
 
                         msgs = await core00.stormlist('aha.pool.svc.del pool00... 00...')
                         self.stormHasNoWarnErr(msgs)

synapse/tests/test_lib_ast.py

@@ -495,7 +495,7 @@ class AstTest(s_test.SynTest):
             self.none(await core.callStorm('$foo = $lib.null return($foo.bar.baz)'))
 
             q = '''
-            $d = $lib.dict(foo=bar, bar=baz, baz=biz)
+            $d = ({"foo": "bar", "bar": "baz", "baz": "biz"})
             for ($key, $val) in $d {
                 [ test:str=$d.$key ]
             }
@@ -506,7 +506,7 @@ class AstTest(s_test.SynTest):
             self.eq(set(['bar', 'baz', 'biz']), reprs)
 
             q = '''
-            $data = $lib.dict(foo=$lib.dict(bar=$lib.dict(woot=final)))
+            $data = ({"foo": ({"bar": ({"woot": "final"}) }) })
             $varkey=woot
             [ test:str=$data.foo.bar.$varkey ]
             '''
@@ -520,11 +520,11 @@ class AstTest(s_test.SynTest):
 
             $f = var
             $g = tar
-            $de = $lib.dict(car=$f, zar=$g)
-            $dd = $lib.dict(mar=$de)
-            $dc = $lib.dict(bar=$dd)
-            $db = $lib.dict(var=$dc)
-            $foo = $lib.dict(woot=$db)
+            $de = ({"car": $f, "zar": $g})
+            $dd = ({"mar": $de})
+            $dc = ({"bar": $dd})
+            $db = ({"var": $dc})
+            $foo = ({"woot": $db})
             [ test:str=$foo.woot.var.$bar.mar.$car ]
             '''
             nodes = await core.nodes(q)
@@ -532,7 +532,7 @@ class AstTest(s_test.SynTest):
             self.eq('var', nodes[0].repr())
 
             q = '''
-            $data = $lib.dict('vertex project'=foobar)
+            $data = ({'vertex project': 'foobar'})
             $"spaced key" = 'vertex project'
             [ test:str = $data.$"spaced key" ]
             '''
@@ -541,7 +541,7 @@ class AstTest(s_test.SynTest):
             self.eq('foobar', nodes[0].repr())
 
             q = '''
-            $data = $lib.dict('bar baz'=woot)
+            $data = ({'bar baz': "woot"})
             $'new key' = 'bar baz'
             [ test:str=$data.$'new key' ]
             '''
@@ -550,9 +550,9 @@ class AstTest(s_test.SynTest):
             self.eq('woot', nodes[0].repr())
 
             q = '''
-            $bottom = $lib.dict(lastkey=synapse)
-            $subdata = $lib.dict('bar baz'=$bottom)
-            $data = $lib.dict(vertex=$subdata)
+            $bottom = ({"lastkey": "synapse"})
+            $subdata = ({'bar baz': $bottom})
+            $data = ({"vertex": $subdata})
             $'new key' = 'bar baz'
             $'over key' = vertex
             [ test:str=$data.$'over key'.$"new key".lastkey ]
@@ -562,7 +562,7 @@ class AstTest(s_test.SynTest):
             self.eq('synapse', nodes[0].repr())
 
             q = '''
-            $data = $lib.dict(foo=bar)
+            $data = ({"foo": "bar"})
             $key = nope
             [ test:str=$data.$key ]
             '''
@@ -1850,7 +1850,7 @@ class AstTest(s_test.SynTest):
 
             q = '''
                 $x = asdf
-                $y = $lib.dict()
+                $y = ({})
 
                 $y.foo = bar
                 $y."baz faz" = hehe
@@ -1870,7 +1870,7 @@ class AstTest(s_test.SynTest):
             self.eq(nodes[5].ndef[1], 'qwer')
 
             # non-runtsafe test
-            q = '''$dict = $lib.dict()
+            q = '''$dict = ({})
             [(test:str=key1 :hehe=val1) (test:str=key2 :hehe=val2)]
             $key=$node.value()
             $dict.$key=:hehe
@@ -2822,7 +2822,7 @@ class AstTest(s_test.SynTest):
             mesgs = await core.stormlist(q, opts={'vars': {'ret': 'foo'}})
             self.stormIsInErr('Cannot find name [squeeeeeee]', mesgs)
 
-            q = '$ret=$lib.dict(bar=$ret)'
+            q = '$ret=({"bar": $ret})'
             mesgs = await core.stormlist(q)
             self.stormIsInErr('Missing variable: ret', mesgs)
 
@@ -3441,6 +3441,14 @@ class AstTest(s_test.SynTest):
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('test:str', 'test2'))
 
+            q = '''
+            $foo = bar
+            $q = ${ $lib.print($foo) }
+            for $x in $q { $lib.print(bar) }
+            '''
+            msgs = await core.stormlist(q)
+            self.stormIsInPrint('bar', msgs)
+
         # Should produce the same results in a macro sub-runtime
         async with self.getTestCore() as core:
             nodes = await core.nodes('[test:str=test1]')
@@ -3480,6 +3488,20 @@ class AstTest(s_test.SynTest):
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('test:str', 'test2'))
 
+            q = '''
+            $q = ${
+                $foo = bar
+                $q = ${ $lib.print($foo) }
+                for $x in $q { $lib.print(bar) }
+            }
+            $lib.macro.set(test, $q)
+            return($lib.true)
+            '''
+            self.true(await core.callStorm(q))
+
+            msgs = await core.stormlist('macro.exec test')
+            self.stormIsInPrint('bar', msgs)
+
     async def test_ast_subq_runtsafety(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_cell.py

@@ -559,6 +559,9 @@ class CellTest(s_t_utils.SynTest):
                 # A Cortex populated cellvers
                 self.isin('cortex:defaults', cnfo.get('cellvers', {}))
 
+                # Defaults aha data is
+                self.eq(cnfo.get('aha'), {'name': None, 'leader': None, 'network': None})
+
                 # Synapse information
                 self.eq(snfo.get('version'), s_version.version)
                 self.eq(snfo.get('verstring'), s_version.verstring),

synapse/tests/test_lib_grammar.py

@@ -119,7 +119,7 @@ Queries = [
     '#test.bar -#test <+- *',
     '#test.bar -#test <- *',
     '$bar=5.5.5.5 [ inet:ipv4=$bar ]',
-    '$blah = $lib.dict(foo=vertex.link) [ inet:fqdn=$blah.foo ]',
+    '$blah = ({"foo": "vertex.link"}) [ inet:fqdn=$blah.foo ]',
     '($tick, $tock) = .seen',
     '.created',
     '.created<2010',
@@ -585,7 +585,7 @@ Queries = [
     ''' [(ou:org=c71cd602f73af5bed208da21012fdf54 :loc=us )]''',
     'function x(y, z) { return ($( $x - $y ) ) }',
     'function echo(arg, arg2=default) { return ($arg) }',
-    '$name = asdf $foo = $lib.dict() $foo.bar = asdf $foo."bar baz" = asdf $foo.$name = asdf',
+    '$name = asdf $foo = ({}) $foo.bar = asdf $foo."bar baz" = asdf $foo.$name = asdf',
     '[test:str=a] switch $node.form() { hehe: {[+#baz]} }',
     '[test:str=a] switch $woot { hehe: {[+#baz]} }',
     '[test:str=c] switch $woot { hehe: {[+#baz]} *: {[+#jaz]} }',
@@ -830,7 +830,7 @@ _ParseResults = [
     'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: -, TagCond: [TagMatch: [Const: test]]], PivotIn: [], isjoin=True]',
     'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: -, TagCond: [TagMatch: [Const: test]]], PivotIn: [], isjoin=False]',
     'Query: [SetVarOper: [Const: bar, Const: 5.5.5.5], EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, VarValue: [Const: bar]]]',
-    'Query: [SetVarOper: [Const: blah, FuncCall: [VarDeref: [VarValue: [Const: lib], Const: dict], CallArgs: [], CallKwargs: [CallKwarg: [Const: foo, Const: vertex.link]]]], EditNodeAdd: [FormName: [Const: inet:fqdn], Const: =, VarDeref: [VarValue: [Const: blah], Const: foo]]]',
+    'Query: [SetVarOper: [Const: blah, DollarExpr: [ExprDict: [Const: foo, Const: vertex.link]]], EditNodeAdd: [FormName: [Const: inet:fqdn], Const: =, VarDeref: [VarValue: [Const: blah], Const: foo]]]',
     "Query: [VarListSetOper: [VarList: ['tick', 'tock'], UnivPropValue: [UnivProp: [Const: .seen]]]]",
     'Query: [LiftProp: [Const: .created]]',
     'Query: [LiftPropBy: [Const: .created, Const: <, Const: 2010]]',
@@ -1241,7 +1241,7 @@ _ParseResults = [
     'Query: [EditParens: [EditNodeAdd: [FormName: [Const: ou:org], Const: =, Const: c71cd602f73af5bed208da21012fdf54], EditPropSet: [RelProp: [Const: loc], Const: =, Const: us]]]',
     'Query: [Function: [Const: x, FuncArgs: [Const: y, Const: z], Query: [Return: [DollarExpr: [ExprNode: [VarValue: [Const: x], Const: -, VarValue: [Const: y]]]]]]]',
     'Query: [Function: [Const: echo, FuncArgs: [Const: arg, CallKwarg: [Const: arg2, Const: default]], Query: [Return: [VarValue: [Const: arg]]]]]',
-    'Query: [SetVarOper: [Const: name, Const: asdf], SetVarOper: [Const: foo, FuncCall: [VarDeref: [VarValue: [Const: lib], Const: dict], CallArgs: [], CallKwargs: []]], SetItemOper: [VarValue: [Const: foo], Const: bar, Const: asdf], SetItemOper: [VarValue: [Const: foo], Const: bar baz, Const: asdf], SetItemOper: [VarValue: [Const: foo], VarValue: [Const: name], Const: asdf]]',
+    'Query: [SetVarOper: [Const: name, Const: asdf], SetVarOper: [Const: foo, DollarExpr: [ExprDict: []]], SetItemOper: [VarValue: [Const: foo], Const: bar, Const: asdf], SetItemOper: [VarValue: [Const: foo], Const: bar baz, Const: asdf], SetItemOper: [VarValue: [Const: foo], VarValue: [Const: name], Const: asdf]]',
     'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: a], SwitchCase: [FuncCall: [VarDeref: [VarValue: [Const: node], Const: form], CallArgs: [], CallKwargs: []], CaseEntry: [Const: hehe, SubQuery: [Query: [EditTagAdd: [TagName: [Const: baz]]]]]]]',
     'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: a], SwitchCase: [VarValue: [Const: woot], CaseEntry: [Const: hehe, SubQuery: [Query: [EditTagAdd: [TagName: [Const: baz]]]]]]]',
     'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: c], SwitchCase: [VarValue: [Const: woot], CaseEntry: [Const: hehe, SubQuery: [Query: [EditTagAdd: [TagName: [Const: baz]]]]], CaseEntry: [SubQuery: [Query: [EditTagAdd: [TagName: [Const: jaz]]]]]]]',