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

synapse/tests/test_lib_httpapi.py

@@ -1902,3 +1902,62 @@ class HttpApiTest(s_tests.SynTest):
                     self.eq('ok', retn.get('status'))
                     roles = set([r.get('name') for r in retn.get('result', {}).get('roles')])
                     self.eq(roles, {'all'})
+
+    async def test_http_sess_setvals(self):
+
+        class ValsHandler(s_httpapi.StreamHandler):
+
+            async def get(self):
+
+                iden = await self.useriden()
+                if iden is None or self._web_sess is None:  # pragma: no cover
+                    self.sendRestErr('NoSuchUser', 'User must login with a valid sess')
+                    return
+
+                throw = bool(int(self.request.headers.get('throw', 0)))
+
+                if throw:
+                    vals = {'hehe': 'haha', 'omg': {'hehe', 'haha'}}
+                else:
+                    vals = {'now': s_common.now(), 'lastip': self.request.connection.context.remote_ip}
+
+                await self._web_sess.update(vals)
+
+                self.sendRestRetn({'iden': s_common.ehex(self._web_sess.iden), 'info': self._web_sess.info})
+                return
+
+        async with self.getTestCore() as core:
+            core.addHttpApi('/api/v1/vals', ValsHandler, {'cell': core})
+
+            host, port = await core.addHttpsPort(0, host='127.0.0.1')
+
+            root = await core.auth.getUserByName('root')
+            await root.setPasswd('secret')
+
+            url = f'https://localhost:{port}/api/v1/vals'
+
+            async with self.getHttpSess() as sess:
+                info = {'user': 'root', 'passwd': 'secret'}
+                async with sess.post(f'https://localhost:{port}/api/v1/login', json=info) as resp:
+                    item = await resp.json()
+                    self.eq('ok', item.get('status'))
+
+                async with sess.get(url) as resp:
+                    self.eq(resp.status, 200)
+                    data = await resp.json()
+                    result = data.get('result')
+                    iden = s_common.uhex(result.get('iden'))
+                    info = result.get('info')
+                    self.isin('now', info)
+                    self.isin('lastip', info)
+                    self.isin('user', info)
+                    self.isin('username', info)
+
+                cell_sess = core.sessions.get(iden)
+                self.eq(cell_sess.info, result.get('info'))
+
+                async with sess.get(url, headers={'throw': '1'}) as resp:
+                    self.eq(resp.status, 500)
+
+                # No change with the bad data
+                self.eq(cell_sess.info, result.get('info'))

synapse/tests/test_lib_nexus.py

@@ -1,9 +1,13 @@
+import asyncio
+from unittest import mock
+
 import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.cortex as s_cortex
 
 import synapse.lib.cell as s_cell
 import synapse.lib.nexus as s_nexus
+import synapse.lib.hiveauth as s_hiveauth
 
 import synapse.tests.utils as s_t_utils
 
@@ -201,3 +205,62 @@ class NexusTest(s_t_utils.SynTest):
             nexsindx = await core.getNexsIndx()
             layrindx = max([await layr.getEditIndx() for layr in core.layers.values()])
             self.ge(nexsindx, layrindx)
