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

synapse/tests/test_lib_stormlib_cortex.py

@@ -429,6 +429,44 @@ $request.reply(206, headers=$headers, body=({"no":"body"}))
             '''
             iden3 = await core.callStorm(q)
 
+            # $lib.dict accessor methods
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.keys($api.vars))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, ('hehe', 'items'))
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.values($api.vars))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, ('wow', ('1', '2', 3)))
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.has($api.vars, anotherKey))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.false(valu)
+
+            q = '''$api=$lib.cortex.httpapi.get($iden)
+            return ($lib.dict.update($api.vars, ({"hehe": "haha", "anotherKey": "anotherValu"}) ))'''
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.none(valu)
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.has($api.vars, anotherKey))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.true(valu)
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.values($api.vars))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, ('haha', ('1', '2', 3), 'anotherValu'))
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.pop($api.vars, anotherKey))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, 'anotherValu')
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.pop($api.vars, anotherKey, missingKey))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, 'missingKey')
+
+            with self.raises(s_exc.BadArg):
+                q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.pop($api.vars, anotherKey))'
+                await core.callStorm(q, opts={'vars': {'iden': iden3}})
+
             msgs = await core.stormlist('cortex.httpapi.list')
             self.stormIsInPrint(f'0     {iden0}', msgs)
             self.stormIsInPrint(f'1     {iden1}', msgs)
@@ -569,7 +607,7 @@ $request.reply(206, headers=$headers, body=({"no":"body"}))
             msgs = await core.stormlist('cortex.httpapi.stat $iden', opts={'vars': {'iden': iden3}})
             self.stormIsInPrint(f'Iden: {iden3}', msgs)
             self.stormIsInPrint('The handler has the following runtime variables set:', msgs)
-            self.stormIsInPrint('hehe             => wow', msgs)
+            self.stormIsInPrint('hehe             => haha', msgs)
             self.stormIsInPrint("items            => ('1', '2', 3)", msgs)
 
             # Remove a user + view and stat the handler
@@ -999,7 +1037,11 @@ for $i in $values {
             }
             // Cannot modify request headers
             $api.methods.post = ${
-                $request.headers.newp = haha
+                if $request.headers.dictmethod {
+                    $lib.dict.update($request.headers, ({"newp": "haha"}))
+                } else {
+                    $request.headers.newp = haha
+                }
             }
             return ( ($api.iden, $api.owner.name) )
             '''
