synapse 2.166.0__py311-none-any.whl → 2.168.0__py311-none-any.whl

synapse/tests/test_lib_stormlib_macro.py

@@ -53,6 +53,27 @@ class MacroTest(s_test.SynTest):
             with self.raises(s_exc.AuthDeny):
                 await core.nodes('$lib.macro.del(hehe)', opts=asvisi)
 
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.set("", ${ inet:ipv4 })')
+
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.get("")')
+
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.del("")')
+
+            with self.raises(s_exc.BadArg):
+                await core.delStormMacro('', user=None)
+
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.grant("", users, hehe, 3)')
+
+            with self.raises(s_exc.SchemaViolation):
+                await core.nodes('$lib.macro.mod("hehe", ({"name": ""}))')
+
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.mod("", ({"name": "foobar"}))')
+
             with self.raises(s_exc.AuthDeny):
                 await core.nodes('$lib.macro.set(hehe, ${ inet:ipv6 })', opts=asvisi)
 
@@ -118,6 +139,14 @@ class MacroTest(s_test.SynTest):
             msgs = await core.stormlist('macro.del print', opts={'readonly': True})
             self.stormIsInErr('not marked readonly safe', msgs)
 
+            msgs = await core.stormlist('macro.set blorpblorp "+#foo"', opts=asvisi)
+            self.stormHasNoWarnErr(msgs)
+
+            await core.auth.delUser(visi.iden)
+            msgs = await core.stormlist('macro.list')
+            self.stormIsInPrint("User not found", msgs)
+            self.stormIsInPrint(visi.iden, msgs)
+
     async def test_stormlib_macro_vars(self):
 
         async with self.getTestCore() as core:
@@ -319,3 +348,68 @@ class MacroTest(s_test.SynTest):
             await visi.addRule((True, ('storm', 'macro', 'admin')))
             msgs = await core.stormlist('macro.del asdf', opts={'user': visi.iden})
             self.stormHasNoWarnErr(msgs)
+
+    async def test_stormlib_behold_macro(self):
+        self.skipIfNexusReplay()
+        async with self.getTestCore() as core:
+            host, port = await core.addHttpsPort(0, host='127.0.0.1')
+
+            visi = await core.auth.addUser('visi')
+            await visi.setPasswd('secret')
+            await visi.setAdmin(True)
+
+            async with self.getHttpSess() as sess:
+                async with sess.post(f'https://localhost:{port}/api/v1/login', json={'user': 'visi', 'passwd': 'secret'}) as resp:
+                    retn = await resp.json()
+                    self.eq('ok', retn.get('status'))
+                    self.eq('visi', retn['result']['name'])
+
+                async with sess.ws_connect(f'wss://localhost:{port}/api/v1/behold') as sock:
+                    await sock.send_json({'type': 'call:init'})
+                    mesg = await sock.receive_json()
+                    self.eq(mesg['type'], 'init')
+
+                    await core.callStorm('''
+                        $lib.macro.set('foobar', ${ file:bytes | [+#neato] })
+                        $lib.macro.set('foobar', ${ inet:ipv4 | [+#burrito] })
+                        $lib.macro.mod('foobar', ({'name': 'bizbaz'}))
+                        $lib.macro.grant('bizbaz', users, $visi, 3)
+                        $lib.macro.del('bizbaz')
+                    ''', opts={'vars': {'visi': visi.iden}})
+
+                    addmesg = await sock.receive_json()
+                    self.eq('storm:macro:add', addmesg['data']['event'])
+                    macro = addmesg['data']['info']['macro']
+                    self.eq(macro['name'], 'foobar')
+                    self.eq(macro['storm'], 'file:bytes | [+#neato]')
+                    self.ne(visi.iden, macro['user'])
+                    self.ne(visi.iden, macro['creator'])
+                    self.nn(macro['iden'])
+
+                    setmesg = await sock.receive_json()
+                    self.eq('storm:macro:mod', setmesg['data']['event'])
+                    event = setmesg['data']['info']
+                    self.nn(event['macro'])
+                    self.eq(event['info']['storm'], 'inet:ipv4 | [+#burrito]')
+                    self.nn(event['info']['updated'])
+
+                    modmesg = await sock.receive_json()
+                    self.eq('storm:macro:mod', modmesg['data']['event'])
+                    event = modmesg['data']['info']
+                    self.nn(event['macro'])
+                    self.eq(event['info']['name'], 'bizbaz')
+                    self.nn(event['info']['updated'])
+
+                    grantmesg = await sock.receive_json()
+                    self.eq('storm:macro:set:perm', grantmesg['data']['event'])
+                    event = grantmesg['data']['info']
+                    self.nn(event['macro'])
+                    self.eq(event['info']['level'], 3)
+                    self.eq(event['info']['scope'], 'users')
+                    self.eq(event['info']['iden'], visi.iden)
+
+                    delmesg = await sock.receive_json()
+                    self.eq('storm:macro:del', delmesg['data']['event'])
+                    event = delmesg['data']['info']
+                    self.nn(event['iden'])
+                    self.eq(event['name'], 'bizbaz')

