synapse 2.231.0__tar.gz → 2.232.0__tar.gz

{synapse-2.231.0/synapse.egg-info → synapse-2.232.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse
-Version: 2.231.0
+Version: 2.232.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License-Expression: Apache-2.0
@@ -57,6 +57,7 @@ Requires-Dist: pycodestyle<3.0.0,>=2.10.0; extra == "dev"
 Requires-Dist: bump2version<1.1.0,>=1.0.1; extra == "dev"
 Requires-Dist: pytest-xdist<4.0.0,>=3.0.2; extra == "dev"
 Requires-Dist: coverage<8.0.0,>=7.0.0; extra == "dev"
+Requires-Dist: setproctitle<2.0.0,>=1.0.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx<9.0.0,>=8.0.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme<4.0.0,>=3.0.0; extra == "docs"

{synapse-2.231.0 → synapse-2.232.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.231.0'
+version = '2.232.0'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]
@@ -64,6 +64,7 @@ dev = [
     'bump2version>=1.0.1,<1.1.0',
     'pytest-xdist>=3.0.2,<4.0.0',
     'coverage>=7.0.0,<8.0.0',
+    'setproctitle>=1.0.0,<2.0.0',
 ]
 docs = [
     'sphinx>=8.0.0,<9.0.0',

{synapse-2.231.0 → synapse-2.232.0}/synapse/cortex.py

@@ -768,6 +768,12 @@ class CoreApi(s_cell.CellApi):
     async def getHttpExtApiByPath(self, path):
         return await self.cell.getHttpExtApiByPath(path)
 
+    async def getViewDef(self, iden):
+        '''
+        Get a view definition by iden.
+        '''
+        return await self.cell.getViewDef(iden, user=self.user)
+
 class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
     '''
     A Cortex implements the synapse hypergraph.
@@ -949,6 +955,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         self.bldgbuids = {}  # buid -> (Node, Event)  Nodes under construction
 
         self.axon = None  # type: s_axon.AxonApi
+        self.jsonstor = None  # type: s_jsonstor.JsonStorApi
         self.axready = asyncio.Event()
         self.axoninfo = {}
 
@@ -1422,13 +1429,19 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
              'desc': 'Controls the ability to remove Layers from the cortex.'},
             {'perm': ('layer', 'read'), 'gate': 'layer',
              'desc': 'Controls the ability to read/lift from a Layer.'},
-            {'perm': ('layer', 'read', '<iden>'), 'gate': 'cortex',
+            {'perm': ('layer', 'read', '<layer>'), 'gate': 'cortex',
              'desc': 'Controls the ability to read/lift from a specific Layer.'},
-            {'perm': ('layer', 'set', '<name>'), 'gate': 'layer',
-             'desc': 'Controls the ability to configure properties of a Layer.'},
+
+            {'perm': ('layer', 'set', 'name'), 'gate': 'layer',
+             'desc': 'Controls the ability set a layer name.'},
+            {'perm': ('layer', 'set', 'desc'), 'gate': 'layer',
+             'desc': 'Controls the ability set a layer description.'},
+            {'perm': ('layer', 'set', 'readonly'), 'gate': 'layer',
+             'desc': 'Controls the ability set a layer readonly.'},
+
             {'perm': ('layer', 'write'), 'gate': 'layer',
              'desc': 'Controls the ability to write to a Layer.'},
-            {'perm': ('layer', 'write', '<iden>'), 'gate': 'cortex',
+            {'perm': ('layer', 'write', '<layer>'), 'gate': 'cortex',
              'desc': 'Controls the ability to write to a specific Layer.'},
 
             {'perm': ('model', 'form', 'add'), 'gate': 'cortex',
@@ -1509,10 +1522,10 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             {'perm': ('node', 'tag', 'del'), 'gate': 'layer',
              'desc': 'Controls removing any tag on any node in a layer.'},
 
-            {'perm': ('node', 'tag', 'add', '<tag...>'), 'gate': 'layer',
+            {'perm': ('node', 'tag', 'add', '<tag>'), 'gate': 'layer',
              'ex': 'node.tag.add.cno.mal.redtree',
              'desc': 'Controls adding a specific tag on any node in a layer.'},
-            {'perm': ('node', 'tag', 'del', '<tag...>'), 'gate': 'layer',
+            {'perm': ('node', 'tag', 'del', '<tag>'), 'gate': 'layer',
              'ex': 'node.tag.del.cno.mal.redtree',
              'desc': 'Controls removing a specific tag on any node in a layer.'},
 
@@ -1539,12 +1552,12 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
             {'perm': ('node', 'data', 'set'), 'gate': 'layer',
              'desc': 'Permits a user to set node data in a given layer.'},
-            {'perm': ('node', 'data', 'set', '<key>'), 'gate': 'layer',
+            {'perm': ('node', 'data', 'set', '<varname>'), 'gate': 'layer',
               'ex': 'node.data.set.hehe',
              'desc': 'Permits a user to set node data in a given layer for a specific key.'},
             {'perm': ('node', 'data', 'pop'), 'gate': 'layer',
              'desc': 'Permits a user to remove node data in a given layer.'},
-            {'perm': ('node', 'data', 'pop', '<key>'), 'gate': 'layer',
+            {'perm': ('node', 'data', 'pop', '<varname>'), 'gate': 'layer',
              'ex': 'node.data.pop.hehe',
              'desc': 'Permits a user to remove node data in a given layer for a specific key.'},
 
@@ -1587,9 +1600,17 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
              'desc': 'Controls access to fork a view.'},
             {'perm': ('view', 'read'), 'gate': 'view',
              'desc': 'Controls read access to view.'},
-            {'perm': ('view', 'set', '<setting>'), 'gate': 'view',
-             'desc': 'Controls access to change view settings.',
-             'ex': 'view.set.name'},
+
+            {'perm': ('view', 'set', 'name'), 'gate': 'view',
+             'desc': 'Controls access to set a view name.'},
+            {'perm': ('view', 'set', 'desc'), 'gate': 'view',
+             'desc': 'Controls access to set a view description.'},
+            {'perm': ('view', 'set', 'quorum'), 'gate': 'view',
+             'desc': 'Controls access to set a view quorum status.'},
+            {'perm': ('view', 'set', 'parent'), 'gate': 'view',
+             'desc': 'Controls access to set a view parent view.'},
+            {'perm': ('view', 'set', 'protected'), 'gate': 'view',
+             'desc': 'Controls access to set a view protected status.'},
         ))
         for pdef in self._cortex_permdefs:
             s_schemas.reqValidPermDef(pdef)
@@ -4284,9 +4305,12 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         '''
         Generic fini handler for cortex components which may change or vary at runtime.
         '''
-        if self.axon:
+        if self.axon is not None:
             await self.axon.fini()
 
+        if self.jsonstor is not None:
+            await self.jsonstor.fini()
+
         [await wind.fini() for wind in tuple(self.nodeeditwindows)]
 
     async def syncLayerNodeEdits(self, iden, offs, wait=True):
@@ -4542,8 +4566,6 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             conf = {'cell:guid': jsoniden, 'health:sysctl:checks': False}
             self.jsonstor = await s_jsonstor.JsonStorCell.anit(path, conf=conf, parent=self)
 
-        self.onfini(self.jsonstor)
-
     async def getJsonObj(self, path):
         if self.jsonurl is not None:
             await self.jsonstor.waitready()
@@ -4743,9 +4765,8 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             # Ensure each ctor's permdefs are valid
             for pdef in ctor._storm_lib_perms:
                 s_schemas.reqValidPermDef(pdef)
-            # Skip libbase which is registered as a default ctor in the storm Runtime
-            if path:
-                self.addStormLib(path, ctor)
+
+            self.addStormLib(path, ctor)
 
     def _initFeedFuncs(self):
         '''
@@ -5420,8 +5441,8 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
     def listViews(self):
         return list(self.views.values())
 
-    async def getViewDef(self, iden):
-        view = self.getView(iden=iden)
+    async def getViewDef(self, iden, user=None):
+        view = self.getView(iden=iden, user=user)
         if view is not None:
             return await view.pack()
 
@@ -5997,6 +6018,10 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         self.stormlibs.append((path, ctor))
 
+        # Skip libbase which is registered as a default ctor in the storm Runtime
+        if not path:
+            return
+
         root = self.libroot
         # (name, {kids}, {funcs})
 

{synapse-2.231.0 → synapse-2.232.0}/synapse/lib/base.py

@@ -453,6 +453,10 @@ class Base:
         finally:
             self.off(evnt, func)
 
+    def _wouldfini(self):
+        '''Check if a Base would be fini() if fini() was called on it.'''
+        return self._syn_refs == 1
+
     async def waitfini(self, timeout=None):
         '''
         Wait for the base to fini()

{synapse-2.231.0 → synapse-2.232.0}/synapse/lib/cell.py

@@ -1563,7 +1563,13 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
 
     async def fini(self):
         '''Fini override that ensures locking teardown order.'''
-        # we inherit from Pusher to make the Cell a Base subclass
+
+        # First we teardown our activebase if it is set. This allows those tasks to be
+        # cancelled and do any cleanup that they may need to perform.
+        if self._wouldfini() and self.activebase:
+            await self.activebase.fini()
+
+        # we inherit from Pusher to make the Cell a Base subclass, so we tear it down through that.
         retn = await s_nexus.Pusher.fini(self)
         if retn == 0:
             self._onFiniCellGuid()
@@ -4815,6 +4821,8 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
         if mirror is not None:
             mirror = s_urlhelp.sanitizeUrl(mirror)
 
+        nxfo = await self.nexsroot.getNexsInfo()
+
         ret = {
             'synapse': {
                 'commit': s_version.commit,
@@ -4829,13 +4837,13 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
                 'active': self.isactive,
                 'safemode': self.safemode,
                 'started': self.startms,
-                'ready': self.nexsroot.ready.is_set(),
+                'ready': nxfo['ready'],  # TODO: Remove in 3.x.x
                 'commit': self.COMMIT,
                 'version': self.VERSION,
                 'verstring': self.VERSTRING,
                 'cellvers': dict(self.cellvers.items()),
-                'nexsindx': await self.getNexsIndx(),
-                'uplink': self.nexsroot.miruplink.is_set(),
+                'nexsindx': nxfo['indx'],  # TODO: Remove in 3.x.x
+                'uplink': nxfo['uplink:ready'],  # TODO: Remove in 3.x.x
                 'mirror': mirror,
                 'aha': {
                     'name': self.conf.get('aha:name'),
@@ -4844,7 +4852,8 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
                 },
                 'network': {
                     'https': self.https_listeners,
-                }
+                },
+                'nexus': nxfo,
             },
             'features': self.features,
         }

{synapse-2.231.0 → synapse-2.232.0}/synapse/lib/nexus.py

@@ -22,6 +22,11 @@ leaderversion = 'Leader is a higher version than we are.'
 
 # As a mirror follower, amount of time before giving up on a write request
 FOLLOWER_WRITE_WAIT_S = 30.0
+# As a mirror, amount of time to wait for a connection to the leader before entering
+# read-only mode and cancelling tasks waiting on responses.
+FOLLOWER_CONNECT_WAIT_S = 60.0
+
+mirrordisconnect = f'Unable to connect to leader for {FOLLOWER_CONNECT_WAIT_S}s.'
 
 WINDOW_MAXSIZE = 10_000
 YIELD_PREFIX = b'\x92\xa8t2:yield\x81\xa4retn\x92\xc3\x92'
@@ -225,6 +230,19 @@ class NexsRoot(s_base.Base):
 
         logger.warning('...Nexus log migration complete')
 
+    async def getNexsInfo(self):
+        ret = {
+            'indx': await self.index(),
+            'ready': self.ready.is_set(),
+            'uplink:ready': self.miruplink.is_set(),
+            'readonly': self.readonly,
+            # This is a list of dictionaries so that we can populate metadata
+            # in the future if we want to do so.
+            'holds': sorted([{'reason': hold} for hold in self.writeholds],
+                                key=lambda x: x.get('reason'))
+        }
+        return ret
+
     @contextlib.contextmanager
     def _getResponseFuture(self, iden=None):
 
@@ -354,7 +372,7 @@ class NexsRoot(s_base.Base):
                 await client.issue(nexsiden, event, args, kwargs, meta, wait=False)
             else:
                 await client.issue(nexsiden, event, args, kwargs, meta)
-            return await s_common.wait_for(futu, timeout=FOLLOWER_WRITE_WAIT_S)
+            return await futu
 
     async def eat(self, nexsiden, event, args, kwargs, meta, wait=True):
         '''
@@ -365,6 +383,10 @@ class NexsRoot(s_base.Base):
 
         await self.cell.nexslock.acquire()
 
+        if self.isfini:
+            self.cell.nexslock.release()
+            raise s_exc.IsFini(mesg=f'Nexus has been shutdown, cannot propose {s_common.trimText(str((nexsiden, event, args, kwargs, meta)))}')
+
         try:
             if (nexus := self._nexskids.get(nexsiden)) is None:
                 mesg = f'No Nexus Pusher with iden {nexsiden} {event=} args={s_common.trimText(repr(args))} ' \
@@ -391,6 +413,9 @@ class NexsRoot(s_base.Base):
     async def _eat(self, item, indx=None):
 
         try:
+            if self.isfini:
+                raise s_exc.IsFini(mesg=f'Nexus has been shutdown, cannot apply {s_common.trimText(str(item))}')
+
             if self.donexslog:
                 saveindx, packitem = await self.nexslog.addWithPackRetn(item, indx=indx)
 
@@ -472,7 +497,7 @@ class NexsRoot(s_base.Base):
             return
 
         if self.isfini:
-            raise s_exc.IsFini()
+            raise s_exc.IsFini(mesg='Nexus has been shutdown, cannot iterate changes.')
 
         maxoffs = offs
 
@@ -542,6 +567,7 @@ class NexsRoot(s_base.Base):
 
         if self.client is not None:
             await self.client.fini()
+            await self.delWriteHold(mirrordisconnect)
 
         self._mirready.clear()
 
@@ -554,6 +580,7 @@ class NexsRoot(s_base.Base):
         if mirurl is not None:
             self.client = await s_telepath.Client.anit(mirurl, onlink=self._onTeleLink)
             self.onfini(self.client)
+            self.client.schedCoro(self.connectTimeout())
 
         self.started = True
 
@@ -580,13 +607,27 @@ class NexsRoot(s_base.Base):
 
         await self.startup()
 
+    async def connectTimeout(self):
+        try:
+            await s_common.wait_for(self.miruplink.wait(), FOLLOWER_CONNECT_WAIT_S)
+
+        except asyncio.TimeoutError:
+            await self.addWriteHold(mirrordisconnect)
+
+            for futu in list(self._futures.values()):
+                futu.set_exception(s_exc.LinkErr(mesg=mirrordisconnect))
+
     async def _onTeleLink(self, proxy):
         self.miruplink.set()
+        await self.delWriteHold(mirrordisconnect)
 
         def onfini():
             self.miruplink.clear()
             self.issuewait = False
 
+            if not self.isfini:
+                self.client.schedCoro(self.connectTimeout())
+
         proxy.onfini(onfini)
         proxy.schedCoro(self.runMirrorLoop(proxy))
 

{synapse-2.231.0 → synapse-2.232.0}/synapse/lib/stormlib/auth.py

@@ -1938,13 +1938,13 @@ class LibUsers(s_stormtypes.Lib):
         {'perm': ('auth', 'user', 'set', 'rules'), 'gate': 'cortex',
          'desc': 'Controls adding rules to a user.'},
 
-        {'perm': ('auth', 'user', 'get', 'profile', '<name>'), 'gate': 'cortex',
+        {'perm': ('auth', 'user', 'get', 'profile', '<varname>'), 'gate': 'cortex',
          'desc': 'Permits a user to retrieve their profile information.',
          'ex': 'auth.user.get.profile.fullname'},
-        {'perm': ('auth', 'user', 'pop', 'profile', '<name>'), 'gate': 'cortex',
+        {'perm': ('auth', 'user', 'pop', 'profile', '<varname>'), 'gate': 'cortex',
          'desc': 'Permits a user to remove profile information.',
          'ex': 'auth.user.pop.profile.fullname'},
-        {'perm': ('auth', 'user', 'set', 'profile', '<name>'), 'gate': 'cortex',
+        {'perm': ('auth', 'user', 'set', 'profile', '<varname>'), 'gate': 'cortex',
          'desc': 'Permits a user to set profile information.',
          'ex': 'auth.user.set.profile.fullname'},
         {'perm': ('auth', 'user', 'set', 'apikey'), 'gate': 'cortex',

{synapse-2.231.0 → synapse-2.232.0}/synapse/lib/stormlib/pkg.py

@@ -258,7 +258,7 @@ class LibPkg(s_stormtypes.Lib):
                   'returns': {'type': 'pkg:queues', 'desc': 'An object for accessing the package Queues.', }}},
     )
     _storm_lib_perms = (
-        {'perm': ('power-ups', '<name>', 'admin'), 'gate': 'cortex',
+        {'perm': ('power-ups', '<power-up>', 'admin'), 'gate': 'cortex',
          'desc': 'Controls the ability to interact with the vars or Queues for a Storm Package by name.'},
     )
     _storm_lib_path = ('pkg',)

{synapse-2.231.0 → synapse-2.232.0}/synapse/lib/stormtypes.py

@@ -940,8 +940,6 @@ class LibService(Lib):
             'desc': 'Controls the ability to delete a Storm Service from the Cortex'},
         {'perm': ('service', 'get'), 'gate': 'cortex',
             'desc': 'Controls the ability to get the Service object for any Storm Service.'},
-        {'perm': ('service', 'get', '<iden>'), 'gate': 'cortex',
-            'desc': 'Controls the ability to get the Service object for a Storm Service by iden.'},
         {'perm': ('service', 'list'), 'gate': 'cortex',
          'desc': 'Controls the ability to list all available Storm Services and their service definitions.'},
     )
@@ -1415,6 +1413,26 @@ class LibBase(Lib):
                               'desc': 'A deep copy of the primitive object.', }}},
     )
 
