synapse 2.193.0__py311-none-any.whl → 2.195.0__py311-none-any.whl

synapse/tests/test_lib_storm.py

@@ -53,10 +53,6 @@ class StormTest(s_t_utils.SynTest):
             with self.raises(s_exc.BadTypeValu):
                 await core.nodes('[ ou:org=({"hq": "woot"}) ]')
 
-            msgs = await core.stormlist('[ ou:org=({"hq": "woot", "$try": true}) ]')
-            self.len(0, [m for m in msgs if m[0] == 'node'])
-            self.stormIsInWarn('Bad value for prop hq: valu is not a guid', msgs)
-
             nodes05 = await core.nodes('[ ou:org=({"name": "vertex", "$props": {"motto": "for the people"}}) ]')
             self.len(1, nodes05)
             self.eq('vertex', nodes05[0].get('name'))
@@ -96,6 +92,57 @@ class StormTest(s_t_utils.SynTest):
             self.len(1, nodes12)
             self.ne(nodes11[0].ndef, nodes12[0].ndef)
 
+            # GUID ctor has a short-circuit where it tries to find an existing ndef before it does,
+            # some property deconfliction, and `<form>=({})` when pushed through guid generation gives
+            # back the same guid as `<form>=()`, which if we're not careful could lead to an
+            # inconsistent case where you fail to make a node because you don't provide any props,
+            # make a node with that matching ndef, and then run that invalid GUID ctor query again,
+            # and have it return back a node due to the short circuit. So test that we're consistent here.
+            with self.raises(s_exc.BadTypeValu):
+                await core.nodes('[ ou:org=({}) ]')
+
+            self.len(1, await core.nodes('[ ou:org=() ]'))
+
+            with self.raises(s_exc.BadTypeValu):
+                await core.nodes('[ ou:org=({}) ]')
+
+            msgs = await core.stormlist('[ ou:org=({"$props": {"desc": "lol"}})]')
+            self.len(0, [m for m in msgs if m[0] == 'node'])
+            self.stormIsInErr('No values provided for form ou:org', msgs)
+
+            msgs = await core.stormlist('[ou:org=({"name": "burrito corp", "$props": {"phone": "lolnope"}})]')
+            self.len(0, [m for m in msgs if m[0] == 'node'])
+            self.stormIsInErr('Bad value for prop ou:org:phone: requires a digit string', msgs)
+
+            with self.raises(s_exc.BadTypeValu):
+                await core.nodes('[ ou:org=({"$try": true}) ]')
+
+            # $try only affects $props
+            msgs = await core.stormlist('[ ou:org=({"founded": "lolnope", "$try": true}) ]')
+            self.len(0, [m for m in msgs if m[0] == 'node'])
+            self.stormIsInErr('Bad value for prop ou:org:founded: Unknown time format for lolnope', msgs)
+
+            msgs = await core.stormlist('[ou:org=({"name": "burrito corp", "$try": true, "$props": {"phone": "lolnope", "desc": "burritos man"}})]')
+            nodes = [m for m in msgs if m[0] == 'node']
+            self.len(1, nodes)
+            node = nodes[0][1]
+            props = node[1]['props']
+            self.none(props.get('phone'))
+            self.eq(props.get('name'), 'burrito corp')
+            self.eq(props.get('desc'), 'burritos man')
+            self.stormIsInWarn('Skipping bad value for prop ou:org:phone: requires a digit string', msgs)
+
+            await self.asyncraises(s_exc.BadTypeValu, core.addNode(core.auth.rootuser, 'ou:org', {'name': 'org name 77', 'phone': 'lolnope'}, props={'desc': 'an org desc'}))
+
+            await self.asyncraises(s_exc.BadTypeValu, core.addNode(core.auth.rootuser, 'ou:org', {'name': 'org name 77'}, props={'desc': 'an org desc', 'phone': 'lolnope'}))
+
+            node = await core.addNode(core.auth.rootuser, 'ou:org', {'$try': True, '$props': {'phone': 'invalid'}, 'name': 'org name 77'}, props={'desc': 'an org desc'})
+            self.nn(node)
+            props = node[1]['props']
+            self.none(props.get('phone'))
+            self.eq(props.get('name'), 'org name 77')
+            self.eq(props.get('desc'), 'an org desc')
+
     async def test_lib_storm_jsonexpr(self):
         async with self.getTestCore() as core:
 