synapse/tests/test_lib_stormlib_spooled.py

@@ -29,7 +29,7 @@ class StormlibSpooledTest(s_test.SynTest):
                 $set = $lib.spooled.set()
                 inet:ipv4 $set.add(:asn)
                 $set.rems((:asn,:asn))
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)

synapse/tests/test_lib_stormtypes.py

@@ -1343,34 +1343,34 @@ class StormTypesTest(s_test.SynTest):
             n2 = s_common.guid()
             n3 = s_common.guid()
 
-            nodes = await core.nodes('[graph:node="*" :data=$data]', opts={'vars': {'data': ghstr}})
+            nodes = await core.nodes('[tel:mob:telem="*" :data=$data]', opts={'vars': {'data': ghstr}})
             self.len(1, nodes)
             node1 = nodes[0]
 
-            nodes = await core.nodes('[graph:node="*" :data=$data]', opts={'vars': {'data': mstr}})
+            nodes = await core.nodes('[tel:mob:telem="*" :data=$data]', opts={'vars': {'data': mstr}})
             self.len(1, nodes)
             node2 = nodes[0]
-            q = '''graph:node=$n1 $gzthing = :data
+            q = '''tel:mob:telem=$n1 $gzthing = :data
                 $foo = $lib.base64.decode($gzthing).gunzip()
                 $lib.print($foo)
-                [( graph:node=$n2 :data=$foo.decode() )]'''
+                [( tel:mob:telem=$n2 :data=$foo.decode() )]'''
 
             msgs = await core.stormlist(q, opts={'vars': {'n1': node1.ndef[1], 'n2': n2}})
             self.stormHasNoWarnErr(msgs)
             self.stormIsInPrint('ohhai', msgs)
 
             # make sure we gunzip correctly
-            nodes = await core.nodes('graph:node=$valu', opts={'vars': {'valu': n2}})
+            nodes = await core.nodes('tel:mob:telem=$valu', opts={'vars': {'valu': n2}})
             self.len(1, nodes)
             self.eq(hstr, nodes[0].get('data'))
 
-            text = f'''graph:node=$n2 $bar = :data
-                    [( graph:node=$n3 :data=$lib.base64.encode($bar.encode().gzip()) )]'''
+            text = f'''tel:mob:telem=$n2 $bar = :data
+                    [( tel:mob:telem=$n3 :data=$lib.base64.encode($bar.encode().gzip()) )]'''
             msgs = await core.stormlist(text, opts={'vars': {'n2': node2.ndef[1], 'n3': n3}})
             self.stormHasNoWarnErr(msgs)
 
             # make sure we gzip correctly
-            nodes = await core.nodes('graph:node=$valu', opts={'vars': {'valu': n3}})
+            nodes = await core.nodes('tel:mob:telem=$valu', opts={'vars': {'valu': n3}})
             self.len(1, nodes)
             self.eq(mstr.encode(), gzip.decompress(base64.urlsafe_b64decode(nodes[0].props['data'])))
 