+
+    async def test_nexus_safety(self):
+
+        orig = s_hiveauth.Auth.reqUser
+        async def slowReq(self, iden):
+            await asyncio.sleep(0.2)
+            return await orig(self, iden)
+
+        with self.getTestDir() as dirn:
+            async with self.getTestCore(dirn=dirn) as core:
+
+                with mock.patch('synapse.lib.hiveauth.Auth.reqUser', slowReq):
+
+                    vcnt = len(core.views)
+                    deflayr = (await core.getLayerDef()).get('iden')
+
+                    strt = await core.nexsroot.index()
+
+                    vdef = {'layers': (deflayr,), 'name': 'nextview'}
+                    core.schedCoro(core.addView(vdef))
+
+                    for x in range(10):
+                        vdef = {'layers': (deflayr,), 'name': f'someview{x}'}
+                        core.schedCoro(core.addView(vdef))
+
+                    await asyncio.sleep(0.1)
+
+            async with self.getTestCore(dirn=dirn) as core:
+
+                viewadds = 0
+                async for item in core.nexsroot.nexslog.iter(strt):
+                    if item[1][1] == 'view:add':
+                        viewadds += 1
+
+                self.eq(1, viewadds)
+                self.len(vcnt + viewadds, core.views)
+                self.len(1, [v for v in core.views.values() if (await v.pack())['name'] == 'nextview'])
+
+                vcnt = len(core.views)
+                strt = await core.nexsroot.index()
+
+                with mock.patch('synapse.lib.hiveauth.Auth.reqUser', slowReq):
+                    for x in range(3):
+                        vdef = {'layers': (deflayr,), 'name': f'someview{x}'}
+                        with self.raises(TimeoutError):
+                            await s_common.wait_for(core.addView(vdef), 0.1)
+
+                await core.nexsroot.waitOffs(strt + 3, timeout=2)
+
+                viewadds = 0
+                async for item in core.nexsroot.nexslog.iter(strt):
+                    if item[1][1] == 'view:add':
+                        viewadds += 1
+
+                self.eq(3, viewadds)
+                self.len(vcnt + viewadds, core.views)
+
+            async with self.getTestCore(dirn=dirn) as core:
+                self.len(vcnt + viewadds, core.views)

synapse/tests/test_lib_rstorm.py

@@ -21,7 +21,7 @@ HI
 .. storm-pre:: [ inet:ipv6=0 ]
 .. storm-pkg:: synapse/tests/files/stormpkg/testpkg.yaml
 .. storm:: --hide-props testpkgcmd foo
-.. storm:: --hide-query $lib.print(secret)
+.. storm:: --hide-query $lib.print(secret) $lib.print($lib.globals.get(testpkg))
 .. storm:: --hide-query file:bytes
 .. storm-svc:: synapse.tests.files.rstorm.testsvc.Testsvc test {"secret": "jupiter"}
 .. storm:: testsvc.test
@@ -44,6 +44,7 @@ HI
 ::
 
     secret
+    testpkg-done
 
 ::
 
@@ -53,6 +54,7 @@ HI
 
     > testsvc.test
     jupiter
+    testsvc-done
 
 '''
 
@@ -259,6 +261,17 @@ HI
 .. storm-cortex:: path.to.NewpCell
 '''
 
+pkg_onload_timeout = '''
+.. storm-cortex:: default
+.. storm-pre:: $lib.globals.set(onload_sleep, 2)
+.. storm-pkg:: synapse/tests/files/stormpkg/testpkg.yaml
+'''
+
+svc_onload_timeout = '''
+.. storm-cortex:: default
+.. storm-pre:: $lib.globals.set(onload_sleep, 2)
+.. storm-svc:: synapse.tests.files.rstorm.testsvc.Testsvc test {"secret": "jupiter"}
+'''
 
 async def get_rst_text(rstfile):
     async with await s_rstorm.StormRst.anit(rstfile) as rstorm:
@@ -339,7 +352,7 @@ class RStormLibTest(s_test.SynTest):
             self.isin('inet:ipv4=5.6.7.8', text)  # one mock at a time
             self.isin('it:dev:str=notjson', text)  # one mock at a time
 
-            # multi reqest in 1 rstorm command
+            # multi request in 1 rstorm command
             path = s_common.genpath(dirn, 'http_multi.rst')
             with s_common.genfile(path) as fd:
                 fd.write(multi_rst_in_http.encode())
@@ -496,6 +509,29 @@ class RStormLibTest(s_test.SynTest):
             with self.raises(s_exc.NoSuchCtor):
                 await get_rst_text(path)
 