@@ -254,7 +301,7 @@ class StormTest(s_t_utils.SynTest):
                     emit bar
                 }
                 function makelist() {
-                    $retn = $lib.list()
+                    $retn = ()
                     for $item in $generate() { $retn.append($item) }
                     return($retn)
                 }
@@ -267,7 +314,7 @@ class StormTest(s_t_utils.SynTest):
                     emit $node.repr()
                 }
                 function makelist() {
-                    $retn = $lib.list()
+                    $retn = ()
                     for $item in $generate() { $retn.append($item) }
                     return($retn)
                 }
@@ -339,9 +386,135 @@ class StormTest(s_t_utils.SynTest):
             prnt = [m[1]['mesg'] for m in msgs if m[0] == 'print']
             self.eq(prnt, ['inner 0', 'outer 0'])
 
-            await self.asyncraises(s_exc.StormRuntimeError, core.nodes('emit foo'))
+            # Emit outside an emitter function raises a runtime error with posinfo
+            with self.raises(s_exc.StormRuntimeError) as cm:
+                await core.nodes('emit foo')
+            self.nn(cm.exception.get('highlight'))
+
+            with self.raises(s_exc.StormRuntimeError) as cm:
+                await core.nodes('[test:str=emit] emit foo')
+            self.nn(cm.exception.get('highlight'))
+
+            # stop cannot cross function boundaries
+            q = '''
+            function inner(v) {
+                if ( $v = 2 ) {
+                    stop
+                }
+                return ( $v )
+            }
+            function outer(n) {
+                for $i in $lib.range($n) {
+                    emit $inner($i)
+                }
+            }
+            $N = (5)
+            for $valu in $outer($N) {
+                $lib.print(`{$valu}/{$N}`)
+            }
+            '''
+            msgs = await core.stormlist(q)
+            self.stormIsInPrint('1/5', msgs)
+            self.stormNotInPrint('2/5', msgs)
+            self.stormIsInErr('function inner - Generator control statement "stop" used outside of a generator '
+                              'function.',
+                              msgs)
+
+            # The function exception raised can be caught.
+            q = '''
+            function inner(v) {
+                if ( $v = 2 ) {
+                    stop
+                }
+                return ( $v )
+            }
+            function outer(n) {
+                for $i in $lib.range($n) {
+                    emit $inner($i)
+                }
+            }
+            $N = (5)
+            try {
+                for $valu in $outer($N) {
+                    $lib.print(`{$valu}/{$N}`)
+                }
+            } catch StormRuntimeError as err {
+                $lib.print(`caught: {$err.mesg}`)
+            }
+            '''
+            msgs = await core.stormlist(q)
+            self.stormIsInPrint('1/5', msgs)
+            self.stormNotInPrint('2/5', msgs)
+            self.stormIsInPrint('caught: function inner - Generator control statement "stop" used outside of a'
+                                ' generator function.',
+                                msgs)
+
+            # Outside a function, StopStorm is caught and converted into a StormRuntimeError for the message stream.
+            # Since this is tearing down the runtime, it cannot be caught.
+            q = '''
+            $N = (5)
+            for $j in $lib.range($N) {
+                if ($j = 2) {
+                    stop
+                }
+                $lib.print(`{$j}/{$N}`)
+            }
+            '''
+            msgs = await core.stormlist(q)
+            self.stormIsInPrint('1/5', msgs)
+            self.stormNotInPrint('2/5', msgs)
+            self.stormIsInErr('Generator control statement "stop" used outside of a generator function.',
+                              msgs)
+            errname = [m[1][0] for m in msgs if m[0] == 'err'][0]
+            self.eq(errname, 'StormRuntimeError')
 