@@ -1383,30 +1383,30 @@ class StormTypesTest(s_test.SynTest):
             n2 = s_common.guid()
             n3 = s_common.guid()
 
-            nodes = await core.nodes('[graph:node="*" :data=$data]', opts={'vars': {'data': ghstr}})
+            nodes = await core.nodes('[tel:mob:telem="*" :data=$data]', opts={'vars': {'data': ghstr}})
             self.len(1, nodes)
             node1 = nodes[0]
-            nodes = await core.nodes('[graph:node="*" :data=$data]', opts={'vars': {'data': mstr}})
+            nodes = await core.nodes('[tel:mob:telem="*" :data=$data]', opts={'vars': {'data': mstr}})
             self.len(1, nodes)
             node2 = nodes[0]
 
-            q = '''graph:node=$valu $bzthing = :data $foo = $lib.base64.decode($bzthing).bunzip()
+            q = '''tel:mob:telem=$valu $bzthing = :data $foo = $lib.base64.decode($bzthing).bunzip()
             $lib.print($foo)
-            [( graph:node=$n2 :data=$foo.decode() )] -graph:node=$valu'''
+            [( tel:mob:telem=$n2 :data=$foo.decode() )] -tel:mob:telem=$valu'''
             msgs = await core.stormlist(q, opts={'vars': {'valu': node1.ndef[1], 'n2': n2}})
             self.stormHasNoWarnErr(msgs)
             self.stormIsInPrint('ohhai', msgs)
 
             # make sure we bunzip correctly
             opts = {'vars': {'iden': n2}}
-            nodes = await core.nodes('graph:node=$iden', opts=opts)
+            nodes = await core.nodes('tel:mob:telem=$iden', opts=opts)
             self.len(1, nodes)
             node = nodes[0]
             self.eq(node.get('data'), hstr)
 
             # bzip
-            q = '''graph:node=$valu $bar = :data
-                [( graph:node=$n3 :data=$lib.base64.encode($bar.encode().bzip()) )] -graph:node=$valu'''
+            q = '''tel:mob:telem=$valu $bar = :data
+                [( tel:mob:telem=$n3 :data=$lib.base64.encode($bar.encode().bzip()) )] -tel:mob:telem=$valu'''
             nodes = await core.nodes(q, opts={'vars': {'valu': node2.ndef[1], 'n3': n3}})
             self.len(1, nodes)
             node = nodes[0]
@@ -1420,13 +1420,13 @@ class StormTypesTest(s_test.SynTest):
             valu = s_common.guid()
             n2 = s_common.guid()
 
-            nodes = await core.nodes('[graph:node=$valu :data=$data]', opts={'vars': {'valu': valu, 'data': ghstr}})
+            nodes = await core.nodes('[tel:mob:telem=$valu :data=$data]', opts={'vars': {'valu': valu, 'data': ghstr}})
             self.len(1, nodes)
             node1 = nodes[0]
             self.eq(node1.get('data'), ghstr)
 
-            q = '''graph:node=$valu $jzthing=:data $foo=$jzthing.encode().json() [(graph:node=$n2 :data=$foo)]
-                  -graph:node=$valu'''
+            q = '''tel:mob:telem=$valu $jzthing=:data $foo=$jzthing.encode().json() [(tel:mob:telem=$n2 :data=$foo)]
+                  -tel:mob:telem=$valu'''
             nodes = await core.nodes(q, opts={'vars': {'valu': valu, 'n2': n2}})
             self.len(1, nodes)
             node2 = nodes[0]