+    _storm_lib_perms = (
+        {'perm': ('globals',), 'gate': 'cortex',
+            'desc': 'Used to control all operations for global variables.'},
+
+        {'perm': ('globals', 'get'), 'gate': 'cortex',
+            'desc': 'Used to control read access to all global variables.'},
+        {'perm': ('globals', 'get', '<varname>'), 'gate': 'cortex',
+            'desc': 'Used to control read access to a specific global variable.'},
+
+        {'perm': ('globals', 'set'), 'gate': 'cortex',
+            'desc': 'Used to control edit access to all global variables.'},
+        {'perm': ('globals', 'set', '<varname>'), 'gate': 'cortex',
+            'desc': 'Used to control edit access to a specific global variable.'},
+
+        {'perm': ('globals', 'del'), 'gate': 'cortex',
+            'desc': 'Used to control delete access to all global variables.'},
+        {'perm': ('globals', 'del', '<varname>'), 'gate': 'cortex',
+            'desc': 'Used to control delete access to a specific global variable.'},
+    )
+
     def __init__(self, runt, name=()):
         Lib.__init__(self, runt, name=name)
         self.stors['debug'] = self._setRuntDebug
@@ -1592,7 +1610,12 @@ class LibBase(Lib):
         name = await toprim(name)
         valu = await toprim(valu)
 