-            # include a quick test for using stop in a node yielder
+            q = '''
+            $N = (5)
+            try {
+                for $j in $lib.range($N) {
+                    if ($j = 2) {
+                        stop
+                    }
+                    $lib.print(`{$j}/{$N}`)
+                }
+            } catch StormRuntimeError as err {
+                $lib.print(`caught: {$err.mesg}`)
+            }
+            '''
+            msgs = await core.stormlist(q)
+            self.stormIsInPrint('1/5', msgs)
+            self.stormNotInPrint('2/5', msgs)
+            self.stormNotInPrint('caught:', msgs)
+            self.stormIsInErr('Generator control statement "stop" used outside of a generator function.',
+                              msgs)
+
+            # Mixing a Loop control flow statement in an emitter to stop its processing
+            # will be converted into a catchable StormRuntimeError
+            q = '''
+            function inner(n) {
+                emit $n
+                $n = ( $n + 1 )
+                emit $n
+                $n = ( $n + 1 )
+                if ( $n >= 2 ) {
+                    break
+                }
+                emit $n
+            }
+            $N = (0)
+            try {
+                for $valu in $inner($N) {
+                    $lib.print(`got {$valu}`)
+                }
+            } catch StormRuntimeError as err {
+                $lib.print(`caught: {$err.mesg}`)
+            }
+            '''
+            msgs = await core.stormlist(q)
+            self.stormIsInPrint('got 1', msgs)
+            self.stormNotInPrint('got 2', msgs)
+            self.stormIsInPrint('caught: function inner - Loop control statement "break" used outside of a loop.',
+                                msgs)
 
     async def test_lib_storm_intersect(self):
         async with self.getTestCore() as core:
@@ -580,7 +753,7 @@ class StormTest(s_t_utils.SynTest):
                   return((0))
                 }
 
-                $alerts = $lib.list()
+                $alerts = ()
                 { $alerts.append($node.repr()) }
 
                 $bool = $stuff($alerts)