@@ -1720,7 +1720,7 @@ class StormTypesTest(s_test.SynTest):
             q = '''
                 $set = $lib.set()
                 inet:ipv4 $set.add(:asn)
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
@@ -1729,7 +1729,7 @@ class StormTypesTest(s_test.SynTest):
             q = '''
                 $set = $lib.set()
                 inet:ipv4 $set.adds((:asn,:asn))
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
@@ -1739,7 +1739,7 @@ class StormTypesTest(s_test.SynTest):
                 $set = $lib.set()
                 inet:ipv4 $set.adds((:asn,:asn))
                 { +:asn=20 $set.rem(:asn) }
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
@@ -1749,7 +1749,7 @@ class StormTypesTest(s_test.SynTest):
                 $set = $lib.set()
                 inet:ipv4 $set.add(:asn)
                 $set.rems((:asn,:asn))
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
@@ -2151,7 +2151,7 @@ class StormTypesTest(s_test.SynTest):
             q = '''
                 inet:fqdn=vertex.link -> inet:dns:a -> inet:ipv4
                 $idens = $path.idens()
-                [ graph:node="*" ] +graph:node [ :data=$idens ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$idens ]
             '''
 
             idens = (
@@ -2699,6 +2699,17 @@ class StormTypesTest(s_test.SynTest):
             await core.addUserRule(user, (True, ('storm', 'lib', 'telepath', 'open', 'cell')))
             self.len(2, await core.callStorm('return ( $lib.telepath.open($url).ipv4s() )', opts=opts))
 
+            # SynErr exceptions are allowed through. They can be caught by storm.
+            with self.raises(s_exc.BadUrl):
+                await core.callStorm('$prox=$lib.telepath.open("weeeeeeeeeeeeee")')
+
+            # Python exceptions are caught and raised as StormRuntimeError exceptions.
+            with self.raises(s_exc.StormRuntimeError) as cm:
+                await core.callStorm('$prox=$lib.telepath.open("tcp://0.0.0.0:60000")')
+            emsg = cm.exception.get('mesg')
+            self.isin('Failed to connect to Telepath service: "tcp://0.0.0.0:60000" error:', emsg)
+            self.isin('Connect call failed', emsg)
+
     async def test_storm_lib_queue(self):
 
         async with self.getTestCore() as core:
@@ -4474,7 +4485,7 @@ class StormTypesTest(s_test.SynTest):
 
         async with self.getTestCore() as core:
 
-            cdef = await core.callStorm('return($lib.cron.add(query="{[graph:node=*]}", hourly=30).pack())')
+            cdef = await core.callStorm('return($lib.cron.add(query="{[tel:mob:telem=*]}", hourly=30).pack())')
             self.eq('', cdef.get('doc'))
             self.eq('', cdef.get('name'))
 
@@ -4490,7 +4501,7 @@ class StormTypesTest(s_test.SynTest):
             with self.raises(s_exc.BadArg):
                 await core.callStorm('return($lib.cron.get($iden).set(hehe, haha))', opts=opts)
 
-            mesgs = await core.stormlist('cron.add --hour +1 {[graph:node=*]} --name myname --doc mydoc')
+            mesgs = await core.stormlist('cron.add --hour +1 {[tel:mob:telem=*]} --name myname --doc mydoc')
             for mesg in mesgs:
                 if mesg[0] == 'print':
                     iden0 = mesg[1]['mesg'].split(' ')[-1]
@@ -4595,7 +4606,7 @@ class StormTypesTest(s_test.SynTest):
                 nextlayroffs = await layr.getEditOffs() + 1
 
                 # Start simple: add a cron job that creates a node every minute
-                q = "cron.add --minute +1 {[graph:node='*' :type=m1]}"
+                q = "cron.add --minute +1 {[meta:note='*' :type=m1]}"
                 mesgs = await core.stormlist(q)
                 self.stormIsInPrint('Created cron job', mesgs)
                 for mesg in mesgs:
@@ -4637,24 +4648,24 @@ class StormTypesTest(s_test.SynTest):
 
                 # Make sure it ran
                 await layr.waitEditOffs(nextlayroffs, timeout=5)
-                self.eq(1, await prox.count('graph:node:type=m1'))
+                self.eq(1, await prox.count('meta:note:type=m1'))
 
-                q = "cron.mod $guid { [graph:node='*' :type=m2] }"
+                q = "cron.mod $guid { [meta:note='*' :type=m2] }"
                 mesgs = await core.stormlist(q, opts={'vars': {'guid': guid[:6]}})
                 self.stormIsInPrint(f'Modified cron job: {guid}', mesgs)
 
-                q = "cron.mod xxx { [graph:node='*' :type=m2] }"
+                q = "cron.mod xxx { [meta:note='*' :type=m2] }"
                 mesgs = await core.stormlist(q)
                 self.stormIsInErr('does not match', mesgs)
 
                 # Make sure the old one didn't run and the new query ran
                 unixtime += 60
                 await asyncio.sleep(0)
-                self.eq(1, await prox.count('graph:node:type=m1'))
+                self.eq(1, await prox.count('meta:note:type=m1'))
                 # UNG WTF
                 await asyncio.sleep(0)
                 await asyncio.sleep(0)
-                self.eq(1, await prox.count('graph:node:type=m2'))
+                self.eq(1, await prox.count('meta:note:type=m2'))
 
                 # Delete the job
                 q = f"cron.del {guid}"
@@ -4667,8 +4678,8 @@ class StormTypesTest(s_test.SynTest):
 
                 # Make sure deleted job didn't run
                 unixtime += 60
-                self.eq(1, await prox.count('graph:node:type=m1'))
-                self.eq(1, await prox.count('graph:node:type=m2'))
+                self.eq(1, await prox.count('meta:note:type=m1'))
+                self.eq(1, await prox.count('meta:note:type=m2'))
 
                 # Test fixed minute, i.e. every hour at 17 past
                 unixtime = datetime.datetime(year=2018, month=12, day=5, hour=7, minute=10,

synapse/tests/test_lib_trigger.py

@@ -369,7 +369,7 @@ class TrigTest(s_t_utils.SynTest):
 
             # coverage for migration mode
             await core.nodes('[inet:fqdn=vertex.link +#foo]') # for additional migration mode trigger tests below
-            with core.enterMigrationMode():
+            async with core.enterMigrationMode():
                 await core.nodes('inet:fqdn=vertex.link [ +#bar -#foo ]')
 
     async def test_trigger_delete(self):
@@ -774,7 +774,7 @@ class TrigTest(s_t_utils.SynTest):
             await core.nodes('trigger.add edge:add --verb r* --n2form test:int --query { [ +#n2 ] }')
             await core.nodes('trigger.add edge:add --verb no** --form test:int --n2form test:str --query { [ +#both ] }')
 
-            with core.enterMigrationMode():
+            async with core.enterMigrationMode():
                 nodes = await core.nodes('[test:int=123 +(foo:beep:boop)> { [test:str=neato] }]')
                 self.len(1, nodes)
                 self.notin('foo', nodes[0].tags)
@@ -834,7 +834,7 @@ class TrigTest(s_t_utils.SynTest):
             await core.nodes('trigger.add edge:del --verb r* --n2form test:int --query { [ +#del.two ] }')
             await core.nodes('trigger.add edge:del --verb no** --form test:int --n2form test:str --query { [ +#del.all ] }')
 
-            with core.enterMigrationMode():
+            async with core.enterMigrationMode():
                 nodes = await core.nodes('test:int=123 | [ -(foo:beep:boop)> { test:str=neato } ]')
                 self.len(1, nodes)
                 self.notin('del.none', nodes[0].tags)

synapse/tests/test_lib_view.py

@@ -11,18 +11,21 @@ from synapse.tests.utils import alist
 
 class ViewTest(s_t_utils.SynTest):
 
-    async def test_view_nomerge(self):
+    async def test_view_protected(self):
         async with self.getTestCore() as core:
             view = await core.callStorm('return($lib.view.get().fork().iden)')
             opts = {'view': view}
 
             await core.nodes('[ ou:org=* ]', opts=opts)
-            await core.nodes('$lib.view.get().set(nomerge, $lib.true)', opts=opts)
+            await core.nodes('$lib.view.get().set(protected, $lib.true)', opts=opts)
 
             with self.raises(s_exc.CantMergeView):
                 await core.nodes('$lib.view.get().merge()', opts=opts)
 
-            await core.nodes('$lib.view.get().set(nomerge, $lib.false)', opts=opts)
+            with self.raises(s_exc.CantDelView):
+                await core.nodes('$lib.view.del($lib.view.get().iden)', opts=opts)
+
+            await core.nodes('$lib.view.get().set(protected, $lib.false)', opts=opts)
             await core.nodes('$lib.view.get().merge()', opts=opts)
 
             self.len(1, await core.nodes('ou:org'))
@@ -31,6 +34,50 @@ class ViewTest(s_t_utils.SynTest):
             with self.raises(s_exc.BadOptValu):
                 await core.view.setViewInfo('hehe', 10)
 
+        async with self.getTestCore() as core:
+            # Delete this block when nomerge is removed
+            view = await core.callStorm('return($lib.view.get().fork().iden)')
+            opts = {'view': view}
+
+            # Setting/getting nomerge should be redirected to protected
+            getnomerge = 'return($lib.view.get().get(nomerge))'
+            setnomerge = '$lib.view.get().set(nomerge, $valu)'
+
+            getprotected = 'return($lib.view.get().get(protected))'
+            setprotected = '$lib.view.get().set(protected, $valu)'
+
+            nomerge = await core.callStorm(getnomerge, opts=opts)
+            protected = await core.callStorm(getprotected, opts=opts)
+            self.false(nomerge)
+            self.false(protected)
+
+            opts['vars'] = {'valu': True}
+            await core.callStorm(setnomerge, opts=opts)
+
+            nomerge = await core.callStorm(getnomerge, opts=opts)
+            protected = await core.callStorm(getprotected, opts=opts)
+            self.true(nomerge)
+            self.true(protected)
+
+            opts['vars'] = {'valu': False}
+            await core.callStorm(setprotected, opts=opts)
+
+            nomerge = await core.callStorm(getnomerge, opts=opts)
+            protected = await core.callStorm(getprotected, opts=opts)
+            self.false(nomerge)
+            self.false(protected)
+
+    async def test_view_nomerge_migration(self):
+        async with self.getRegrCore('cortex-defaults-v2') as core:
+            view = core.getView('0df16dd693c74109da0d58ab87ba768a')
+            self.none(view.info.get('nomerge'))
+            self.true(view.info.get('protected'))
+
+            with self.raises(s_exc.CantMergeView):
+                await core.callStorm('return($lib.view.get(0df16dd693c74109da0d58ab87ba768a).merge())')
+            with self.raises(s_exc.CantDelView):
+                await core.callStorm('return($lib.view.del(0df16dd693c74109da0d58ab87ba768a))')
+
     async def test_view_set_parent(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_model_files.py

@@ -247,6 +247,9 @@ class FileTest(s_t_utils.SynTest):
             self.raises(s_exc.BadTypeValu, base.norm, 'foo/bar.exe')
             self.raises(s_exc.BadTypeValu, base.norm, '/haha')
 
+            norm, info = path.norm('../.././..')
+            self.eq(norm, '')
+
             norm, info = path.norm('c:\\Windows\\System32\\calc.exe')
 
             self.eq(norm, 'c:/windows/system32/calc.exe')

synapse/tests/test_model_planning.py

@@ -0,0 +1,126 @@
+import synapse.exc as s_exc
+import synapse.common as s_common
+import synapse.tests.utils as s_t_utils
+
+class PlanModelTest(s_t_utils.SynTest):
+
+    async def test_model_planning(self):
+
+        async with self.getTestCore() as core:
+            nodes = await core.nodes('''
+                [ plan:system=*
+                    :name="Woot CNO Planner"
+                    :author={[ ps:contact=* :name=visi ]}
+                    :created=20240202
+                    :updated=20240203
+                    :version=1.0.0
+                    :url=https://vertex.link
+                ]
+            ''')
+            self.len(1, nodes)
+            self.eq('woot cno planner', nodes[0].get('name'))
+            self.eq(1706832000000, nodes[0].get('created'))
+            self.eq(1706918400000, nodes[0].get('updated'))
+            self.eq(1099511627776, nodes[0].get('version'))
+            self.eq('https://vertex.link', nodes[0].get('url'))
+
+            self.len(1, await core.nodes('plan:system :author -> ps:contact +:name=visi'))
+
+            nodes = await core.nodes('''
+                [ plan:phase=*
+                    :system={ plan:system:name="Woot CNO Planner"}
+                    :title="Recon"
+                    :summary="Do some recon."
+                    :index=17
+                    :url=https://vertex.link/recon
+                ]
+            ''')
+
+            self.len(1, nodes)
+            self.eq('Recon', nodes[0].get('title'))
+            self.eq('Do some recon.', nodes[0].get('summary'))
+            self.eq(17, nodes[0].get('index'))
+            self.eq('https://vertex.link/recon', nodes[0].get('url'))
+
+            self.len(1, await core.nodes('plan:phase :system -> plan:system +:name="Woot CNO Planner"'))
+
+            nodes = await core.nodes('''
+                [ plan:procedure=*
+                    :system={ plan:system:name="Woot CNO Planner"}
+                    :title="Pwn Some Boxes"
+                    :summary="Yoink."
+                    :author={ ps:contact:name=visi }
+                    :created=20240202
+                    :updated=20240203
+                    :version=1.0.0
+                    :type=cno.offense
+                    :system={ plan:system:name="Woot CNO Planner" }
+                ]
+
+                $guid = $node.value()
+
+                [
+                    :inputs={[ plan:procedure:variable=*
+                        :name=network
+                        :type=cidr
+                        :default=127.0.0.0/24
+                        :procedure=$guid
+                    ]}
+
+                    :firststep={[ plan:procedure:step=*
+                        :title="Are there vulnerable services?"
+                        :summary="Scan the target network and identify available services."
+                        :procedure=$guid
+                        :phase={ plan:phase:title=Recon }
+                        :outputs={[ plan:procedure:variable=* :name=services ]}
+                        :techniques={[ ou:technique=* :name=netscan ]}
+
+                        :links={[ plan:procedure:link=*
+                            :condition=(true)
+                            :procedure=$guid
+                            :next={[ plan:procedure:step=*
+                                :title="Exploit Services"
+                                :summary="Gank that stuff."
+                                :procedure=$guid
+                                :outputs={[ plan:procedure:variable=* :name=shellz ]}
+                            ]}
+
+                        ]}
+                    ]}
+                ]
+            ''')
+
+            self.len(1, nodes)
+            self.eq('Pwn Some Boxes', nodes[0].get('title'))
+            self.eq('Yoink.', nodes[0].get('summary'))
+            self.nn(nodes[0].get('author'))
+            self.eq(1706832000000, nodes[0].get('created'))
+            self.eq(1706918400000, nodes[0].get('updated'))
+            self.eq(1099511627776, nodes[0].get('version'))
+
+            self.len(1, await core.nodes('plan:procedure :type -> plan:procedure:type:taxonomy'))
+            self.len(1, await core.nodes('plan:procedure :system -> plan:system +:name="Woot CNO Planner"'))
+            self.len(1, await core.nodes('plan:procedure :firststep -> plan:procedure:step -> plan:procedure:link'))
+
+            nodes = await core.nodes('plan:procedure :inputs -> plan:procedure:variable')
+            self.len(1, nodes)
+            self.eq('network', nodes[0].get('name'))
+            self.eq('cidr', nodes[0].get('type'))
+            self.eq('127.0.0.0/24', nodes[0].get('default'))
+            self.nn(nodes[0].get('procedure'))
+
+            nodes = await core.nodes('plan:procedure :firststep -> plan:procedure:step')
+            self.len(1, nodes)
+            self.eq('Are there vulnerable services?', nodes[0].get('title'))
+            self.eq('Scan the target network and identify available services.', nodes[0].get('summary'))
+            self.nn(nodes[0].get('procedure'))
+
+            self.len(1, await core.nodes('plan:procedure :firststep -> plan:procedure:step -> plan:phase'))
+            self.len(1, await core.nodes('plan:procedure :firststep -> plan:procedure:step :techniques -> ou:technique'))
+            self.len(1, await core.nodes('plan:procedure :firststep -> plan:procedure:step :outputs -> plan:procedure:variable'))
+
+            nodes = await core.nodes('plan:procedure :firststep -> plan:procedure:step -> plan:procedure:link')
+            self.len(1, nodes)
+            self.eq(True, nodes[0].get('condition'))
+            self.nn(nodes[0].get('next'))
+            self.nn(nodes[0].get('procedure'))

synapse/tests/test_tools_genpkg.py

@@ -254,7 +254,33 @@ class TestStormPkgTest(s_test.StormPkgTest):
     assetdir = s_common.genpath(dirname, 'files', 'stormpkg', 'dotstorm', 'testassets')
     pkgprotos = (s_common.genpath(dirname, 'files', 'stormpkg', 'dotstorm', 'dotstorm.yaml'),)
 
+    async def initTestCore(self, core):
+        await core.callStorm('$lib.globals.set(inittestcore, frob)')
+
     async def test_stormpkg_base(self):
         async with self.getTestCore() as core:
             msgs = await core.stormlist('dotstorm.bar')
             self.stormHasNoWarnErr(msgs)
+            self.eq('frob', await core.callStorm('return($lib.globals.get(inittestcore))'))
+
+    async def stormpkg_preppkghook(self, core):
+        await core.callStorm('$lib.globals.set(stormpkg_preppkghook, boundmethod)')
+
+    async def test_stormpkg_preppkghook(self):
+
+        # inline example
+        async def hook(core):
+            await core.callStorm('$lib.globals.set(inlinehook, haha)')
+
+        async with self.getTestCore(prepkghook=hook) as core:
+            msgs = await core.stormlist('dotstorm.bar')
+            self.stormHasNoWarnErr(msgs)
+            self.eq('haha', await core.callStorm('return($lib.globals.get(inlinehook))'))
+            self.eq('frob', await core.callStorm('return($lib.globals.get(inittestcore))'))
+
+        # bound method example
+        async with self.getTestCore(prepkghook=self.stormpkg_preppkghook) as core:
+            msgs = await core.stormlist('dotstorm.bar')
+            self.stormHasNoWarnErr(msgs)
+            self.eq('boundmethod', await core.callStorm('return($lib.globals.get(stormpkg_preppkghook))'))
+            self.eq('frob', await core.callStorm('return($lib.globals.get(inittestcore))'))

synapse/tests/test_tools_hiveload.py

@@ -48,6 +48,7 @@ class HiveLoadTest(s_test.SynTest):
                 with mock.patch('synapse.telepath.Proxy._getSynVers', _getOldSynVers):
                     outp = self.getTestOutp()
                     retn = await s_hiveload.main(argv, outp=outp)
+                    outp.expect('WARNING: "synapse.tools.hive.load" is deprecated in 2.167.0 and will be removed in 3.0.0')
                     outp.expect('Hive version 0.0.0 is outside of the hive.load supported range')
                     self.eq(1, retn)
 

synapse/tests/test_tools_hivesave.py

@@ -28,6 +28,7 @@ class HiveSaveTest(s_test.SynTest):
                 with mock.patch('synapse.telepath.Proxy._getSynVers', _getOldSynVers):
                     outp = self.getTestOutp()
                     retn = await s_hivesave.main(argv, outp=outp)
+                    outp.expect('WARNING: "synapse.tools.hive.save" is deprecated in 2.167.0 and will be removed in 3.0.0')
                     outp.expect('Hive version 0.0.0 is outside of the hive.save supported range')
                     self.eq(1, retn)