@@ -1029,6 +1071,12 @@ for $i in $values {
                 self.eq(data.get('code'), 'StormRuntimeError')
                 self.eq(data.get('mesg'), 'http:api:request:headers may not be modified by the runtime.')
 
+                resp = await sess.post(f'https://localhost:{hport}/api/ext/testpath', headers={'dictmethod': '1'})
+                self.eq(resp.status, 500)
+                data = await resp.json()
+                self.eq(data.get('code'), 'StormRuntimeError')
+                self.eq(data.get('mesg'), 'http:api:request:headers may not be modified by the runtime.')
+
     async def test_libcortex_httpapi_vars(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_stormlib_gen.py

@@ -1,3 +1,5 @@
+import synapse.exc as s_exc
+
 import synapse.tests.utils as s_test
 
 class StormLibGenTest(s_test.SynTest):
@@ -112,6 +114,81 @@ class StormLibGenTest(s_test.SynTest):
             self.eq(nodes00[0].ndef, nodes01[0].ndef)
             self.ne(nodes01[0].ndef, nodes02[0].ndef)
 
+            q = 'gen.it.av.scan.result inet:fqdn vertex.link foosig --scanner-name barscn --time 2022'
+            nodes00 = await core.nodes(q)
+            self.len(1, nodes00)
+            self.eq('vertex.link', nodes00[0].get('target:fqdn'))
+            self.eq('foosig', nodes00[0].get('signame'))
+            self.eq('barscn', nodes00[0].get('scanner:name'))
+            self.eq('2022/01/01 00:00:00.000', nodes00[0].repr('time'))
+            nodes01 = await core.nodes(q)
+            self.eq(nodes00[0].ndef, nodes01[0].ndef)
+
+            nodes02 = await core.nodes('gen.it.av.scan.result inet:fqdn vertex.link foosig --scanner-name barscn')
+            self.eq(nodes00[0].ndef, nodes02[0].ndef)
+            self.eq('2022/01/01 00:00:00.000', nodes02[0].repr('time'))
+
+            nodes03 = await core.nodes('gen.it.av.scan.result inet:fqdn vertex.link foosig --scanner-name bazscn')
+            self.ne(nodes00[0].ndef, nodes03[0].ndef)
+
+            nodes04 = await core.nodes('gen.it.av.scan.result inet:fqdn vertex.link foosig --time 2022')
+            self.eq(nodes00[0].ndef, nodes04[0].ndef)
+
+            nodes05 = await core.nodes('gen.it.av.scan.result inet:fqdn vertex.link foosig --time 2023')
+            self.ne(nodes00[0].ndef, nodes05[0].ndef)
+
+            opts = {
+                'vars': {
+                    'guid': '28c5902d115f29f1fcb818c0abeaa491',
+                    'ip': '1.2.3.4',
+                    'fqdn': 'vtk.lk',
+                }
+            }
+
+            self.len(1, await core.nodes('gen.it.av.scan.result file:bytes `guid:{$guid}` foosig', opts=opts))
+            self.len(1, await core.nodes('gen.it.av.scan.result inet:fqdn $fqdn foosig', opts=opts))
+            self.len(1, await core.nodes('gen.it.av.scan.result inet:ipv4 $ip  foosig', opts=opts))
+            self.len(1, await core.nodes('gen.it.av.scan.result inet:ipv6 $ip foosig', opts=opts))
+            self.len(1, await core.nodes('gen.it.av.scan.result inet:url `http://{$fqdn}` foosig', opts=opts))
+            self.len(1, await core.nodes('gen.it.av.scan.result it:exec:proc $guid foosig', opts=opts))
+            self.len(1, await core.nodes('gen.it.av.scan.result it:host $guid foosig', opts=opts))
+
+            self.len(7, await core.nodes('''
+                file:bytes=`guid:{$guid}`
+                inet:fqdn=$fqdn
+                it:host=$guid
+                inet:ipv4=$ip
+                inet:ipv6:ipv4=$ip
+                it:exec:proc=$guid
+                inet:url=`http://{$fqdn}`
+                +{
+                    ($form, $valu) = $node.ndef()
+                    -> { gen.it.av.scan.result $form $valu foosig }
+                }=1
+                -> it:av:scan:result
+            ''', opts=opts))
+
+            nodes = await core.nodes('''
+                [ it:av:filehit=(`guid:{$lib.guid()}`, ($lib.guid(), fsig)) :sig:name=fsig ]
+                gen.it.av.scan.result file:bytes :file :sig:name
+            ''')
+            self.sorteq(['it:av:filehit', 'it:av:scan:result'], [n.ndef[0] for n in nodes])
+
+            with self.raises(s_exc.NoSuchType) as cm:
+                await core.nodes('gen.it.av.scan.result newp vertex.link foosig --try')
+            self.eq('No type or prop found for name newp.', cm.exception.errinfo['mesg'])
+
+            with self.raises(s_exc.BadArg) as cm:
+                await core.nodes('gen.it.av.scan.result ps:name nah foosig --try')
+            self.eq('Unsupported target form ps:name', cm.exception.errinfo['mesg'])
+
+            self.len(0, await core.nodes('gen.it.av.scan.result file:bytes newp foosig --try'))
+
+            self.none(await core.callStorm('return($lib.gen.itAvScanResultByTarget(inet:fqdn, vertex.link, $lib.null, try=$lib.true))'))
+            self.none(await core.callStorm('return($lib.gen.itAvScanResultByTarget(inet:fqdn, "..", barsig, try=$lib.true))'))
+            self.none(await core.callStorm('return($lib.gen.itAvScanResultByTarget(inet:fqdn, vertex.link, barsig, scanner=$lib.set(), try=$lib.true))'))
+            self.none(await core.callStorm('return($lib.gen.itAvScanResultByTarget(inet:fqdn, vertex.link, barsig, time=newp, try=$lib.true))'))
+
             # Stable guid test
             fork = await core.callStorm('return( $lib.view.get().fork().iden )')
 

synapse/tests/test_lib_stormlib_json.py

@@ -27,7 +27,7 @@ class JsonTest(s_test.SynTest):
 
             opts = {'vars': {'schema': s_test.test_schema}}
             q = '''$schemaObj = $lib.json.schema($schema)
-            $item=$lib.dict()
+            $item=({})
             $item."key:integer"=(4)
             return ( $schemaObj.validate($item) )
             '''
@@ -37,7 +37,7 @@ class JsonTest(s_test.SynTest):
             self.eq('Default string!', valu.get('key:string'))
 
             q = '''$schemaObj = $lib.json.schema($schema)
-            $item=$lib.dict()
+            $item=({})
             $item."key:integer"=4
             return ( $schemaObj.validate($item) )
             '''

synapse/tests/test_lib_stormlib_macro.py

@@ -152,7 +152,7 @@ class MacroTest(s_test.SynTest):
             self.eq([('test:str', 'cooler')], [n.ndef for n in nodes])
 
             # Inner vars win on conflict
-            q = 'macro.set data2 ${ $data=$lib.dict(value=beef) [test:str=$data.value +#cool.story] }'
+            q = 'macro.set data2 ${ $data=({"value": "beef"}) [test:str=$data.value +#cool.story] }'
             msgs = await core.stormlist(q)
             self.stormIsInPrint('Set macro: data2', msgs)
 

synapse/tests/test_lib_stormlib_modelext.py

@@ -12,16 +12,16 @@ class StormtypesModelextTest(s_test.SynTest):
                 $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
 
                 $propinfo = ({"doc": "A test prop doc."})
-                $lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $propinfo)
+                $lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), $propinfo)
 
                 $univinfo = ({"doc": "A test univ doc."})