-        return self._reqTypeByName(name).repr(valu)
+        try:
+            return self._reqTypeByName(name).repr(valu)
+        except s_exc.SynErr:
+            raise
+        except Exception as e:
+            raise s_exc.BadArg(mesg=f'Failed to repr {name=} valu={s_common.trimText(repr(valu))}; {e}') from None
 
     @stormfunc(readonly=True)
     async def _exit(self, mesg=None, **kwargs):
@@ -4218,9 +4241,7 @@ class LibTelepath(Lib):
     _storm_lib_path = ('telepath',)
     _storm_lib_perms = (
         {'perm': ('storm', 'lib', 'telepath', 'open'), 'gate': 'cortex',
-         'desc': 'Controls the ability to open an arbitrary telepath URL. USE WITH CAUTION.'},
-        {'perm': ('storm', 'lib', 'telepath', 'open', '<scheme>'), 'gate': 'cortex',
-         'desc': 'Controls the ability to open a telepath URL with a specific URI scheme. USE WITH CAUTION.'},
+         'desc': 'Controls the ability to open a telepath URL. USE WITH CAUTION.'},
     )
 
     def getObjLocals(self):
@@ -5868,25 +5889,6 @@ class LibGlobals(Lib):
                               'desc': 'A list of tuples with variable names and values that the user can access.', }}},
     )
     _storm_lib_path = ('globals', )
