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

synapse/cortex.py

@@ -881,7 +881,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         self.maxnodes = self.conf.get('max:nodes')
         self.nodecount = 0
+
         self.migration = False
+        self._migration_lock = asyncio.Lock()
 
         self.stormmods = {}     # name: mdef
         self.stormpkgs = {}     # name: pkgdef
@@ -1480,12 +1482,21 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         await self.stormdmons.start()
         await self.agenda.clearRunningStatus()
 
-        for view in self.views.values():
-            await view.initTrigTask()
-            await view.initMergeTask()
+        async def _runMigrations():
+            # Run migrations when this cortex becomes active. This is to prevent
+            # migrations getting skipped in a zero-downtime upgrade path
+            # (upgrade mirror, promote mirror).
+            await self._checkLayerModels()
 
-        for layer in self.layers.values():
-            await layer.initLayerActive()
+            # Once migrations are complete, start the view and layer tasks.
+            for view in self.views.values():
+                await view.initTrigTask()
+                await view.initMergeTask()
+
+            for layer in self.layers.values():
+                await layer.initLayerActive()
+
+        self.runActiveTask(_runMigrations())
 
         await self.initStormPool()
 
@@ -3597,6 +3608,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                         break
 
                     yield ioff, layr.iden, SYNC_NODEEDITS, item, meta
+                    await asyncio.sleep(0)
 
             if layr.isdeleted:
                 yield layr.deloffs, layr.iden, SYNC_LAYR_DEL, (), {}
@@ -4363,7 +4375,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         return ret
 
     async def _checkLayerModels(self):
-        with self.enterMigrationMode():
+        async with self.enterMigrationMode():
             mrev = s_modelrev.ModelRev(self)
             await mrev.revCoreLayers()
 
@@ -6098,11 +6110,12 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         appt = await self.agenda.get(iden)
         await appt.edits(edits)
 
-    @contextlib.contextmanager
-    def enterMigrationMode(self):
-        self.migration = True
-        yield
-        self.migration = False
+    @contextlib.asynccontextmanager
+    async def enterMigrationMode(self):
+        async with self._migration_lock:
+            self.migration = True
+            yield
+            self.migration = False
 
     async def iterFormRows(self, layriden, form, stortype=None, startvalu=None):
         '''

synapse/lib/aha.py

@@ -807,7 +807,8 @@ class AhaCell(s_cell.Cell):
     async def _setAhaSvcDown(self, name, linkiden, network=None):
         svcname, svcnetw, svcfull = self._nameAndNetwork(name, network)
         path = ('aha', 'services', svcnetw, svcname)
-        await self.jsonstor.cmpDelPathObjProp(path, 'svcinfo/online', linkiden)
+        if await self.jsonstor.cmpDelPathObjProp(path, 'svcinfo/online', linkiden):
+            await self.jsonstor.setPathObjProp(path, 'svcinfo/ready', False)
 
         # Check if we have any links which may need to be removed
         current_sessions = {s_common.guid(iden): sess for iden, sess in self.dmon.sessions.items()}

synapse/lib/layer.py

@@ -165,11 +165,13 @@ class LayerApi(s_cell.CellApi):
         await self._reqUserAllowed(self.liftperm)
         async for item in self.layr.syncNodeEdits(offs, wait=wait):
             yield item
+            await asyncio.sleep(0)
 
     async def syncNodeEdits2(self, offs, wait=True):
         await self._reqUserAllowed(self.liftperm)
         async for item in self.layr.syncNodeEdits2(offs, wait=wait):
             yield item
+            await asyncio.sleep(0)
 
     async def getEditIndx(self):
         '''

synapse/lib/modelrev.py