+            # onload failures
+
+            try:
+                oldv = s_rstorm.ONLOAD_TIMEOUT
+                s_rstorm.ONLOAD_TIMEOUT = 0.1
+
+                path = s_common.genpath(dirn, 'pkg_onload_timeout.rst')
+                with s_common.genfile(path) as fd:
+                    fd.write(pkg_onload_timeout.encode())
+                with self.raises(s_exc.SynErr) as ectx:
+                    await get_rst_text(path)
+                self.eq('Package onload failed to run for testpkg', ectx.exception.errinfo['mesg'])
+
+                path = s_common.genpath(dirn, 'svc_onload_timeout.rst')
+                with s_common.genfile(path) as fd:
+                    fd.write(svc_onload_timeout.encode())
+                with self.raises(s_exc.SynErr) as ectx:
+                    await get_rst_text(path)
+                self.eq('Package onload failed to run for service test', ectx.exception.errinfo['mesg'])
+
+            finally:
+                s_rstorm.ONLOAD_TIMEOUT = oldv
+
     async def test_rstorm_cli(self):
 
         with self.getTestDir() as dirn:

synapse/tests/test_lib_snap.py

@@ -276,6 +276,16 @@ class SnapTest(s_t_utils.SynTest):
             self.len(1, await alist(view1.eval('inet:ipv4 +:asn=42')))
             self.len(1, await alist(view1.eval('inet:ipv4 +#woot')))
 
+            await view0.core.nodes('[ inet:ipv4=1.1.1.1 :asn=5 ]')
+            nodes = await view0.core.nodes('inet:ipv4=1.1.1.1 [ :asn=6 ]', opts={'view': view1.iden})
+
+            await view0.core.nodes('inet:ipv4=1.1.1.1 | delnode')
+            edits = await nodes[0]._getPropDelEdits('asn')
+
+            root = view0.core.auth.rootuser
+            async with await view1.snap(user=root) as snap:
+                await snap.applyNodeEdit((nodes[0].buid, 'inet:ipv4', edits))
+
     async def test_cortex_lift_layers_bad_filter(self):
         '''
         Test a two layer cortex where a lift operation gives the wrong result

synapse/tests/test_lib_storm.py

@@ -735,9 +735,9 @@ class StormTest(s_t_utils.SynTest):
             # check that the feed API uses toprim
             email = await core.callStorm('''
                 $iden = $lib.guid()
-                $props = $lib.dict(email=visi@vertex.link)
+                $props = ({"email": "visi@vertex.link"})
                 $lib.feed.ingest(syn.nodes, (
-                    ( (ps:contact, $iden), $lib.dict(props=$props)),
+                    ( (ps:contact, $iden), ({"props": $props})),
                 ))
                 ps:contact=$iden
                 return(:email)
@@ -746,9 +746,9 @@ class StormTest(s_t_utils.SynTest):
 
             email = await core.callStorm('''
                 $iden = $lib.guid()
-                $props = $lib.dict(email=visi@vertex.link)
+                $props = ({"email": "visi@vertex.link"})
                 yield $lib.feed.genr(syn.nodes, (
-                    ( (ps:contact, $iden), $lib.dict(props=$props)),
+                    ( (ps:contact, $iden), ({"props": $props})),
                 ))
                 return(:email)
             ''')
@@ -777,7 +777,7 @@ class StormTest(s_t_utils.SynTest):
             # and again to test *not* creating it...
             self.eq(0, await core.callStorm('return($lib.queue.gen(woot).size())'))
 
-            self.eq({'foo': 'bar'}, await core.callStorm('return($lib.dict(    foo    =    bar   ))'))
+            self.eq({'foo': 'bar'}, await core.callStorm('return(({    "foo"    :    "bar"   }))'))
 
             ddef0 = await core.callStorm('return($lib.dmon.add(${ $lib.queue.gen(hehedmon).put(lolz) $lib.time.sleep(10) }, name=hehedmon))')
             ddef1 = await core.callStorm('return($lib.dmon.get($iden))', opts={'vars': {'iden': ddef0.get('iden')}})
@@ -914,8 +914,17 @@ class StormTest(s_t_utils.SynTest):
             with self.raises(s_exc.CantMergeView):
                 await core.callStorm('inet:ipv4=11.22.33.44 | merge')
 