-                $lib.model.ext.addUnivProp(_woot, (int, $lib.dict()), $univinfo)
+                $lib.model.ext.addUnivProp(_woot, (int, ({})), $univinfo)
 
                 $tagpropinfo = ({"doc": "A test tagprop doc."})
-                $lib.model.ext.addTagProp(score, (int, $lib.dict()), $tagpropinfo)
+                $lib.model.ext.addTagProp(score, (int, ({})), $tagpropinfo)
 
                 $pinfo = ({"doc": "Extended a core model."})
-                $lib.model.ext.addFormProp(test:int, _tick, (time, $lib.dict()), $propinfo)
+                $lib.model.ext.addFormProp(test:int, _tick, (time, ({})), $propinfo)
             ''')
 
             nodes = await core.nodes('[ _visi:int=10 :tick=20210101 ._woot=30 +#lol:score=99 ]')
@@ -37,11 +37,11 @@ class StormtypesModelextTest(s_test.SynTest):
             self.eq(nodes[0].get('_tick'), 1609459200000)
 
             with self.raises(s_exc.DupPropName):
-                q = '''$lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), ({}))'''
                 await core.callStorm(q)
 
             with self.raises(s_exc.DupPropName):
-                q = '''$lib.model.ext.addUnivProp(_woot, (time, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addUnivProp(_woot, (time, ({})), ({}))'''
                 await core.callStorm(q)
 
             # Grab the extended model definitions
@@ -64,45 +64,45 @@ class StormtypesModelextTest(s_test.SynTest):
             self.none(core.model.tagprop('score'))
 
             # Underscores can exist in extended names but only at specific locations
-            q = '''$l =$lib.list('str', $lib.dict()) $d=$lib.dict(doc="Foo")
+            q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
             $lib.model.ext.addFormProp('test:str', '_test:_myprop', $l, $d)
             '''
             self.none(await core.callStorm(q))
-            q = '$lib.model.ext.addUnivProp(_woot:_stuff, (int, $lib.dict()), $lib.dict())'
+            q = '$lib.model.ext.addUnivProp(_woot:_stuff, (int, ({})), ({}))'
             self.none(await core.callStorm(q))
 
-            q = '''$lib.model.ext.addTagProp(_score, (int, $lib.dict()), $lib.dict())'''
+            q = '''$lib.model.ext.addTagProp(_score, (int, ({})), ({}))'''
             self.none(await core.callStorm(q))
 
-            q = '''$lib.model.ext.addTagProp(some:_score, (int, $lib.dict()), $lib.dict())'''
+            q = '''$lib.model.ext.addTagProp(some:_score, (int, ({})), ({}))'''
             self.none(await core.callStorm(q))
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$l =$lib.list('str', $lib.dict()) $d=$lib.dict(doc="Foo")
+                q = '''$l =$lib.list('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', $lib.dict()) $d=$lib.dict(doc="Foo")
+                q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
                 $lib.model.ext.addFormProp('test:str', '_test::_myprop', $l, $d)
                 '''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$lib.model.ext.addUnivProp(_woot^stuff, (int, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addUnivProp(_woot^stuff, (int, ({})), ({}))'''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$lib.model.ext.addUnivProp(_woot:_stuff^2, (int, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addUnivProp(_woot:_stuff^2, (int, ({})), ({}))'''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$lib.model.ext.addTagProp(some^score, (int, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addTagProp(some^score, (int, ({})), ({}))'''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$lib.model.ext.addTagProp(_someones:_score^value, (int, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addTagProp(_someones:_score^value, (int, ({})), ({}))'''
                 await core.callStorm(q)
 
             # Permission errors
@@ -110,27 +110,27 @@ class StormtypesModelextTest(s_test.SynTest):
             opts = {'user': visi.iden}
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
-                    $typeinfo = $lib.dict()
-                    $forminfo = $lib.dict(doc="A test form doc.")
+                    $typeinfo = ({})
+                    $forminfo = ({"doc": "A test form doc."})
                     $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
                 ''', opts=opts)
 
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
-                    $propinfo = $lib.dict(doc="A test prop doc.")
-                    $lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $propinfo)
+                    $propinfo = ({"doc": "A test prop doc."})
+                    $lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), $propinfo)
                 ''', opts=opts)
 
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
-                    $univinfo = $lib.dict(doc="A test univ doc.")
-                    $lib.model.ext.addUnivProp(".woot", (int, $lib.dict()), $univinfo)
+                    $univinfo = ({"doc": "A test univ doc."})
+                    $lib.model.ext.addUnivProp(".woot", (int, ({})), $univinfo)
                 ''', opts=opts)
 
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
-                    $tagpropinfo = $lib.dict(doc="A test tagprop doc.")
-                    $lib.model.ext.addTagProp(score, (int, $lib.dict()), $tagpropinfo)
+                    $tagpropinfo = ({"doc": "A test tagprop doc."})
+                    $lib.model.ext.addTagProp(score, (int, ({})), $tagpropinfo)
                 ''', opts=opts)
 
         # Reload the model extensions automatically
@@ -164,16 +164,16 @@ class StormtypesModelextTest(s_test.SynTest):
                 $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
 
                 $propinfo = ({"doc": "NEWP"})
-                $lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $propinfo)
+                $lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), $propinfo)
 
                 $univinfo = ({"doc": "NEWP"})
-                $lib.model.ext.addUnivProp(_woot, (int, $lib.dict()), $univinfo)
+                $lib.model.ext.addUnivProp(_woot, (int, ({})), $univinfo)
 
                 $tagpropinfo = ({"doc": "NEWP"})
-                $lib.model.ext.addTagProp(score, (int, $lib.dict()), $tagpropinfo)
+                $lib.model.ext.addTagProp(score, (int, ({})), $tagpropinfo)
 
                 $pinfo = ({"doc": "NEWP"})
-                $lib.model.ext.addFormProp(test:int, _tick, (time, $lib.dict()), $propinfo)
+                $lib.model.ext.addFormProp(test:int, _tick, (time, ({})), $propinfo)
             ''')
 
             q = '''return ($lib.model.ext.addExtModel($model_defs))'''