@@ -768,6 +768,12 @@ class ModelRev:
         Returns:
             None
         '''
+        if opts is None:
+            opts = {}
+
+        # Migrations only run on leaders
+        opts['mirror'] = False
+
         async def _runStorm():
             async for mesgtype, mesginfo in self.core.storm(text, opts=opts):
                 if mesgtype == 'print':

synapse/lib/modules.py

@@ -28,4 +28,5 @@ coremods = (
     'synapse.models.biz.BizModule',
     'synapse.models.belief.BeliefModule',
     'synapse.models.science.ScienceModule',
+    'synapse.models.planning.PlanModule',
 )

synapse/lib/stormlib/aha.py

@@ -190,7 +190,7 @@ class AhaPool(s_stormtypes.StormType):
                        'desc': 'The name of the AHA service to add. It is easiest to use the relative name of a service, ending with "...".', },
                   ),
                   'returns': {'type': 'null', }}},
-        {'name': 'add', 'desc': '''Remove a service from the AHA pool.
+        {'name': 'del', 'desc': '''Remove a service from the AHA pool.
 
         Examples:
             Remove a service from a pool with its relative name::
@@ -203,7 +203,7 @@ class AhaPool(s_stormtypes.StormType):
                       {'name': 'svcname', 'type': 'str',
                        'desc': 'The name of the AHA service to remove. It is easiest to use the relative name of a service, ending with "...".', },
                   ),
-                  'returns': {'type': 'null', }}},
+                  'returns': {'type': ['null', 'str'], 'desc': 'The service removed from the pool or null if a service was not removed.'}}},
     )
     _storm_typename = 'aha:pool'
 
@@ -243,9 +243,20 @@ class AhaPool(s_stormtypes.StormType):
         proxy = await self.runt.snap.core.reqAhaProxy()
 
         poolname = self.poolinfo.get('name')
-        await proxy.delAhaPoolSvc(poolname, svcname)
+        newinfo = await proxy.delAhaPoolSvc(poolname, svcname)
+
+        tname = svcname
+        if tname.endswith('...'):
+            tname = tname[:-2]
+        deleted_service = None
+        deleted_services = [svc for svc in self.poolinfo.get('services').keys()
+                            if svc not in newinfo.get('services') and svc.startswith(tname)]
+        if deleted_services:
+            deleted_service = deleted_services[0]
+
+        self.poolinfo = newinfo
 
-        self.poolinfo = await proxy.getAhaPool(poolname)
+        return deleted_service
 
 stormcmds = (
     {
@@ -319,8 +330,12 @@ stormcmds = (
             $pool = $lib.aha.pool.get($cmdopts.poolname)
             if (not $pool) { $lib.exit(`No AHA service pool named: {$cmdopts.poolname}`) }
 
-            $pool.del($cmdopts.svcname)
-            $lib.print(`AHA service ({$cmdopts.svcname}) removed from service pool ({$pool.name})`)
+            $svc = $pool.del($cmdopts.svcname)
+            if $svc {
+                $lib.print(`AHA service ({$svc}) removed from service pool ({$pool.name})`)
+            } else {
+                $lib.print(`Did not remove ({$cmdopts.svcname}) from the service pool.`)
+            }
         ''',
     },
     {

synapse/lib/stormlib/easyperm.py

@@ -51,6 +51,14 @@ class LibEasyPerm(s_stormtypes.Lib):
                        'desc': 'Optional error message to present if user does not have required permission level.'},
                   ),
                   'returns': {'type': 'null'}}},
+        {'name': 'level.admin', 'desc': 'Constant for admin permission.',
+         'type': 'int', },
+        {'name': 'level.deny', 'desc': 'Constant for deny permission.',
+         'type': 'int', },
+        {'name': 'level.edit', 'desc': 'Constant for edit permission.',
+         'type': 'int', },
+        {'name': 'level.read', 'desc': 'Constant for read permission.',
+         'type': 'int', },
     )
     _storm_lib_path = ('auth', 'easyperm')
 

synapse/lib/stormtypes.py