-            # test printing a merge that the node was created in the top layer
+            # test printing a merge that the node was created in the top layer. We also need to make sure the layer
+            # is in a steady state for layer merge --diff tests.
+
+            real_layer = core.layers.get(layr)  # type: s_layer.Layer
+            if real_layer.dirty:
+                waiter = real_layer.layrslab.waiter(1, 'commit')
+                await waiter.wait(timeout=12)
+
+            waiter = real_layer.layrslab.waiter(1, 'commit')
             msgs = await core.stormlist('[ inet:fqdn=mvmnasde.com ] | merge', opts=opts)
+
             self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn = mvmnasde.com', msgs)
             self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:host = mvmnasde', msgs)
             self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:domain = com', msgs)
@@ -923,6 +932,10 @@ class StormTest(s_t_utils.SynTest):
             self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:iszone = true', msgs)
             self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:zone = mvmnasde.com', msgs)
 
+            # Ensure that the layer has sync()'d to avoid getting data from
+            # dirty sodes in the merge --diff tests.
+            self.len(1, await waiter.wait(timeout=12))
+
             # test that a user without perms can diff but not apply
             await visi.addRule((True, ('view', 'read')))
 
@@ -1213,12 +1226,12 @@ class StormTest(s_t_utils.SynTest):
             await core.nodes('cron.list')
 
             self.eq({'foo': 'bar', 'baz': 'faz'}, await core.callStorm('''
-                return($lib.dict( // do foo thing
-                    foo /* hehe */ = /* haha */ bar, //lol
-                    baz // hehe
-                    = // haha
-                    faz // hehe
-                ))
+                return(({ // do foo thing
+                    "foo" /* hehe */ : /* haha */ "bar", //lol
+                    "baz" // hehe
+                    : // haha
+                    "faz" // hehe
+                }))
             '''))
 
             self.eq(('foo', 'bar', 'baz'), await core.callStorm('''
@@ -1792,7 +1805,7 @@ class StormTest(s_t_utils.SynTest):
 
             # Headers as list of tuples, params as dict
             q = '''
-            $params=$lib.dict(key=valu, foo=bar)
+            $params=({"key": "valu", "foo": "bar"})
             $hdr = (
                     ("User-Agent", "my fav ua"),
             )|
@@ -1923,6 +1936,32 @@ class StormTest(s_t_utils.SynTest):
                     await core.setUserLocked(visi.iden, False)
                     self.true(await stream.wait(2))
 
+    async def test_storm_dmon_caching(self):
+
+        async with self.getTestCore() as core:
+
+            q = f'''
+            $lib.dmon.add(${{
+                for $x in $lib.range(2) {{
+                    inet:ipv4=1.2.3.4
+                    if $node {{
+                        $lib.queue.gen(foo).put($node.props.asn)
+                        $lib.queue.gen(bar).get(1)
+                    }}
+                    [ inet:ipv4=1.2.3.4 :asn=5 ]
+                    $lib.queue.gen(foo).put($node.props.asn)
+                    $lib.queue.gen(bar).get(0)
+                }}
+                | spin
+            }}, name=foo)'''
+            await core.nodes(q)
+
+            self.eq((0, 5), await core.callStorm('return($lib.queue.gen(foo).get(0))'))
+
+            await core.nodes('inet:ipv4=1.2.3.4 [ :asn=6 ] $lib.queue.gen(bar).put(0)')
+
+            self.eq((1, 6), await core.callStorm('return($lib.queue.gen(foo).get(1))'))
+
     async def test_storm_pipe(self):
 
         async with self.getTestCore() as core:
@@ -2006,7 +2045,7 @@ class StormTest(s_t_utils.SynTest):
             self.none(await core.callStorm('''
                 [ ps:contact = * ]
                 if $node {
-                    $foo = $lib.dict()
+                    $foo = ({})
                     $foo.bar = $lib.undef
                     return($foo.bar)
                 }
@@ -2025,7 +2064,7 @@ class StormTest(s_t_utils.SynTest):
             # runtsafe variants
             self.eq(('foo', 'baz'), await core.callStorm('$foo = (foo, bar, baz) $foo.1 = $lib.undef return($foo)'))
             self.eq(('foo', 'bar'), await core.callStorm('$foo = (foo, bar, baz) $foo."-1" = $lib.undef return($foo)'))
-            self.none(await core.callStorm('$foo = $lib.dict() $foo.bar = 10 $foo.bar = $lib.undef return($foo.bar)'))
+            self.none(await core.callStorm('$foo = ({}) $foo.bar = 10 $foo.bar = $lib.undef return($foo.bar)'))
             self.eq(('woot',), await core.callStorm('''
                 $foo = (foo, bar, baz)
                 $foo.0 = $lib.undef
@@ -2079,7 +2118,9 @@ class StormTest(s_t_utils.SynTest):
             msgs = await core.stormlist(f'pkg.load --ssl-noverify https://127.0.0.1:{port}/api/v1/pkgtest/notok')
             self.stormIsInWarn('pkg.load got JSON error: FooBar', msgs)
 
-            waiter = core.waiter(2, 'core:pkg:onload:complete')
+            replay = s_common.envbool('SYNDEV_NEXUS_REPLAY')
+            nevents = 4 if replay else 2
+            waiter = core.waiter(nevents, 'core:pkg:onload:complete')
 
             with self.getAsyncLoggerStream('synapse.cortex') as stream:
                 msgs = await core.stormlist(f'pkg.load --ssl-noverify https://127.0.0.1:{port}/api/v1/pkgtest/yep')
@@ -2096,10 +2137,10 @@ class StormTest(s_t_utils.SynTest):
             self.len(1, await core.nodes(f'ps:contact={cont}'))
 
             evnts = await waiter.wait(timeout=2)
-            self.eq([
-                ('core:pkg:onload:complete', {'pkg': 'testload'}),
-                ('core:pkg:onload:complete', {'pkg': 'testload'}),
-            ], evnts)
+            exp = []
+            for _ in range(nevents):
+                exp.append(('core:pkg:onload:complete', {'pkg': 'testload'}))
+            self.eq(exp, evnts)
 
     async def test_storm_tree(self):
 

synapse/tests/test_lib_stormhttp.py

@@ -64,8 +64,8 @@ class StormHttpTest(s_test.SynTest):
 
             # Header and params as dict
             q = '''
-            $params=$lib.dict(key=valu, foo=bar, baz=$lib.false)
-            $hdr = $lib.dict(true=$lib.true)
+            $params=({"key": "valu", "foo": "bar", "baz": $lib.false})
+            $hdr = ({"true": $lib.true})
             $hdr."User-Agent"="Storm HTTP Stuff"
             $k = (0)
             $hdr.$k="Why"
@@ -240,7 +240,7 @@ class StormHttpTest(s_test.SynTest):
             opts = {'vars': {'url': url, 'noauth_url': noauth_url, 'newp_url': newp_url}}
 
             q = '''
-            $params=$lib.dict(key=valu, foo=bar)
+            $params=({"key": "valu", "foo": "bar"})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -256,7 +256,7 @@ class StormHttpTest(s_test.SynTest):
             self.eq('1', headers.get('Head'))
 
             q = '''
-            $params=$lib.dict(key=valu, redirect='http://test.newp/')
+            $params=({"key": "valu", "redirect": 'http://test.newp/'})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -273,7 +273,7 @@ class StormHttpTest(s_test.SynTest):
             self.eq('http://test.newp/', headers.get('Location'))
 
             q = '''
-            $params=$lib.dict(key=valu, redirect=$noauth_url)
+            $params=({"key": "valu", "redirect": $noauth_url})
             $hdr = (
                 ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -286,7 +286,7 @@ class StormHttpTest(s_test.SynTest):
             self.eq(b'', body)
 
             q = '''
-            $params=$lib.dict(key=valu, redirect=$newp_url)
+            $params=({"key": "valu", "redirect": $newp_url})
             $hdr = (
                 ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -299,7 +299,7 @@ class StormHttpTest(s_test.SynTest):
             self.eq(b'', body)
 
             q = '''
-            $params=$lib.dict(key=valu, redirect="http://127.0.0.1/newp")
+            $params=({"key": "valu", "redirect": "http://127.0.0.1/newp"})
             $hdr = (
                 ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -321,7 +321,7 @@ class StormHttpTest(s_test.SynTest):
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             opts = {'vars': {'url': url}}
             q = '''
-            $params=$lib.dict(key=valu, foo=bar)
+            $params=({"key": "valu", "foo": "bar"})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -337,7 +337,7 @@ class StormHttpTest(s_test.SynTest):
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             opts = {'vars': {'url': url, 'sleep': 1, 'timeout': 2}}
             q = '''
-            $params=$lib.dict(key=valu, foo=bar, sleep=$sleep)
+            $params=({"key": "valu", "foo": "bar", "sleep": $sleep})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -351,7 +351,7 @@ class StormHttpTest(s_test.SynTest):
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             opts = {'vars': {'url': url, 'sleep': 10, 'timeout': 1}}
             q = '''
-            $params=$lib.dict(key=valu, foo=bar, sleep=$sleep)
+            $params=({"key": "valu", "foo": "bar", "sleep": $sleep})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -374,7 +374,7 @@ class StormHttpTest(s_test.SynTest):
 
             adduser = '''
                 $url = $lib.str.format("https://root:root@127.0.0.1:{port}/api/v1/auth/adduser", port=$port)
-                $user = $lib.dict(name=$name, passwd=$passwd)
+                $user = ({"name": $name, "passwd": $passwd})
                 $post = $lib.inet.http.post($url, json=$user, ssl_verify=$(0)).json().result.name
                 $lib.print($post)
                 [ test:str=$post ]
@@ -387,7 +387,7 @@ class StormHttpTest(s_test.SynTest):
             adduser = '''
                 $url = $lib.str.format("https://root:root@127.0.0.1:{port}/api/v1/auth/adduser", port=$port)
                 $user = $lib.str.format('{"name": "{name}", "passwd": "{passwd}"}', name=$name, passwd=$passwd)
-                $header = $lib.dict("Content-Type"="application/json")
+                $header = ({"Content-Type": "application/json"})
                 $post = $lib.inet.http.post($url, headers=$header, body=$user,  ssl_verify=$(0)).json().result.name
                 [ test:str=$post ]
             '''
@@ -400,7 +400,7 @@ class StormHttpTest(s_test.SynTest):
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             opts = {'vars': {'url': url, 'buf': b'1234'}}
             q = '''
-            $params=$lib.dict(key=valu, foo=bar)
+            $params=({"key": "valu", "foo": "bar"})
             $resp = $lib.inet.http.post($url, params=$params, body=$buf, ssl_verify=$lib.false)
             return ( $resp.json() )
             '''
@@ -411,9 +411,9 @@ class StormHttpTest(s_test.SynTest):
 
             q = '''
             $fields=$lib.list(
-                $lib.dict(name=foo, value=bar),
-                $lib.dict(name=foo, value=bar2),
-                $lib.dict(name=baz, value=cool)
+                ({"name": "foo", "value": "bar"}),
+                ({"name": "foo", "value": "bar2"}),
+                ({"name": "baz", "value": "cool"})
             )
             $resp = $lib.inet.http.post($url, fields=$fields, ssl_verify=$lib.false)
             return ( $resp.json() )
@@ -467,7 +467,7 @@ class StormHttpTest(s_test.SynTest):
             text = '''
             $url = $lib.str.format("https://root:root@127.0.0.1:{port}/api/v1/storm", port=$port)
             $stormq = "($size, $sha2) = $lib.bytes.put($lib.base64.decode('dmVydGV4')) [ test:str = $sha2 ] [ test:int = $size ]"
-            $json = $lib.dict(query=$stormq)
+            $json = ({"query": $stormq})
             $bytez = $lib.inet.http.post($url, json=$json, ssl_verify=$(0))
             '''
             opts = {'vars': {'port': port}}
@@ -482,7 +482,7 @@ class StormHttpTest(s_test.SynTest):
 
             text = '''
             $url = $lib.str.format("https://root:root@127.0.0.1:{port}/api/v1/storm", port=$port)
-            $json = $lib.dict(query="test:str")
+            $json = ({"query": "test:str"})
             $body = $json
             $resp=$lib.inet.http.post($url, json=$json, body=$body, ssl_verify=$(0))
             return ( ($resp.code, $resp.err) )
@@ -615,7 +615,7 @@ class StormHttpTest(s_test.SynTest):
                 $hdr = ( { "key": $lib.false } )
                 $url = $lib.str.format('https://127.0.0.1:{port}/test/ws', port=$port)
 
-                ($ok, $sock) = $lib.inet.http.connect($url, headers=$hdr, params=$params)
+                ($ok, $sock) = $lib.inet.http.connect($url, headers=$hdr, params=$params, ssl_verify=$lib.false)
                 if (not $ok) { $lib.exit($sock) }
 
                 ($ok, $mesg) = $sock.rx()
@@ -631,7 +631,7 @@ class StormHttpTest(s_test.SynTest):
                 $hdr = ( { "key": $lib.false } )
                 $url = $lib.str.format('https://127.0.0.1:{port}/test/ws', port=$port)
 
-                ($ok, $sock) = $lib.inet.http.connect($url, headers=$hdr)
+                ($ok, $sock) = $lib.inet.http.connect($url, headers=$hdr, ssl_verify=$lib.false)
                 if (not $ok) { $lib.exit($sock) }
 
                 ($ok, $mesg) = $sock.rx()
@@ -645,7 +645,7 @@ class StormHttpTest(s_test.SynTest):
             query = '''
             $url = $lib.str.format('https://127.0.0.1:{port}/test/ws', port=$port)
 
-            ($ok, $sock) = $lib.inet.http.connect($url, proxy=$proxy)
+            ($ok, $sock) = $lib.inet.http.connect($url, proxy=$proxy, ssl_verify=$lib.false)
             if (not $ok) { $lib.exit($sock) }
 
             ($ok, $mesg) = $sock.rx()

synapse/tests/test_lib_stormlib_auth.py

@@ -420,8 +420,8 @@ class StormLibAuthTest(s_test.SynTest):
         async with self.getTestCore() as core:
             self.none(await core.callStorm('return($lib.user.json.get(foo))'))
             self.none(await core.callStorm('return($lib.user.json.get(foo, prop=bar))'))
-            self.true(await core.callStorm('return($lib.user.json.set(hi, $lib.dict(foo=bar, baz=faz)))'))
-            self.true(await core.callStorm('return($lib.user.json.set(bye/bye, $lib.dict(zip=zop, bip=bop)))'))
+            self.true(await core.callStorm('return($lib.user.json.set(hi, ({"foo": "bar", "baz": "faz"})))'))
+            self.true(await core.callStorm('return($lib.user.json.set(bye/bye, ({"zip": "zop", "bip": "bop"})))'))
             self.eq('bar', await core.callStorm('return($lib.user.json.get(hi, prop=foo))'))
             self.eq({'foo': 'bar', 'baz': 'faz'}, await core.callStorm('return($lib.user.json.get(hi))'))
 
@@ -454,7 +454,7 @@ class StormLibAuthTest(s_test.SynTest):
                 await core.callStorm('return($lib.auth.users.byname(root).json.get(bye/bye, prop=zip))', opts=asvisi)
 
             self.none(await core.callStorm('return($lib.user.json.get(hi))', opts=asvisi))
-            await core.callStorm('if (not $lib.user.json.has(hehe)) { $lib.user.json.set(hehe, $lib.dict()) }', opts=asvisi)
+            await core.callStorm('if (not $lib.user.json.has(hehe)) { $lib.user.json.set(hehe, ({})) }', opts=asvisi)
 
             self.true(await core.callStorm('return($lib.user.json.set(hehe, haha, prop=foo))', opts=asvisi))
             self.true(await core.callStorm('return($lib.user.json.set(hehe, haha, prop=foo))', opts=asvisi))

synapse/tests/test_lib_stormlib_cell.py

@@ -187,7 +187,7 @@ class StormCellTest(s_test.SynTest):
                         }
                         $lib.exit('No view found for name={name}', name=$name)
                     }
-                    $ret = $lib.dict()
+                    $ret = ({})
                     $ret.baseview=$get_view(default)
                     $ret.fork1a=$get_view(base1a)
                     $ret.fork2a=$get_view(base2a)