@@ -248,10 +248,10 @@ class StormtypesModelextTest(s_test.SynTest):
                     self.eq(mesg['type'], 'init')
 
                     await core.callStorm('''
-                        $lib.model.ext.addForm(_behold:score, int, $lib.dict(), $lib.dict(doc="first string"))
-                        $lib.model.ext.addFormProp(_behold:score, rank, (int, $lib.dict()), $lib.dict(doc="second string"))
-                        $lib.model.ext.addUnivProp(_beep, (int, $lib.dict()), $lib.dict(doc="third string"))
-                        $lib.model.ext.addTagProp(thingy, (int, $lib.dict()), $lib.dict(doc="fourth string"))
+                        $lib.model.ext.addForm(_behold:score, int, ({}), ({"doc": "first string"}))
+                        $lib.model.ext.addFormProp(_behold:score, rank, (int, ({})), ({"doc": "second string"}))
+                        $lib.model.ext.addUnivProp(_beep, (int, ({})), ({"doc": "third string"}))
+                        $lib.model.ext.addTagProp(thingy, (int, ({})), ({"doc": "fourth string"}))
                     ''')
 
                     formmesg = await sock.receive_json()
@@ -310,12 +310,12 @@ class StormtypesModelextTest(s_test.SynTest):
         async with self.getTestCore() as core:
 
             await core.callStorm('''
-                $typeinfo = $lib.dict()
-                $forminfo = $lib.dict(doc="A test form doc.")
+                $typeinfo = ({})
+                $forminfo = ({"doc": "A test form doc."})
                 $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
 
-                $propinfo = $lib.dict(doc="A test prop doc.")
-                $lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $propinfo)
+                $propinfo = ({"doc": "A test prop doc."})
+                $lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), $propinfo)
             ''')
 
             self.nn(core.model.form('_visi:int'))
@@ -326,7 +326,7 @@ class StormtypesModelextTest(s_test.SynTest):
                 await core.callStorm(q)
             self.eq('Form has extended properties: tick', exc.exception.get('mesg'))
 