@@ -1707,6 +1707,13 @@ class LibDict(Lib):
     A Storm Library for interacting with dictionaries.
     '''
     _storm_locals = (
+        {'name': 'has', 'desc': 'Check a dictionary has a specific key.',
+         'type': {'type': 'function', '_funcname': '_has',
+                  'args': (
+                      {'name': 'valu', 'type': 'dict', 'desc': 'The dictionary being checked.'},
+                      {'name': 'name', 'type': 'str', 'desc': 'The key name to check.'},
+                  ),
+                  'returns': {'type': 'boolean', 'desc': 'True if the key is present, false if the key is not present.'}}},
         {'name': 'keys', 'desc': 'Retrieve a list of keys in the specified dictionary.',
          'type': {'type': 'function', '_funcname': '_keys',
                   'args': (

synapse/lib/version.py

@@ -223,6 +223,6 @@ def reqVersion(valu, reqver,
 ##############################################################################
 # The following are touched during the release process by bumpversion.
 # Do not modify these directly.
-version = (2, 167, 0)
+version = (2, 168, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '7b2983533ea27d69e547ac54d9aab953630137c2'
+commit = 'd07eb2560a6e5e025ce9c20efaafe5571a55856c'

synapse/lib/view.py

@@ -55,6 +55,7 @@ class ViewApi(s_cell.CellApi):
         layr = self.view.layers[0]
         async for item in layr.syncNodeEdits2(offs, wait=wait):
             yield item
+            await asyncio.sleep(0)
 
     @s_cell.adminapi()
     async def saveNodeEdits(self, edits, meta):

synapse/models/planning.py

@@ -0,0 +1,161 @@
+import synapse.lib.module as s_module
+
+class PlanModule(s_module.CoreModule):
+
+    def getModelDefs(self):
+        return (('plan', {
+            'types': (
+                ('plan:system', ('guid', {}), {
+                    'doc': 'A planning or behavioral analysis system that defines phases and procedures.'}),
+
+                ('plan:phase', ('guid', {}), {
+                    'doc': 'A phase within a planning system which may be used to group steps within a procedure.'}),
+
+                ('plan:procedure', ('guid', {}), {
+                    'doc': 'A procedure consisting of steps.'}),
+
+                ('plan:procedure:type:taxonomy', ('taxonomy', {}), {
+                    'interfaces': ('meta:taxonomy',),
+                    'doc': 'A taxonomy of procedure types.'}),
+
+                ('plan:procedure:variable', ('guid', {}), {
+                    'doc': 'A variable used by a procedure.'}),
+
+                ('plan:procedure:step', ('guid', {}), {
+                    'doc': 'A step within a procedure.'}),
+
+                ('plan:procedure:link', ('guid', {}), {
+                    'doc': 'A link between steps in a procedure.'}),
+            ),
+
+            'forms': (
+                ('plan:system', {}, (
+
+                    ('name', ('str', {'lower': True, 'onespace': True}), {
+                        'ex': 'mitre att&ck flow',
+                        'doc': 'The name of the planning system.'}),
+
+                    ('summary', ('str', {}), {
+                        'disp': {'hint': 'text'},
+                        'doc': 'A summary of the purpose and use case for the planning system.'}),
+
+                    ('author', ('ps:contact', {}), {
+                        'doc': 'The contact of the person or organization which authored the system.'}),
+
+                    ('created', ('time', {}), {
+                        'doc': 'The time the planning system was first created.'}),
+
+                    ('updated', ('time', {}), {
+                        'doc': 'The time the planning system was last updated.'}),
+
+                    ('version', ('it:semver', {}), {
+                        'doc': 'The version of the planning system.'}),
+
+                    ('url', ('inet:url', {}), {
+                        'doc': 'The primary URL which documents the planning system.'}),
+                )),
+                ('plan:phase', {}, (
+                    ('title', ('str', {}), {
+                        'ex': 'Reconnaissance Phase',
+                        'doc': 'The title of the phase.'}),
+
+                    ('summary', ('str', {}), {
+                        'disp': {'hint': 'text'},
+                        'doc': 'A summary of the definition of the phase.'}),
+
+                    ('index', ('int', {}), {
+                        'doc': 'The index of this phase within the phases of the system.'}),
+
+                    ('url', ('inet:url', {}), {
+                        'doc': 'A URL which links to the full documentation about the phase.'}),
+
+                    ('system', ('plan:system', {}), {
+                        'doc': 'The planning system which defines this phase.'}),
+                )),
+                ('plan:procedure:type:taxonomy', {}, ()),
+                ('plan:procedure', {}, (
+
+                    ('title', ('str', {}), {
+                        'ex': 'Network Reconnaissance Procedure',
+                        'doc': 'The name of the procedure.'}),
+
+                    ('summary', ('str', {}), {
+                        'disp': {'hint': 'text'},
+                        'doc': 'A summary of the purpose and use cases for the procedure.'}),
+
+                    ('author', ('ps:contact', {}), {
+                        'doc': 'The contact of the person or organization which authored the procedure.'}),
+
+                    ('created', ('time', {}), {
+                        'doc': 'The time the procedure was created.'}),
+
+                    ('updated', ('time', {}), {
+                        'doc': 'The time the procedure was last updated.'}),
+
+                    ('version', ('it:semver', {}), {
+                        'doc': 'The version of the procedure.'}),
+
+                    ('system', ('plan:system', {}), {
+                        'doc': 'The planning system which defines this procedure.'}),
+
+                    ('type', ('plan:procedure:type:taxonomy', {}), {
+                        'doc': 'A type classification for the procedure.'}),
+
+                    ('inputs', ('array', {'type': 'plan:procedure:variable', 'uniq': True, 'sorted': True}), {
+                        'doc': 'An array of inputs required to execute the procedure.'}),
+
+                    ('firststep', ('plan:procedure:step', {}), {
+                        'doc': 'The first step in the procedure.'}),
+                )),
+                ('plan:procedure:variable', {}, (
+
+                    ('name', ('str', {}), {
+                        'doc': 'The name of the variable.'}),
+
+                    ('type', ('str', {}), {
+                        'doc': 'The type for the input. Types are specific to the planning system.'}),
+
+                    ('default', ('data', {}), {
+                        'doc': 'The optional default value if the procedure is invoked without the input.'}),
+
+                    ('procedure', ('plan:procedure', {}), {
+                        'doc': 'The procedure which defines the variable.'}),
+                )),
+                ('plan:procedure:step', {}, (
+
+                    ('phase', ('plan:phase', {}), {
+                        'doc': 'The phase that the step belongs within.'}),
+
+                    ('procedure', ('plan:procedure', {}), {
+                        'doc': 'The procedure which defines the step.'}),
+
+                    ('title', ('str', {}), {
+                        'ex': 'Scan the IPv4 address range for open ports',
+                        'doc': 'The title of the step.'}),
+
+                    ('summary', ('str', {}), {
+                        'doc': 'A summary of the tasks executed within the step.'}),
+
+                    ('outputs', ('array', {'type': 'plan:procedure:variable', 'uniq': True, 'sorted': True}), {
+                        'doc': 'An array of variables defined in this step.'}),
+
+                    ('techniques', ('array', {'type': 'ou:technique', 'uniq': True, 'sorted': True}), {
+                        'doc': 'An array of techniques used when executing this step.'}),
+
+                    ('links', ('array', {'type': 'plan:procedure:link', 'uniq': True}), {
+                        'doc': 'An array of links to subsequent steps.'}),
+
+                )),
+                ('plan:procedure:link', {}, (
+
+                    ('condition', ('bool', {}), {
+                        'doc': 'Set to true/false if this link is conditional based on a decision step.'}),
+
+                    ('next', ('plan:procedure:step', {}), {
+                        'doc': 'The next step in the plan.'}),
+
+                    ('procedure', ('plan:procedure', {}), {
+                        'doc': 'The procedure which defines the link.'}),
+                )),
+            ),
+        }),)

synapse/tests/test_cortex.py

@@ -7958,7 +7958,7 @@ class CortexBasicTest(s_t_utils.SynTest):
                     waiter = core01.stormpool.waiter(1, 'svc:del')
                     msgs = await core01.stormlist('aha.pool.svc.del pool00... 01.core...', opts={'mirror': False})
                     self.stormHasNoWarnErr(msgs)
-                    self.stormIsInPrint('AHA service (01.core...) removed from service pool (pool00.loop.vertex.link)', msgs)
+                    self.stormIsInPrint('AHA service (01.core.loop.vertex.link) removed from service pool (pool00.loop.vertex.link)', msgs)
 
                     # TODO: this wait should not return None
                     await waiter.wait(timeout=3)

synapse/tests/test_lib_aha.py

@@ -1126,7 +1126,7 @@ class AhaTest(s_test.SynTest):
                     ready = svcinfo.get('ready')
                     online = svcinfo.get('online')
                     self.none(online)
-                    self.true(ready)  # Ready is not cleared upon restart
+                    self.false(ready)  # Ready is cleared upon restart / setting service down.
 
                     n = 3
                     if len(stack._exit_callbacks) > 0:
@@ -1245,7 +1245,12 @@ class AhaTest(s_test.SynTest):
 
                         msgs = await core00.stormlist('aha.pool.svc.del pool00... 00...')
                         self.stormHasNoWarnErr(msgs)
-                        self.stormIsInPrint('AHA service (00...) removed from service pool (pool00.loop.vertex.link)', msgs)
+                        self.stormIsInPrint('AHA service (00.loop.vertex.link) removed from service pool (pool00.loop.vertex.link)',
+                                            msgs)
+
+                        msgs = await core00.stormlist('aha.pool.svc.del pool00... 00...')
+                        self.stormHasNoWarnErr(msgs)
+                        self.stormIsInPrint('Did not remove (00...) from the service pool.', msgs)
 
                         await waiter.wait(timeout=3)
                         run00 = await (await pool.proxy(timeout=3)).getCellRunId()

synapse/tests/test_lib_stormlib_aha.py

@@ -139,7 +139,7 @@ Member:     00.cell.loop.vertex.link'''
                 self.len(nevents, await waiter.wait(timeout=12))
 
                 msgs = await core00.stormlist('aha.svc.list')