-    _storm_lib_perms = (
-        {'perm': ('globals',), 'gate': 'cortex',
-            'desc': 'Used to control all operations for global variables.'},
-
-        {'perm': ('globals', 'get'), 'gate': 'cortex',
-            'desc': 'Used to control read access to all global variables.'},
-        {'perm': ('globals', 'get', '<name>'), 'gate': 'cortex',
-            'desc': 'Used to control read access to a specific global variable.'},
-
-        {'perm': ('globals', 'set'), 'gate': 'cortex',
-            'desc': 'Used to control edit access to all global variables.'},
-        {'perm': ('globals', 'set', '<name>'), 'gate': 'cortex',
-            'desc': 'Used to control edit access to a specific global variable.'},
-
-        {'perm': ('globals', 'pop'), 'gate': 'cortex',
-            'desc': 'Used to control delete access to all global variables.'},
-        {'perm': ('globals', 'pop', '<name>'), 'gate': 'cortex',
-            'desc': 'Used to control delete access to a specific global variable.'},
-    )
 
     def __init__(self, runt, name):
         Lib.__init__(self, runt, name)

{synapse-2.231.0 → synapse-2.232.0}/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, 231, 0)
+version = (2, 232, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = 'e298acce8602740c92e01252e13bea24e10b8300'
+commit = '5a0c548c56e314e5c2a4b0373ce90d74d239d167'

{synapse-2.231.0 → synapse-2.232.0}/synapse/models/base.py

@@ -213,6 +213,13 @@ class BaseModule(s_module.CoreModule):
 
                 (('meta:rule', 'detects', None), {
                     'doc': 'The meta:rule is designed to detect instances of the target node.'}),
+
+                (('meta:rule', 'generated', 'risk:alert'), {
+                    'doc': 'The meta:rule generated the risk:alert node.'}),
+
+                (('meta:rule', 'generated', 'it:log:event'), {
+                    'doc': 'The meta:rule generated the it:log:event node.'}),
+
             ),
             'forms': (
 

{synapse-2.231.0 → synapse-2.232.0}/synapse/tests/test_cortex.py

@@ -9367,3 +9367,6 @@ class CortexBasicTest(s_t_utils.SynTest):
                 if gate.type == 'cronjob':
                     gates.append(gate)
             self.len(1, gates)
+
+            # Allow the cortex to perform a txn and close down cleanly.
+            await core.sync()

{synapse-2.231.0 → synapse-2.232.0}/synapse/tests/test_lib_base.py

@@ -296,14 +296,18 @@ class BaseTest(s_t_utils.SynTest):
 
     async def test_base_refcount(self):
         base = await s_base.Base.anit()
+        self.true(base._wouldfini())
 
         self.eq(base.incref(), 2)
+        self.false(base._wouldfini())
 
         self.eq(await base.fini(), 1)
         self.false(base.isfini)
+        self.true(base._wouldfini())
 
         self.eq(await base.fini(), 0)
         self.true(base.isfini)
+        self.false(base._wouldfini())
 
     async def test_baseref_gen(self):
 

{synapse-2.231.0 → synapse-2.232.0}/synapse/tests/test_lib_cell.py

@@ -910,6 +910,7 @@ class CellTest(s_t_utils.SynTest):
                 info = await prox.getCellInfo()
                 # Cell information
                 cnfo = info.get('cell')
+                nxfo = cnfo.get('nexus')
                 snfo = info.get('synapse')
                 self.eq(cnfo.get('commit'), 'mycommit')
                 self.eq(cnfo.get('version'), (1, 2, 3))
@@ -919,7 +920,15 @@ class CellTest(s_t_utils.SynTest):
                 self.ge(cnfo.get('nexsindx'), 0)
                 self.true(cnfo.get('active'))
                 self.false(cnfo.get('uplink'))
+                self.true(cnfo.get('ready'))
                 self.none(cnfo.get('mirror', True))
+                # Nexus info
+                self.ge(nxfo.get('indx'), 0)
+                self.false(nxfo.get('uplink:ready'))
+                self.true(nxfo.get('ready'))
+                self.false(nxfo.get('readonly'))
+                self.eq(nxfo.get('holds'), [])
+
                 # A Cortex populated cellvers
                 self.isin('cortex:defaults', cnfo.get('cellvers', {}))
 
@@ -938,6 +947,21 @@ class CellTest(s_t_utils.SynTest):
                 https = netw.get('https')
                 self.eq(https, http_info)
 
+                # Write hold information is reflected through cell info
+                await cell.nexsroot.addWriteHold('boop')
+                await cell.nexsroot.addWriteHold('beep')
+                info = await prox.getCellInfo()
+                nxfo = info.get('cell').get('nexus')
+                self.true(nxfo.get('readonly'))
+                self.eq(nxfo.get('holds'), [{'reason': 'beep'}, {'reason': 'boop'}])
+
+                await cell.nexsroot.delWriteHold('boop')
+                await cell.nexsroot.delWriteHold('beep')
+                info = await prox.getCellInfo()
+                nxfo = info.get('cell').get('nexus')
+                self.false(nxfo.get('readonly'))
+                self.eq(nxfo.get('holds'), [])
+
         # Mirrors & ready flags
         async with self.getTestAha() as aha:  # type: s_aha.AhaCell
 
@@ -956,18 +980,26 @@ class CellTest(s_t_utils.SynTest):
                 await cell01.sync()
 
                 cnfo0 = await cell00.getCellInfo()
+                nxfo0 = cnfo0['cell']['nexus']
                 cnfo1 = await cell01.getCellInfo()
+                nxfo1 = cnfo1['cell']['nexus']
                 self.true(cnfo0['cell']['ready'])
                 self.false(cnfo0['cell']['uplink'])
                 self.none(cnfo0['cell']['mirror'])
                 self.eq(cnfo0['cell']['version'], (1, 2, 3))
+                self.false(nxfo0.get('uplink:ready'))
+                self.true(nxfo0.get('ready'))
 
                 self.true(cnfo1['cell']['ready'])
                 self.true(cnfo1['cell']['uplink'])
                 self.eq(cnfo1['cell']['mirror'], 'aha://root@cell...')
                 self.eq(cnfo1['cell']['version'], (1, 2, 3))
 
+                self.true(nxfo1.get('uplink:ready'))
+                self.true(nxfo1.get('ready'))
+
                 self.eq(cnfo0['cell']['nexsindx'], cnfo1['cell']['nexsindx'])
+                self.eq(nxfo0['indx'], nxfo1['indx'])
 
     async def test_cell_dyncall(self):
 
@@ -3612,3 +3644,47 @@ class CellTest(s_t_utils.SynTest):
 
             self.none(await cell00.getTask(task01))
             self.false(await cell00.killTask(task01))
+
+    async def test_cell_fini_order(self):
+
+        with self.getTestDir() as dirn:
+
+            data = []
+            conf = {'nexslog:en': True}
+
+            async with self.getTestCell(dirn=dirn, conf=conf) as cell:
+
+                event00 = asyncio.Event()
+
+                async def coro():
+                    try:
+                        event00.set()
+                        await asyncio.sleep(100000)
+                    except asyncio.CancelledError:
+                        # nexus txn can run in a activeTask handler
+                        await cell.sync()
+                        data.append('activetask_cancelled')
+
+                async def bg_coro():
+                    self.true(await cell.waitfini(timeout=12))
+                    data.append('cell_fini')
+                    return True
+
+                bg_task = s_coro.create_task(bg_coro())
+                cell.runActiveTask(coro())
+                self.true(await asyncio.wait_for(event00.wait(), timeout=6))
+
+                # Perform a non-sync nexus txn then teardown the cell via __aexit__
+                self.nn(await cell.addUser('someuser'))
+
+            self.true(await asyncio.wait_for(bg_task, timeout=6))
+
+            self.eq(data, ['activetask_cancelled', 'cell_fini'])
+
+            async with self.getTestCell(dirn=dirn, conf=conf) as cell:
+                offs = await cell.getNexsIndx()
+                items = []
+                async for offs, item in cell.getNexusChanges(offs - 1, wait=False):
+                    items.append(item)
+                self.len(1, items)
+                self.eq('sync', items[0][1])