-            await core.callStorm('$lib.model.ext.addFormProp(_visi:int, tock, (time, $lib.dict()), $lib.dict())')
+            await core.callStorm('$lib.model.ext.addFormProp(_visi:int, tock, (time, ({})), ({}))')
 
             self.nn(core.model.form('_visi:int'))
             self.nn(core.model.prop('_visi:int:tick'))

synapse/tests/test_lib_stormlib_oauth.py

@@ -148,9 +148,9 @@ class OAuthTest(s_test.SynTest):
             $csec = boop
             $atkn = neato
             $asec = burrito
-            $headers = $lib.dict(
-                "content-type"="application/json"
-            )
+            $headers = ({
+                "content-type": "application/json"
+            })
             $client = $lib.inet.http.oauth.v1.client($ckey, $csec, $atkn, $asec, $lib.inet.http.oauth.v1.SIG_HEADER)
             return($client.sign($url, headers=$headers))
             '''
@@ -182,13 +182,13 @@ class OAuthTest(s_test.SynTest):
             $csec = boop
             $atkn = neato
             $asec = burrito
-            $headers = $lib.dict(
-                "Content-Type"="application/json"
-            )
-            $body = $lib.dict(
-                foo = bar,
-                biz = baz,
-            )
+            $headers = ({
+                "Content-Type": "application/json"
+            })
+            $body = ({
+                'foo': 'bar',
+                'biz': 'baz',
+            })
             $client = $lib.inet.http.oauth.v1.client($ckey, $csec, $atkn, $asec, $lib.inet.http.oauth.v1.SIG_BODY)
             return($client.sign($url, method='POST', headers=$headers, body=$body))
             '''
@@ -214,9 +214,9 @@ class OAuthTest(s_test.SynTest):
             $csec = boop
             $atkn = neato
             $asec = burrito
-            $body = $lib.dict(
-                awesome = possum,
-            )
+            $body = ({
+                'awesome': 'possum',
+            })
             $client = $lib.inet.http.oauth.v1.client($ckey, $csec, $atkn, $asec, $lib.inet.http.oauth.v1.SIG_BODY)
             return($client.sign($url, method='POST', headers=$lib.null, body=$body))
             '''
@@ -233,13 +233,13 @@ class OAuthTest(s_test.SynTest):
             $csec = boop
             $atkn = neato
             $asec = burrito
-            $headers = $lib.dict(
-                "Content-Type"="application/json"
-            )
-            $body = $lib.dict(
-                foo = bar,
-                biz = baz,
-            )
+            $headers = ({
+                "Content-Type": "application/json"
+            })
+            $body = ({
+                'foo': 'bar',
+                'biz': 'baz',
+            })
             $client = $lib.inet.http.oauth.v1.client($ckey, $csec, $atkn, $asec, $lib.inet.http.oauth.v1.SIG_BODY)
             return($client.sign($url, headers=$headers, body=$body))
             '''

synapse/tests/test_lib_stormlib_stix.py

@@ -428,6 +428,7 @@ class StormLibStixTest(s_test.SynTest):
                         "stix": {
                             "vtx-mitigation": {
                                 "props": {
+                                    "desc": "return($desc)",
                                     "name": "{+:name return(:name)} return($node.repr())",
                                     "created": "return($lib.stix.export.timestamp(.created))",
                                     "modified": "return($lib.stix.export.timestamp(.created))",
@@ -440,13 +441,14 @@ class StormLibStixTest(s_test.SynTest):
                 }
 
                 [ risk:mitigation=c4f6dc09f1e1e6b7e7b05c9ce4186ce8 :name="patch stuff and do things" ]
-
+                $desc = "scopevar"
                 $bundle.add($node)
 
                 fini { return($bundle) }
             ''')
 
             self.eq('vtx-mitigation--2df2a437-e372-468b-b989-d01753603659', bund['objects'][1]['id'])
+            self.eq('scopevar', bund['objects'][1]['desc'])
             self.eq('patch stuff and do things', bund['objects'][1]['name'])
             self.nn(bund['objects'][1]['created'])
             self.nn(bund['objects'][1]['modified'])

synapse/tests/test_lib_stormlib_vault.py

@@ -76,7 +76,7 @@ class StormlibVaultTest(s_test.SynTest):
 
             opts = {'vars': {'iden': uiden}, 'user': visi2.iden}
             msgs = await core.stormlist('$vault = $lib.vault.get($iden)', opts=opts)
-            self.stormIsInErr(f'User (visi2) has insufficient permissions (requires: read).', msgs)
+            self.stormIsInErr(f'User requires read permission on vault: {uiden}.', msgs)
 
             # Set and delete data
             opts = {'vars': {'iden': uiden}}