@@ -909,7 +1082,7 @@ class StormTest(s_t_utils.SynTest):
 
             opts = {'view': view}
             self.len(0, await core.callStorm('''
-                $list = $lib.list()
+                $list = ()
                 $layr = $lib.view.get().layers.0
                 for $item in $layr.getStorNodes() {
                     $list.append($item)
@@ -922,7 +1095,7 @@ class StormTest(s_t_utils.SynTest):
             await core.callStorm('inet:ipv4=11.22.33.44 [ +(blahverb)> { inet:asn=99 } ]', opts=opts)
 
             sodes = await core.callStorm('''
-                $list = $lib.list()
+                $list = ()
                 $layr = $lib.view.get().layers.0
                 for $item in $layr.getStorNodes() {
                     $list.append($item)
@@ -931,7 +1104,7 @@ class StormTest(s_t_utils.SynTest):
             self.len(2, sodes)
 
             ipv4 = await core.callStorm('''
-                $list = $lib.list()
+                $list = ()
                 $layr = $lib.view.get().layers.0
                 for ($buid, $sode) in $layr.getStorNodes() {
                     yield $buid
@@ -1073,7 +1246,7 @@ class StormTest(s_t_utils.SynTest):
             self.len(0, await core.nodes('diff', opts=opts))
 
             self.len(0, await core.callStorm('''
-                $list = $lib.list()
+                $list = ()
                 for ($buid, $sode) in $lib.view.get().layers.0.getStorNodes() {
                     $list.append($buid)
                 }
@@ -1354,9 +1527,9 @@ class StormTest(s_t_utils.SynTest):
             '''))
 
             self.eq(('foo', 'bar', 'baz'), await core.callStorm('''
-                return($lib.list( // do foo thing
-                    /* hehe */ foo /* hehe */ , /* hehe */ bar /* hehe */ , /* hehe */ baz /* hehe */
-                ))
+                return(([ // do foo thing
+                    /* hehe */ "foo" /* hehe */ , /* hehe */ "bar" /* hehe */ , /* hehe */ "baz" /* hehe */
+                ]))
             '''))
 
             # surrogate escapes are allowed
@@ -2569,6 +2742,7 @@ class StormTest(s_t_utils.SynTest):
         class PkgHandler(s_httpapi.Handler):
 
             async def get(self, name):
+                assert self.request.headers.get('X-Synapse-Version') == s_version.verstring
 
                 if name == 'notok':
                     self.sendRestErr('FooBar', 'baz faz')
@@ -2578,6 +2752,8 @@ class StormTest(s_t_utils.SynTest):
 
         class PkgHandlerRaw(s_httpapi.Handler):
             async def get(self, name):
+                assert self.request.headers.get('X-Synapse-Version') == s_version.verstring
+
                 self.set_header('Content-Type', 'application/json')
                 return self.write(pkg)
 
@@ -3254,7 +3430,7 @@ class StormTest(s_t_utils.SynTest):
             self.eq(nodes[4].ndef, ('inet:ipv4', 0x01020304))
 
             # Queries can be a heavy list
-            q = '$list = $lib.list(${ -> * }, ${ <- * }, ${ -> edge:refs:n2 :n1 -> * }) inet:ipv4=1.2.3.4 | tee --join $list'
+            q = '$list = ([${ -> * }, ${ <- * }, ${ -> edge:refs:n2 :n1 -> * }]) inet:ipv4=1.2.3.4 | tee --join $list'
             nodes = await core.nodes(q)
             self.len(5, nodes)
             self.eq(nodes[0].ndef, ('inet:asn', 0))
@@ -3264,22 +3440,22 @@ class StormTest(s_t_utils.SynTest):
             self.eq(nodes[4].ndef, ('inet:ipv4', 0x01020304))
 
             # A empty list of queries still works as an nop
-            q = '$list = $lib.list() | tee $list'
+            q = '$list = () | tee $list'
             msgs = await core.stormlist(q)
             self.len(2, msgs)
             self.eq(('init', 'fini'), [m[0] for m in msgs])
 
-            q = 'inet:ipv4=1.2.3.4 $list = $lib.list() | tee --join $list'
+            q = 'inet:ipv4=1.2.3.4 $list = () | tee --join $list'
             msgs = await core.stormlist(q)
             self.len(3, msgs)
             self.eq(('init', 'node', 'fini'), [m[0] for m in msgs])
 
-            q = '$list = $lib.list() | tee --parallel $list'
+            q = '$list = () | tee --parallel $list'
             msgs = await core.stormlist(q)
             self.len(2, msgs)
             self.eq(('init', 'fini'), [m[0] for m in msgs])
 
-            q = 'inet:ipv4=1.2.3.4 $list = $lib.list() | tee --parallel --join $list'
+            q = 'inet:ipv4=1.2.3.4 $list = () | tee --parallel --join $list'
             msgs = await core.stormlist(q)
             self.len(3, msgs)
             self.eq(('init', 'node', 'fini'), [m[0] for m in msgs])
@@ -3533,7 +3709,7 @@ class StormTest(s_t_utils.SynTest):
             fork = await core.callStorm('return( $lib.view.get().fork().iden )')
 
             q = '''
-            $nodes = $lib.list()
+            $nodes = ()
             view.exec $view { inet:ipv4=1.2.3.4 $nodes.append($node) } |
             for $n in $nodes {
                 yield $n
@@ -3543,7 +3719,7 @@ class StormTest(s_t_utils.SynTest):
             self.stormIsInErr('Node is not from the current view.', msgs)
 
             q = '''
-            $nodes = $lib.list()
+            $nodes = ()
             view.exec $view { for $x in ${ inet:ipv4=1.2.3.4 } { $nodes.append($x) } } |
             for $n in $nodes {
                 yield $n
@@ -3558,7 +3734,7 @@ class StormTest(s_t_utils.SynTest):
 
             # Nodes lifted from another view and referred to by iden() works
             q = '''
-            $nodes = $lib.list()
+            $nodes = ()
             view.exec $view { inet:ipv4=1.2.3.4 $nodes.append($node) } |
             for $n in $nodes {
                 yield $n.iden()
@@ -3568,7 +3744,7 @@ class StormTest(s_t_utils.SynTest):
             self.len(1, nodes)
 
             q = '''
-            $nodes = $lib.list()
+            $nodes = ()
             view.exec $view { for $x in ${ inet:ipv4=1.2.3.4 } { $nodes.append($x) } } |
             for $n in $nodes {
                 yield $n.iden()

synapse/tests/test_lib_stormctrl.py

@@ -0,0 +1,65 @@
+import pickle
+
+import synapse.lib.stormctrl as s_stormctrl
+
+import synapse.tests.utils as s_t_utils
+
+class StormctrlTest(s_t_utils.SynTest):
+    def test_basic(self):
+
+        # Classes inherit as expected
+        self.isinstance(s_stormctrl.StormReturn(), s_stormctrl.StormCtrlFlow)
+        self.isinstance(s_stormctrl.StormExit(), s_stormctrl.StormCtrlFlow)
+        self.isinstance(s_stormctrl.StormBreak(), s_stormctrl.StormCtrlFlow)
+        self.isinstance(s_stormctrl.StormContinue(), s_stormctrl.StormCtrlFlow)
+        self.isinstance(s_stormctrl.StormStop(), s_stormctrl.StormCtrlFlow)
+
+        # Subtypes are noted as well
+        self.isinstance(s_stormctrl.StormBreak(), s_stormctrl.StormLoopCtrl)
+        self.isinstance(s_stormctrl.StormContinue(), s_stormctrl.StormLoopCtrl)
+        self.isinstance(s_stormctrl.StormStop(), s_stormctrl.StormGenrCtrl)
+
+        # control flow and exist constructs inherit from the SynErrMixin
+        # return does not to keep it thin. it is used often.
+        self.isinstance(s_stormctrl.StormExit(), s_stormctrl._SynErrMixin)
+        self.isinstance(s_stormctrl.StormBreak(), s_stormctrl._SynErrMixin)
+        self.isinstance(s_stormctrl.StormContinue(), s_stormctrl._SynErrMixin)
+        self.isinstance(s_stormctrl.StormStop(), s_stormctrl._SynErrMixin)
+        self.false(isinstance(s_stormctrl.StormReturn(), s_stormctrl._SynErrMixin))
+
+        # The base class cannot be used on its own.
+        with self.raises(NotImplementedError):
+            s_stormctrl.StormCtrlFlow()
+
+        # The _SynErrMixin classes have several methods that let us treat
+        # instance of them like SynErr exceptions.
+        e = s_stormctrl.StormExit(mesg='words', foo='bar')
+        self.eq(e.get('foo'), 'bar')
+        self.eq(e.items(), {'mesg': 'words', 'foo': 'bar'})
+        self.eq("StormExit: foo='bar' mesg='words'", str(e))
+        e.set('hehe', 1234)
+        e.set('foo', 'words')
+        self.eq("StormExit: foo='words' hehe=1234 mesg='words'", str(e))
+
+        e.setdefault('defv', 1)
+        self.eq("StormExit: defv=1 foo='words' hehe=1234 mesg='words'", str(e))
+
+        e.setdefault('defv', 2)
+        self.eq("StormExit: defv=1 foo='words' hehe=1234 mesg='words'", str(e))
+
+        e.update({'foo': 'newwords', 'bar': 'baz'})
+        self.eq("StormExit: bar='baz' defv=1 foo='newwords' hehe=1234 mesg='words'", str(e))
+
+        # But it does not have an errname property
+        self.false(hasattr(e, 'errname'))
+
+        # StormReturn is used to move objects around.
+        e = s_stormctrl.StormReturn('weee')
+        self.eq(e.item, 'weee')
+
+    async def test_pickled_stormctrlflow(self):
+        e = s_stormctrl.StormExit(mesg='words', foo='bar')
+        buf = pickle.dumps(e)
+        new_e = pickle.loads(buf)
+        self.eq(new_e.get('foo'), 'bar')
+        self.eq("StormExit: foo='bar' mesg='words'", str(new_e))

synapse/tests/test_lib_stormhttp.py

@@ -518,11 +518,11 @@ class StormHttpTest(s_test.SynTest):
             self.eq(data.get('body'), 'MTIzNA==')
 
             q = '''
-            $fields=$lib.list(
-                ({"name": "foo", "value": "bar"}),
-                ({"name": "foo", "value": "bar2"}),
-                ({"name": "baz", "value": "cool"})
-            )
+            $fields=([
+                {"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() )
             '''

synapse/tests/test_lib_stormlib_auth.py

@@ -320,6 +320,17 @@ class StormLibAuthTest(s_test.SynTest):
             self.stormIsInPrint('Controls access to add a new view including forks.', msgs)
             self.stormIsInPrint('default: false', msgs)
 
+            msgs = await core.stormlist('auth.perms.list --find macro.')
+            self.stormIsInPrint('storm.macro.add', msgs)
+            self.stormIsInPrint('storm.macro.admin', msgs)
+            self.stormIsInPrint('storm.macro.edit', msgs)
+            self.stormNotInPrint('node.add.<form>', msgs)
+
+            msgs = await core.stormlist('auth.perms.list --find url')
+            self.stormIsInPrint('storm.lib.telepath.open.<scheme>', msgs)
+            self.stormIsInPrint('Controls the ability to open a telepath URL with a specific URI scheme.', msgs)
+            self.stormNotInPrint('node.add.<form>', msgs)
+
     async def test_stormlib_auth_default_allow(self):
         async with self.getTestCore() as core:
 
@@ -427,7 +438,7 @@ class StormLibAuthTest(s_test.SynTest):
 
             await core.callStorm('$lib.user.json.set(hi, hehe, prop=foo)')
             items = await core.callStorm('''
-            $list = $lib.list()
+            $list = ()
             for $item in $lib.user.json.iter() { $list.append($item) }
             return($list)
             ''')
@@ -437,7 +448,7 @@ class StormLibAuthTest(s_test.SynTest):
             ))
 
             items = await core.callStorm('''
-            $list = $lib.list()
+            $list = ()
             for $item in $lib.user.json.iter(path=bye) { $list.append($item) }
             return($list)
             ''')
@@ -731,7 +742,7 @@ class StormLibAuthTest(s_test.SynTest):
             '''))
 
             # user roles can be set in bulk
-            roles = await core.callStorm('''$roles=$lib.list()
+            roles = await core.callStorm('''$roles=()
             $role=$lib.auth.roles.byname(admins) $roles.append($role.iden)
             $role=$lib.auth.roles.byname(all) $roles.append($role.iden)
             $lib.auth.users.byname(visi).setRoles($roles)
@@ -791,7 +802,7 @@ class StormLibAuthTest(s_test.SynTest):
             visi = await core.callStorm('''
                 $rule = $lib.auth.ruleFromText(hehe.haha)
                 $visi = $lib.auth.users.byname(visi)
-                $visi.setRules($lib.list($rule))
+                $visi.setRules(([$rule]))
                 return($visi)
             ''')
             self.eq(((True, ('hehe', 'haha')),), visi['rules'])
@@ -834,7 +845,7 @@ class StormLibAuthTest(s_test.SynTest):
             ninjas = await core.callStorm('''
                 $rule = $lib.auth.ruleFromText(hehe.haha)
                 $ninjas = $lib.auth.roles.byname(ninjas)
-                $ninjas.setRules($lib.list($rule))
+                $ninjas.setRules(([$rule]))
                 return($ninjas)
             ''')
             self.eq(((True, ('hehe', 'haha')),), ninjas['rules'])
@@ -1003,6 +1014,21 @@ class StormLibAuthTest(s_test.SynTest):
             with self.raises(s_exc.DupIden):
                 await core.callStorm('$lib.auth.roles.add(walkers, iden=$iden)', opts=opts)
 
+            # The role & user.authgates local is a passthrough to the getRoleDef & getUserDef
+            # results, which are a pack()'d structure. Modifying the results of that structure
+            # does not persist.
+            q = '$u = $lib.auth.users.byname(root) $u.authgates.newp = ({}) return ($u)'
+            udef = await core.callStorm(q)
+            self.notin('newp', udef.get('authgates'))
+            q = '$u = $lib.auth.users.byname(root) return ( $lib.dict.has($u.authgates, newp) )'
+            self.false(await core.callStorm(q))
+
+            q = '$r = $lib.auth.roles.byname(all) $r.authgates.newp = ({}) return ($r)'
+            rdef = await core.callStorm(q)
+            self.notin('newp', rdef.get('authgates'))
+            q = '$r = $lib.auth.roles.byname(all) return ( $lib.dict.has($r.authgates, newp) )'
+            self.false(await core.callStorm(q))
+
     async def test_stormlib_auth_gateadmin(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_stormlib_cache.py

@@ -138,19 +138,51 @@ class StormlibCacheTest(s_test.SynTest):
             self.none(await core.callStorm('return($lib.cache.fixed("if (0) { return(yup) }").get(foo))'))
 
             ## control flow exceptions don't propagate up
-            rets = await core.callStorm('''
+            msgs = await core.stormlist('''
                 $cache = $lib.cache.fixed( ${ if ($cache_key < (2)) { return (`key={$cache_key}`) } else { break } } )
 
-                $rets = ([])
+                for $i in $lib.range(4) {
+                    $lib.print(`{$cache.get($i)}`)
+                }
+            ''')
+            self.stormIsInPrint('key=1', msgs)
+            self.stormNotInPrint('key=2', msgs)
+            self.stormIsInErr('Storm control flow "break" not allowed in cache callbacks.', msgs)
+
+            msgs = await core.stormlist('''
+                $cache = $lib.cache.fixed( ${ if ($cache_key < (2)) { return (`key={$cache_key}`) } else { continue } } )
 
                 for $i in $lib.range(4) {
-                    $rets.append($cache.get($i))
+                    $lib.print(`{$cache.get($i)}`)
                 }
+            ''')
+            self.stormIsInPrint('key=1', msgs)
+            self.stormNotInPrint('key=2', msgs)
+            self.stormIsInErr('Storm control flow "continue" not allowed in cache callbacks.', msgs)
 
-                $rets.append(`i={$i}`)
-                return($rets)
+            msgs = await core.stormlist('''
+                $cache = $lib.cache.fixed( ${ if ($cache_key < (2)) { return (`key={$cache_key}`) } else { stop } } )
+
+                for $i in $lib.range(4) {
+                    $lib.print(`{$cache.get($i)}`)
+                }
             ''')
-            self.eq(['key=0', 'key=1', None, None, 'i=3'], rets)
+            self.stormIsInPrint('key=1', msgs)
+            self.stormNotInPrint('key=2', msgs)
+            self.stormIsInErr('Storm control flow "stop" not allowed in cache callbacks.', msgs)
+
+            msgs = await core.stormlist('''
+                $cache = $lib.cache.fixed(
+                    ${ if ($cache_key < (2)) { return (`key={$cache_key}`) } else { $lib.exit(mesg=newp) } }
+                )
+
+                for $i in $lib.range(4) {
+                    $lib.print(`{$cache.get($i)}`)
+                }
+                ''')
+            self.stormIsInPrint('key=1', msgs)
+            self.stormNotInPrint('key=2', msgs)
+            self.stormIsInErr('Storm control flow "StormExit" not allowed in cache callbacks.', msgs)
 
             ## control flow scoped inside the callback
             rets = await core.callStorm("""

synapse/tests/test_lib_stormlib_cell.py

@@ -14,6 +14,9 @@ class StormCellTest(s_test.SynTest):
 
         async with self.getTestCore() as core:
 
+            ret = await core.callStorm('return ( $lib.cell.iden )')
+            self.eq(ret, core.getCellIden())
+
             ret = await core.callStorm('return ( $lib.cell.getCellInfo() )')
             self.eq(ret, await core.getCellInfo())
 

synapse/tests/test_lib_stormlib_modelext.py

@@ -122,7 +122,7 @@ class StormtypesModelextTest(s_test.SynTest):
             self.none(core.model.edge(('inet:user', '_copies', None)))
 
             # Underscores can exist in extended names but only at specific locations
-            q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
+            q = '''$l =(['str', {}]) $d=({"doc": "Foo"})
             $lib.model.ext.addFormProp('test:str', '_test:_myprop', $l, $d)
             '''
             self.none(await core.callStorm(q))
@@ -144,13 +144,13 @@ class StormtypesModelextTest(s_test.SynTest):
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
+                q = '''$l =(['str', {}]) $d=({"doc": "Foo"})
                 $lib.model.ext.addFormProp('test:str', '_test:_my^prop', $l, $d)
                 '''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
+                q = '''$l =(['str', {}]) $d=({"doc": "Foo"})
                 $lib.model.ext.addFormProp('test:str', '_test::_myprop', $l, $d)
                 '''
                 await core.callStorm(q)

synapse/tests/test_lib_stormlib_scrape.py

@@ -24,7 +24,7 @@ class StormScrapeTest(s_test.SynTest):
                     The helper does require a named match for valu this is extracted.
                     */
                     function scrape(text) {
-                        $ret = $lib.list()
+                        $ret = ()
                         for ($valu, $info) in $lib.scrape.genMatches($text, $modRe) {
                             $ret.append(($modForm, $valu, $info))
                         }
@@ -49,7 +49,7 @@ class StormScrapeTest(s_test.SynTest):
                     Example of an storm module that scraps and matches on hzzp enfanged urls.
                     */
                     function scrape(text) {
-                        $ret = $lib.list()
+                        $ret = ()
                         for ($valu, $info) in $lib.scrape.genMatches($text, $modRe, fangs=$modFangs) {
                             $ret.append(($modForm, $valu, $info))
                         }
@@ -105,7 +105,7 @@ class StormScrapeTest(s_test.SynTest):
             self.stormIsInPrint('inet:url=https://giggles.com/mallory.html', msgs)
             self.stormIsInPrint("'match': 'hzzps[:]\\\\giggles.com/mallory.html'", msgs)
 
-            cq = '''$ret=$lib.list()
+            cq = '''$ret=()
             for ($form, $valu) in $lib.scrape.ndefs($text) {
                 $ret.append(($form, $valu))
             }
@@ -180,7 +180,7 @@ class StormScrapeTest(s_test.SynTest):
             self.eq(result, {'inet:ipv4=16909060': 1, 'inet:fqdn=foo.bar': 1, 'inet:fqdn=woot.com': 1})
 
             # $lib.scrape.context() - this is currently just wrapping s_scrape.contextscrape
-            query = '''$list = $lib.list() for $info in $lib.scrape.context($text)
+            query = '''$list = () for $info in $lib.scrape.context($text)
             { $list.append($info) }
             fini { return ( $list ) }
             '''