-                self.stormIsInPrint('01.cell.loop.vertex.link                      false  false  true', msgs)
+                self.stormIsInPrint('01.cell.loop.vertex.link                      false  false  false', msgs)
 
                 # Fake a record
                 await aha.addAhaSvc('00.newp', info={'urlinfo': {'scheme': 'tcp', 'host': '0.0.0.0', 'port': '3030'}},

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_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-2.167.0.dist-info → synapse-2.168.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synapse
-Version: 2.167.0
+Version: 2.168.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0

{synapse-2.167.0.dist-info → synapse-2.168.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ synapse/__init__.py,sha256=R2kOXlF5j-8m6G0JkHuN7rXRPg_tHLmbMxr__94mHQk,1145
 synapse/axon.py,sha256=Hbbb1BqyB8xsb7xkaIMyTQJEE01-r5HXebnoAnw-qEY,61120
 synapse/cells.py,sha256=eNvdglfAoTURVhGOLGcgMXCGpfsIX1a02SQnyiklo3E,308
 synapse/common.py,sha256=_-cBBcL88YGAnhVq9WJ5nUKtoq-NytfwbgYzCq02W-Q,35578
-synapse/cortex.py,sha256=EXbtZ1zyhGZOyJuitagEpRovOdVyqnlcKTdULTsrgHo,234557
+synapse/cortex.py,sha256=3IIy5N9By4MKAt6rHDzTaQnFGxd3Y1OrN85or0XTpHg,235141
 synapse/cryotank.py,sha256=kOriVF8LnwYxgyTxQXSepyFRtSu2C6n9t_yImTV7ZNI,11714
 synapse/daemon.py,sha256=tPPggIATq0O0Cw1J2nzL-JW10VIOFcrvP4XqsKQwozc,16776
 synapse/datamodel.py,sha256=o4YktPuoprTwjGly-8217dvHzM-sUxTMCPCwByqJCDI,34070
@@ -84,7 +84,7 @@ synapse/data/jsonschemas/raw.githubusercontent.com/oasis-open/cti-stix2-json-sch
 synapse/data/jsonschemas/raw.githubusercontent.com/oasis-open/cti-stix2-json-schemas/stix2.1/schemas/sros/sighting.json,sha256=f1T3r4CRcJP0743qmAlVCdNvi5ASrOU42PSoiDNlRqc,3575
 synapse/lib/__init__.py,sha256=qLS7nt8-Iot8jnD2Xss_6wZi5lJoyv2rqxF9kkektT0,129
 synapse/lib/agenda.py,sha256=WgISI-baosIrg1i5pB0zPL4IWpEb95Y9bUJXaOUDnQs,32724
-synapse/lib/aha.py,sha256=gsw9voZUlgDooT6JfUQaQKcUIpZ91s8FFz0FXhMd6wQ,42311
+synapse/lib/aha.py,sha256=fT1Assn7j1YQFSr5IYuW1GNH2G19gSXwV7ajNS3mlLY,42392
 synapse/lib/ast.py,sha256=fkZ7P8-1yTam_9RTxyK2ze-GNLEvCSFgb7on_AcFMG4,148961
 synapse/lib/autodoc.py,sha256=CsGaX0tAKGh21YbIvUtvaUnZyqmsx6j-E9QD_vhKSP4,20747
 synapse/lib/base.py,sha256=sTti-XzyQnoAwq0JvbDrjSu0_GqRT_J2eBxfNV8_ZrI,22520
@@ -114,12 +114,12 @@ synapse/lib/ingest.py,sha256=HNW1xs215c_UXVjKaxjipKBmVL4ujrjmarHBRvLPLkE,40
 synapse/lib/interval.py,sha256=PqpEhMGG6LD9mJxEms0oQWC-NB01H6gwsmLSc5LrDFk,1175
 synapse/lib/jsonstor.py,sha256=QQVf7Kl90sI_v97UZZAoa6stizDeMyy0ykR3RsHpmi8,19359
 synapse/lib/jupyter.py,sha256=EGAE1D-zlv1YVSDrTkr4bNMFsXvZuzBfIo5FhId2xSI,16358
-synapse/lib/layer.py,sha256=n1RLwx1g24G9rDEbH3eZg3zk5RVZhb_JAyAjxxwuJTA,144585
+synapse/lib/layer.py,sha256=NYNxt6vYkYZk3h-CeGjk_BYZ0sLKNxSbcqd3YBCJC4E,144655
 synapse/lib/link.py,sha256=YiiAiFe1HTkEBeAtxKjNzWMH6i73Md93sZ5SKxtZylg,9802
 synapse/lib/lmdbslab.py,sha256=JlGmBA5tGfRIQmdqNxdh_HwWnT2JyYBBHpRRlQvG98E,54567
-synapse/lib/modelrev.py,sha256=0i5h2yEVTyEkW3J-6gQxIoBVJNAPA1SQhtUMpNN8iSM,40766
+synapse/lib/modelrev.py,sha256=otBcP_q_bVgjfVLupFrB66u1I2zF0n0EedEzKkUrfDY,40887
 synapse/lib/module.py,sha256=0XLFLzuZVmEqulKmdT0uah0oi1t8_f_ghakhqvoKtKI,4686
-synapse/lib/modules.py,sha256=cjWjYrPYagyx2Oq2tuuzHHeSc7sSvPLUyW6io5P8ErI,1124
+synapse/lib/modules.py,sha256=thFIZuhHP04ukBg4Xcie96VPiJeN19suBHl02SpF6xg,1166
 synapse/lib/msgpack.py,sha256=YXI8bTVIpwJWGIjbK8RXxSd-oVgxrcOHCR1tPnh4bRQ,7018
 synapse/lib/multislabseqn.py,sha256=WxJQm6XNINyGBTUnmSkY4iifxLlR_FZe3geOcT8BxR4,15211
 synapse/lib/nexus.py,sha256=X3qR8_UlEHlY_X_70uu0a3MMJhZhT8bi3xgJClF27Lk,22325
@@ -145,7 +145,7 @@ synapse/lib/storm_format.py,sha256=IySRTGUbCAsIhULY1VS1vxvAbLYUXMezPlPSCRJX4rU,4
 synapse/lib/stormctrl.py,sha256=XvyZ6M0Ew8sXsjGvRTWbXh0MjktZrGi_zQ9kNa7AWTE,285
 synapse/lib/stormhttp.py,sha256=DkpndsFRGsWlDnT5RKknd9a53FVebZGOFVKCqkPcnrQ,26885
 synapse/lib/stormsvc.py,sha256=c8W1-2tC8Cu6IDHjqObBn8qaKH6vc-7GOR5YCOmuENA,6825
-synapse/lib/stormtypes.py,sha256=qjInhOsdmHSoLZGsmRALlZmQ5_GQDraaxi_i7F1zQpc,378273
+synapse/lib/stormtypes.py,sha256=6rJs8cQ3LxYoG1A0zP1QBSDrC2O1KgtdW2MnoA8iCEU,378765
 synapse/lib/stormwhois.py,sha256=efG4s1_UOShY3YD8N2OLEa_ELOnzsfLaMEMfDCJYeLQ,2275
 synapse/lib/structlog.py,sha256=qiuD7TTdwCyYEDF2f-88G2iX54SuB-lJ1pqlYokL1r8,1303
 synapse/lib/task.py,sha256=krDjQvNh0EpAs1PILK8CJJa9DMeM0depI0K8Eimp010,5733
@@ -156,8 +156,8 @@ synapse/lib/time.py,sha256=FKTYwpdvpuAj8p8sSodRjOxoA7Vu67CIbbXz55gtghk,9231
 synapse/lib/trigger.py,sha256=cqKW0e2KmeiPsU3d3vwpo0PLLHUs6ZPVWZyxAxU6gMA,20849
 synapse/lib/types.py,sha256=LXpxw4aNKMA0GLs3uG-RpZE5HcZdejMg1g4XJZ9UIfk,67712
 synapse/lib/urlhelp.py,sha256=j-DvWGi-xH0TcO0NbCuwG7guUuiV8wxIxfMyJOzDygo,2523
-synapse/lib/version.py,sha256=DoypNr5-Lv2sEvLSCHKcG5-StOSp2L7ydQYcT0AmBgg,7162
-synapse/lib/view.py,sha256=5gCiR7tXYkuKgD_8g_M83XC7ndP2qdzHBiBhtriFB_I,55355
+synapse/lib/version.py,sha256=yU__bTyfUKaRC850Fien8PbWr7Gi8-gYz22RHIj35WY,7162
+synapse/lib/view.py,sha256=Xzx0vt_6x4Sr8IjLAU_Zhyl8nXNYnHjMVyBWNNGU_Pk,55390
 synapse/lib/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/lib/crypto/coin.py,sha256=_dhlkzIrHT8BvHdJOWK7PDThz3sK3dDRnWAUqjRpZJc,4910
 synapse/lib/crypto/ecc.py,sha256=e5XM8fsU3YnkT9u1eNROqOK8ccjp5QirIn7FljC_z1s,6522
@@ -171,7 +171,7 @@ synapse/lib/platforms/freebsd.py,sha256=0lJNc9W5a5TWfsz734o30gtF3vS3BH8QXWvy04pz
 synapse/lib/platforms/linux.py,sha256=VBUn_tf7PYGgfBXDBBNfE16QBGWstSkuV2l4LXX0dvQ,8002
 synapse/lib/platforms/windows.py,sha256=YbB73MIoBPvePNYiTYa2xEvpGAotAiEKNl4P--njPPM,2069
 synapse/lib/stormlib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse/lib/stormlib/aha.py,sha256=HQMmlcRH4PpkQJkADXpWSfpPP9JGRKy69koUlb9wS9E,19177
+synapse/lib/stormlib/aha.py,sha256=hK8s80AlikSClTeZCoyUtth2qi1H6ZBdAYnNG_5pFFE,19802
 synapse/lib/stormlib/auth.py,sha256=sMyheJVQGV0Z13qMcvBsgZo6dcb34rgejaqm6z_YJ6g,83421
 synapse/lib/stormlib/backup.py,sha256=-cR7lR9IRib-e0uMRV1oKVfdJJ3PYbowtwtH0i3mOtY,2846
 synapse/lib/stormlib/basex.py,sha256=BHnThzA7xv_wBaoxO3sVjjPGgS7K5PMXyGrFFQzmX2Y,2638
@@ -179,7 +179,7 @@ synapse/lib/stormlib/cache.py,sha256=uC7whmdnqaDAcZLTE1AlFQl18RXM_tYUVjpveCDgtz8
 synapse/lib/stormlib/cell.py,sha256=QqkPnpS7WfC7wDfajFq7b7jmjDBSUz5Dzow1sG8wRMM,12623
 synapse/lib/stormlib/compression.py,sha256=JgF9JVVrBL_FlxYUD98HAXFwbVSr4XtIxto81HpBPQw,6206
 synapse/lib/stormlib/cortex.py,sha256=VHsU_krrUDKoy28xJgvYkRqvZ8QmkZMesCFFpVOqc7c,55040
-synapse/lib/stormlib/easyperm.py,sha256=D_i7ZB20Ow3mLS6-e5GC5qx3pUuWroFOv-dv9m68iMo,5453
+synapse/lib/stormlib/easyperm.py,sha256=W59IyPFPc34pKxS43C9LvyI5la88o7sZP9UBti2yqNs,5851
 synapse/lib/stormlib/ethereum.py,sha256=hsgQD4tQpS7mS9lrbghxZF5gEwop4OeeN2Tf3CfncuY,1219
 synapse/lib/stormlib/gen.py,sha256=2fNXkBPdV1T4Ln7zbIbBeQcUjXLRVsqHF1CWAwxSO-s,27069
 synapse/lib/stormlib/gis.py,sha256=LUsFcPn0g3Y23lMDpKveegT2SwoOSAwkgmifpXpm23c,1629
@@ -238,6 +238,7 @@ synapse/models/material.py,sha256=d-nonZKyJpHc32ebghtkm5tSifwVFN_ctx2kb8N4NqI,32
 synapse/models/media.py,sha256=uIsayKqdDM36eGyrJwz2UqOa_QQ9MpMJ2uHdgGYDLa4,3605
 synapse/models/orgs.py,sha256=QfBvD7NmX51v9k7tmWci7d_PvLRejL96m4nJG9Q3-cY,62484
 synapse/models/person.py,sha256=w6lihRSU_6wW9UOj_dogR1c7BfMAmUPXb3S9_LKk-zI,26847
+synapse/models/planning.py,sha256=kuBjIvU2juZvOYJ0DxE-JQRNF6ee1il5iKsIBZx3OLQ,7117
 synapse/models/proj.py,sha256=eYY2bY7H8HJGvmuVQOrn4rQQWZQ_7noKtjLiq3QzgUU,9035
 synapse/models/risk.py,sha256=kH-FnPj0fhZvC_nEr3RPjiRz6OLYTj_FyTaYXvE9luk,50450
 synapse/models/science.py,sha256=oSkKbjmVncYcVkVgx8rhM08XtcsgDgjf3mpunz5kL30,4329
@@ -263,7 +264,7 @@ synapse/tests/test_cmds_boss.py,sha256=SdBwM2qJHFzzfrjWYiZOLBKeye8uru7KeJ3NU_YSk
 synapse/tests/test_cmds_cortex.py,sha256=LWFz8HyuvsIGjtz2DqXYh-R-5QbiQWzLlQKqew7gabY,17157
 synapse/tests/test_cmds_hive.py,sha256=aRH_Gh8oF_1BsfpmffyhDDNIqnTqsuF2cavdtGke1-0,5912
 synapse/tests/test_common.py,sha256=Akj1KLWbj7XRjTL_oN2Nt9v9liuGRKu2_3oCrHaMQkE,16415
-synapse/tests/test_cortex.py,sha256=vEQ4QUppccwHk9wQj937hw1UG25ViOdM1ZXMv5dUdP0,338204
+synapse/tests/test_cortex.py,sha256=nMota3-F9YutKvHG8af-boCkkjajP7Z94QxrdNQqG1I,338218
 synapse/tests/test_cryotank.py,sha256=JwEn_roIu4wlfPv34kjyAoJ2cWTrX3jDOr7ZMFUyslQ,12085
 synapse/tests/test_daemon.py,sha256=srOQ78HaHxCL38mvq5LWzsxgU0yb3UNLgi5KSMGQP8c,5812
 synapse/tests/test_data.py,sha256=f8L-q6kpMq8XPG3hq1jwlyaFRQEinSBf7ZlsRFeCuoM,196
@@ -272,7 +273,7 @@ synapse/tests/test_exc.py,sha256=j24ddx0PFdwtmgtwsjIvypXxfn4ji3rhAWo9I2sUbSY,172
 synapse/tests/test_glob.py,sha256=cSNrtEKWLsZXRhsjxQjRjjMqdgqfpl05yT4S53dC0NU,249
 synapse/tests/test_init.py,sha256=rHqYBVL_aFf1HO6zCF5akHVcHUP2g1kpJLRdTkV0yys,557
 synapse/tests/test_lib_agenda.py,sha256=PowCWygRdErvjvaQNx80G3zNIqsLMMlrakyJU9XF5nE,37779
-synapse/tests/test_lib_aha.py,sha256=uop0hlh1HOskqky3oHAa9vmmtFpPmGVfb6ynC_ZUaDA,68576
+synapse/tests/test_lib_aha.py,sha256=-XbpX1M47afeBH2sI_TxW5YsIZ5WrpynuEkq78Qtj1U,68898
 synapse/tests/test_lib_ast.py,sha256=bFdcP2al2qgLuY_yTXWNMsZSClv4oJRxj9kOR8KReaE,160358
 synapse/tests/test_lib_autodoc.py,sha256=H9Yb7cvzXOMPGBIoCCqNClcyIp6zEWcawtfudKbG-2U,6282
 synapse/tests/test_lib_base.py,sha256=mgqGmjioQaT75r4tWH7QkyqiMFOi_Or02Wo79oAh9z0,14032
@@ -327,7 +328,7 @@ synapse/tests/test_lib_spooled.py,sha256=dC5hba4c0MehALt4qW-cokqJl-tZsIsmABCGMIc
 synapse/tests/test_lib_storm.py,sha256=u4ILHdQ0wj8l50wN-D4e79h_RezbzGlNCXcQWLcNKb0,202209
 synapse/tests/test_lib_storm_format.py,sha256=tEZgQMmKAeG8FQZE5HUjOT7bnKawVTpNaVQh_3Wa630,277
 synapse/tests/test_lib_stormhttp.py,sha256=wk907a1fIADBgETeaiY5HWddIXv-nM3vinCryl5oKxw,36823
-synapse/tests/test_lib_stormlib_aha.py,sha256=mVbEmy4o1zmt23tbo9SrSEpE4ZPtK-TRwVVM7YOA1OM,9073
+synapse/tests/test_lib_stormlib_aha.py,sha256=ZlOoBs-55Wm7g3Qu2KueqMNnuamLccllpTnMORKoHoQ,9074
 synapse/tests/test_lib_stormlib_auth.py,sha256=YkT32btBsuUgMPgd_NlzXSfrHrgHHlmLfRFrZfZvX48,56990
 synapse/tests/test_lib_stormlib_backup.py,sha256=3ZYE3swQ4A8aYJyVueFXzbekCdoKMC7jsHLoq0hTKGI,1644
 synapse/tests/test_lib_stormlib_basex.py,sha256=DDOsH3XDR8MdJ1uj5avyqnFqBnlaIu8L5stX61jqKrw,2049
@@ -370,7 +371,7 @@ synapse/tests/test_lib_structlog.py,sha256=DGfzrfc2nybRq5RjwiUXd1v4sC5zl8d46RHgT
 synapse/tests/test_lib_task.py,sha256=Zby9Evlg_mBwE3_aF7p_5PIMhWp2Er7Y-ye4Y-3L5RQ,1646
 synapse/tests/test_lib_thishost.py,sha256=O6QCENStRuMjWS7qV9rqwW3bSZwzEUn9NcttKnDqXw8,366
 synapse/tests/test_lib_time.py,sha256=d1mPkN9P3GHNnZ_mhjyOv64tJGQ0yI_ifUjK3x-kmDg,8891
-synapse/tests/test_lib_trigger.py,sha256=dgYyLFHNcnzg2r8ydTva5HskCJAwZUqCM8ug3YQ8UJ4,41241
+synapse/tests/test_lib_trigger.py,sha256=9P14VFnjgup5d_sIrC5l_cBeKuApcejJVJC1hVGsc8o,41259
 synapse/tests/test_lib_types.py,sha256=oC3uaMwkFOb75TG93gb6bOc0pda_kI2KS-UmYnf4vTU,76735
 synapse/tests/test_lib_urlhelp.py,sha256=ir59ZRJz5XlhMb-ZBYl_p3GpGfnUBnDRwGlffvPC7IY,3147
 synapse/tests/test_lib_version.py,sha256=yDczjNi60hXXNZ-pYVntDblGNcekFZU6DdDsjUTkGtM,8164
@@ -398,6 +399,7 @@ synapse/tests/test_model_material.py,sha256=M7ACDCuMtavm-xtwAIZa1M-bHVq5PCUedDfR
 synapse/tests/test_model_media.py,sha256=RQVhYjOZ4rkNPBSzz05rle1M7F6-Yxw545s7k-YBwzc,2627
 synapse/tests/test_model_orgs.py,sha256=ITdt6sxW2LVUWRqBcVECzt_6zsdZy3WhBEdYEYzE6XM,39537
 synapse/tests/test_model_person.py,sha256=pRt9ZA9F11V-5pTsw6M43Ktsh3RnejikJPwPOYogIGo,17068
+synapse/tests/test_model_planning.py,sha256=U2kkE0uBO6CqtTfy7wlnhEIu_NFdSri4I_I5b-mRjBE,5615
 synapse/tests/test_model_proj.py,sha256=bBPNzvcbd1jZReeJ7X-AQdH7F7ZMugZVgaCTvS-QNFM,22849
 synapse/tests/test_model_risk.py,sha256=S4JDYlGLcnIG2MryDRMgDcwvMOsQCNGzgOuDG07U1lA,27342
 synapse/tests/test_model_science.py,sha256=2T9VxdzpltDufgjkUB95q97TQP9AxH2-T_sBbHfPDRk,2450
@@ -562,8 +564,8 @@ synapse/vendor/xrpl/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 synapse/vendor/xrpl/tests/test_codec.py,sha256=Zwq6A5uZUK_FWDL3BA932c5b-rL3hnC6efobWHSLC4o,6651
 synapse/vendor/xrpl/tests/test_main.py,sha256=kZQwWk7I6HrP-PMvLdsUUN4POvWD9I-iXDHOwdeF090,4299
 synapse/vendor/xrpl/tests/test_main_test_cases.py,sha256=vTlUM4hJD2Hd2wCIdd9rfsvcMZZZQmNHWdCTTFeGz2Y,4221
-synapse-2.167.0.dist-info/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
-synapse-2.167.0.dist-info/METADATA,sha256=cDImy1cTN1MvV5O04LQprMale52840S3rd5vxET1K7o,4921
-synapse-2.167.0.dist-info/WHEEL,sha256=d-ss0RGbiSJGQggaPntAAFgCBIav_4d8GZcRrfBnZg4,94
-synapse-2.167.0.dist-info/top_level.txt,sha256=v_1YsqjmoSCzCKs7oIhzTNmWtSYoORiBMv1TJkOhx8A,8
-synapse-2.167.0.dist-info/RECORD,,
+synapse-2.168.0.dist-info/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
+synapse-2.168.0.dist-info/METADATA,sha256=hpyJSpbWPbvPgMIefUR3jFm1IjtR1Pvg_-9O9oF7VKE,4921
+synapse-2.168.0.dist-info/WHEEL,sha256=d-ss0RGbiSJGQggaPntAAFgCBIav_4d8GZcRrfBnZg4,94
+synapse-2.168.0.dist-info/top_level.txt,sha256=v_1YsqjmoSCzCKs7oIhzTNmWtSYoORiBMv1TJkOhx8A,8
+synapse-2.168.0.dist-info/RECORD,,