synapse 2.225.0__py311-none-any.whl → 2.226.0__py311-none-any.whl

synapse/cortex.py

@@ -1538,11 +1538,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
              'desc': 'Controls access to deleting storm packages.'},
 
             {'perm': ('storm', 'asroot', 'cmd', '<cmdname>'), 'gate': 'cortex',
-            'desc': 'Controls running storm commands requiring root privileges.',
-             'ex': 'storm.asroot.cmd.movetag'},
+            'desc': 'Deprecated. Please use Storm modules to implement functionality requiring root privileges.'},
             {'perm': ('storm', 'asroot', 'mod', '<modname>'), 'gate': 'cortex',
-            'desc': 'Controls importing modules requiring root privileges.',
-             'ex': 'storm.asroot.cmd.synapse-misp.privsep'},
+            'desc': 'Deprecated. Storm modules should use the asroot:perms key to specify the permissions they require.'},
 
             {'perm': ('storm', 'graph', 'add'), 'gate': 'cortex',
              'desc': 'Controls access to add a storm graph.',
@@ -6914,7 +6912,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Delete a cron job
 
         Args:
-            iden (bytes):  The iden of the cron job to be deleted
+            iden (str):  The iden of the cron job to be deleted
         '''
         await self._killCronTask(iden)
         try:
@@ -6931,7 +6929,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Change an existing cron job's query
 
         Args:
-            iden (bytes):  The iden of the cron job to be changed
+            iden (str):  The iden of the cron job to be changed
         '''
         await self.agenda.mod(iden, query)
         await self.feedBeholder('cron:edit:query', {'iden': iden, 'query': query}, gates=[iden])
@@ -6942,7 +6940,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Enable a cron job
 
         Args:
-            iden (bytes):  The iden of the cron job to be changed
+            iden (str):  The iden of the cron job to be changed
         '''
         await self.agenda.enable(iden)
         await self.feedBeholder('cron:enable', {'iden': iden}, gates=[iden])
@@ -6954,7 +6952,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Enable a cron job
 
         Args:
-            iden (bytes):  The iden of the cron job to be changed
+            iden (str):  The iden of the cron job to be changed
         '''
         await self.agenda.disable(iden)
         await self._killCronTask(iden)

synapse/lib/agenda.py

@@ -430,6 +430,9 @@ class _Appt:
 
             if name == 'lasterrs' and not isinstance(valu, list):
                 valu = list(valu)
+            elif name == 'nexttime' and valu is None:
+                self.recs.clear()
+                self.stor._delete_appt_from_heap(self)
 
             setattr(self, name, valu)
 
@@ -469,7 +472,6 @@ class Agenda(s_base.Base):
         self.apptheap = []
         self.appts = {}
 
-        to_delete = []
         for iden, info in self.apptdefs.items():
             try:
                 appt = _Appt.unpack(self, info)
@@ -479,18 +481,30 @@ class Agenda(s_base.Base):
                 self._next_indx = max(self._next_indx, appt.indx + 1)
             except (s_exc.InconsistentStorage, s_exc.BadStorageVersion, s_exc.BadTime, TypeError, KeyError,
                     UnicodeDecodeError) as e:
-                logger.warning('Invalid appointment %r found in storage: %r.  Removing.', iden, e)
-                to_delete.append(iden)
-                continue
-
-        for iden in to_delete:
-            self.apptdefs.pop(iden)
+                logger.warning('Invalid appointment %r found in storage: %r. This appointment will be removed.', iden, e)
 
         # Make sure we don't assign the same index to 2 appointments
         if self.appts:
             maxindx = max(appt.indx for appt in self.appts.values())
             self._next_indx = maxindx + 1
 
+    async def _clear_invalid(self):
+
+        to_delete = []
+        for iden, info in self.apptdefs.items():
+            try:
+                appt = _Appt.unpack(self, info)
+                if appt.iden != iden:
+                    raise s_exc.InconsistentStorage(mesg='iden inconsistency')
+
+            except (s_exc.InconsistentStorage, s_exc.BadStorageVersion, s_exc.BadTime, TypeError, KeyError,
+                    UnicodeDecodeError) as e:
+                logger.warning('Removing invalid appointment %r.', iden)
+                to_delete.append(iden)
+
+        for iden in to_delete:
+            await self.core.delCronJob(iden)
+
     def _addappt(self, iden, appt):
         '''
         Updates the data structures to add an appointment
@@ -685,14 +699,13 @@ class Agenda(s_base.Base):
         '''
         Delete an appointment
         '''
-        appt = self.appts.get(iden)
-        if appt is None:
+        if not self.apptdefs.delete(iden):
             mesg = f'No cron job with iden: {iden}'
             raise s_exc.NoSuchIden(iden=iden, mesg=mesg)
 
-        self._delete_appt_from_heap(appt)
-        del self.appts[iden]
-        self.apptdefs.delete(iden)
+        if (appt := self.appts.get(iden)) is not None:
+            self._delete_appt_from_heap(appt)
+            del self.appts[iden]
 
     def _delete_appt_from_heap(self, appt):
         try:
@@ -729,14 +742,14 @@ class Agenda(s_base.Base):
                 await self.core.addCronEdits(appt.iden, edits)
                 await self.core.feedBeholder('cron:stop', {'iden': appt.iden})
 
-                if appt.nexttime is None:
-                    self._delete_appt_from_heap(appt)
-
     async def runloop(self):
         '''
         Task loop to issue query tasks at the right times.
         '''
         await self.clearRunningStatus()
+
+        await self._clear_invalid()
+
         while not self.isfini:
 
             timeout = None

synapse/lib/ast.py

@@ -3452,10 +3452,6 @@ class PropValue(Value):
                 raise self.kids[0].addExcInfo(exc)
 
             valu = path.node.get(name)
-            if isinstance(valu, (dict, list, tuple)):
-                # these get special cased because changing them affects the node
-                # while it's in the pipeline but the modification doesn't get stored
-                valu = s_msgpack.deepcopy(valu)
             return prop, valu
 
         # handle implicit pivot properties
@@ -3479,10 +3475,6 @@ class PropValue(Value):
                 raise self.kids[0].addExcInfo(exc)
 
             if i >= imax:
-                if isinstance(valu, (dict, list, tuple)):
-                    # these get special cased because changing them affects the node
-                    # while it's in the pipeline but the modification doesn't get stored
-                    valu = s_msgpack.deepcopy(valu)
                 return prop, valu
 
             form = runt.model.forms.get(prop.type.name)
@@ -3495,6 +3487,10 @@ class PropValue(Value):
 
     async def compute(self, runt, path):
         prop, valu = await self.getPropAndValu(runt, path)
+
+        if prop:
+            valu = await prop.type.tostorm(valu)
+
         return valu
 
 class RelPropValue(PropValue):

synapse/lib/platforms/linux.py

@@ -112,7 +112,9 @@ def getSysctls():
         ('vm.dirty_expire_centisecs', '/proc/sys/vm/dirty_expire_centisecs', int),
         ('vm.dirty_writeback_centisecs', '/proc/sys/vm/dirty_writeback_centisecs', int),
         ('vm.dirty_background_ratio', '/proc/sys/vm/dirty_background_ratio', int),
+        ('vm.dirty_background_bytes', '/proc/sys/vm/dirty_background_bytes', int),
         ('vm.dirty_ratio', '/proc/sys/vm/dirty_ratio', int),
+        ('vm.dirty_bytes', '/proc/sys/vm/dirty_bytes', int),
     )
     ret = {}
     for key, fp, func in _sysctls:

synapse/lib/storm.py

@@ -2521,9 +2521,17 @@ class PureCmd(Cmd):
         perm = ('storm', 'asroot', 'cmd') + tuple(name.split('.'))
 
         asroot = runt.allowed(perm)
-        if self.asroot and not asroot:
-            mesg = f'Command ({name}) elevates privileges.  You need perm: storm.asroot.cmd.{name}'
-            raise s_exc.AuthDeny(mesg=mesg, user=runt.user.iden, username=runt.user.name)
+        if self.asroot:
+            mesg = f'Command ({name}) requires asroot permission which is deprecated and will be removed in v3.0.0. ' \
+                    'Functionality which requires elevated permissions should be implemented in Storm modules and use ' \
+                    'asroot:perms to specify the required permissions.'
+
+            s_common.deprecated('Storm command asroot key', curv='2.226.0', eolv='3.0.0')
+            await runt.warnonce(mesg, log=False)
+
+            if not asroot:
+                mesg = f'Command ({name}) elevates privileges.  You need perm: storm.asroot.cmd.{name}'
+                raise s_exc.AuthDeny(mesg=mesg, user=runt.user.iden, username=runt.user.name)
 
         # if a command requires perms, check em!
         # ( used to create more intuitive perm boundaries )

synapse/lib/stormlib/aha.py

@@ -740,10 +740,10 @@ The ready column indicates that a service has entered into the realtime change w
                     $info = $cell_infos.$svcname
                     $cell_info = $info.cell
                     $status.nexs_indx = $cell_info.nexsindx
-                    if ($cell_info.uplink) {
-                        $status.role = 'follower'
-                    } else {
+                    if ($cell_info.active) {
                         $status.role = 'leader'
+                    } else {
+                        $status.role = 'follower'
                     }
                     $status.version = $info.cell.verstring
                     $status.synapse_version = $info.synapse.verstring

synapse/lib/stormtypes.py

@@ -1499,9 +1499,16 @@ class LibBase(Lib):
             perm = ('storm', 'asroot', 'mod') + tuple(name.split('.'))
             asroot = self.runt.allowed(perm)
 
-            if mdef.get('asroot', False) and not asroot:
-                mesg = f'Module ({name}) elevates privileges.  You need perm: storm.asroot.mod.{name}'
-                raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
+            if mdef.get('asroot', False):
+                mesg = f'Module ({name}) requires asroot permission but does not specify any asroot:perms. ' \
+                        'storm.asroot.mod.<modname> style permissons are deprecated and will be removed in v3.0.0.'
+
+                s_common.deprecated('Storm module asroot key', curv='2.226.0', eolv='3.0.0')
+                await self.runt.warnonce(mesg, log=False)
+
+                if not asroot:
+                    mesg = f'Module ({name}) elevates privileges.  You need perm: storm.asroot.mod.{name}'
+                    raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
 
         modr = await self.runt.getModRuntime(query, opts={'vars': {'modconf': modconf}})
         modr.asroot = asroot

synapse/lib/types.py

@@ -32,6 +32,8 @@ class Type:
     # ( due to hot-loop needs in the storm runtime )
     isarray = False
 
+    ismutable = False
+
     def __init__(self, modl, name, info, opts):
         '''
         Construct a new Type object.
@@ -369,6 +371,17 @@ class Type:
         topt.update(opts)
         return self.__class__(self.modl, self.name, self.info, topt)
 
+    async def tostorm(self, valu):
+        '''
+        Allows type-specific modifications to values to make them safe for use in the runtime.
+
+        Args:
+            valu (any): The valu to update.
+        '''
+        if self.ismutable:
+            return s_msgpack.deepcopy(valu, use_list=True)
+        return valu
+
     def __eq__(self, othr):
         if self.name != othr.name:
             return False
@@ -415,6 +428,7 @@ class Bool(Type):
 class Array(Type):
 
     isarray = True
+    ismutable = True
 
     def postTypeInit(self):
 
@@ -534,6 +548,9 @@ class Comp(Type):
 
             _type = self.tcache[name]
 
+            if _type.ismutable:
+                self.ismutable = True
+
             norm, info = _type.norm(valu[i])
 
             subs[name] = norm
@@ -1623,6 +1640,8 @@ class TimeEdge(Edge):
 
 class Data(Type):
 
+    ismutable = True
+
     stortype = s_layer.STOR_TYPE_MSGP
 
     def postTypeInit(self):
@@ -1643,6 +1662,7 @@ class Data(Type):
 
 class NodeProp(Type):
 
+    ismutable = True
     stortype = s_layer.STOR_TYPE_MSGP
 
     def postTypeInit(self):

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, 225, 0)
+version = (2, 226, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = 'd2ab923e3df9fe64611ac05b6ffdd7e8c2dc1b22'
+commit = '90a28a430a0b2b1f8cc74af240f55bfcf717b582'

synapse/models/base.py

@@ -176,6 +176,9 @@ class BaseModule(s_module.CoreModule):
                 ((None, 'refs', None), {
                     'doc': 'The source node contains a reference to the target node.'}),
 
+                ((None, 'linked', None), {
+                    'doc': 'The source node is linked to the target node.'}),
+
                 (('meta:source', 'seen', None), {
                     'doc': 'The meta:source observed the target node.'}),
 

synapse/models/inet.py

@@ -1550,13 +1550,23 @@ class InetModule(s_module.CoreModule):
                     ('inet:ssl:jarmsample', ('comp', {'fields': (('server', 'inet:server'), ('jarmhash', 'inet:ssl:jarmhash'))}), {
                         'doc': 'A JARM hash sample taken from a server.'}),
 
+                    ('inet:service:platform:type:taxonomy', ('taxonomy', {}), {
+                        'interfaces': ('meta:taxonomy',),
+                        'doc': 'A service platform type taxonomy.'}),
+
                     ('inet:service:platform', ('guid', {}), {
                         'doc': 'A network platform which provides services.'}),
 
+                    ('inet:service:agent', ('guid', {}), {
+                        'interfaces': ('inet:service:object',),
+                        'template': {'service:base': 'agent'},
+                        'doc': 'An instance of a deployed agent or software integration which is part of the service architecture.'}),
+
                     ('inet:service:app', ('guid', {}), {
                         'interfaces': ('inet:service:object',),
                         'template': {'service:base': 'application'},
-                        'doc': 'An application which is part of a service architecture.'}),
+                        'deprecated': True,
+                        'doc': 'Deprecated. Please use inet:service:agent for autonomous agents.'}),
 
                     ('inet:service:instance', ('guid', {}), {
                         'doc': 'An instance of the platform such as Slack or Discord instances.'}),
@@ -1795,7 +1805,8 @@ class InetModule(s_module.CoreModule):
                                 'doc': 'The service account which removed or decommissioned the {service:base}.'}),
 
                             ('app', ('inet:service:app', {}), {
-                                'doc': 'The app which contains the {service:base}.'}),
+                                'deprecated': True,
+                                'doc': 'Deprecated. Objects are no longer scoped to an application or agent.'}),
                         ),
                     }),
 
@@ -1816,7 +1827,11 @@ class InetModule(s_module.CoreModule):
                         'props': (
 
                             ('app', ('inet:service:app', {}), {
-                                'doc': 'The app which handled the action.'}),
+                                'deprecated': True,
+                                'doc': 'Deprecated. Please use :agent / inet:service:agent.'}),
+
+                            ('agent', ('inet:service:agent', {}), {
+                                'doc': 'The service agent which performed the action potentially on behalf of an account.'}),
 
                             ('time', ('time', {}), {
                                 'doc': 'The time that the account initiated the action.'}),
@@ -1851,8 +1866,12 @@ class InetModule(s_module.CoreModule):
                             ('client:host', ('it:host', {}), {
                                 'doc': 'The client host which initiated the action.'}),
 
+                            ('client:software', ('it:prod:softver', {}), {
+                                'doc': 'The client software used to initiate the action.'}),
+
                             ('client:app', ('inet:service:app', {}), {
-                                'doc': 'The client service app which initiated the action.'}),
+                                'deprecated': True,
+                                'doc': 'Deprecated. Please use :client:software.'}),
 
                             ('server', ('inet:server', {}), {
                                 'doc': 'The network address of the server which handled the action.'}),
@@ -3698,6 +3717,8 @@ class InetModule(s_module.CoreModule):
                             'ro': True,
                             'doc': 'The x509 certificate sent by the client.'})
                     )),
+
+                    ('inet:service:platform:type:taxonomy', {}, ()),
                     ('inet:service:platform', {}, (
 
                         ('id', ('str', {'strip': True}), {
@@ -3732,6 +3753,12 @@ class InetModule(s_module.CoreModule):
                             'disp': {'hint': 'text'},
                             'doc': 'A description of the service platform.'}),
 
+                        ('type', ('inet:service:platform:type:taxonomy', {}), {
+                            'doc': 'The type of service platform.'}),
+
+                        ('family', ('str', {'onespace': True, 'lower': True}), {
+                            'doc': 'A family designation for use with instanced platforms such as Slack, Discord, or Mastodon.'}),
+
                         ('parent', ('inet:service:platform', {}), {
                             'doc': 'A parent platform which owns this platform.'}),
 
@@ -3752,6 +3779,9 @@ class InetModule(s_module.CoreModule):
 
                         ('provider:name', ('ou:name', {}), {
                             'doc': 'The name of the organization which operates the platform.'}),
+
+                        ('software', ('it:prod:softver', {}), {
+                            'doc': 'The latest known software version that the platform is running.'}),
                     )),
 
                     ('inet:service:instance', {}, (
@@ -3791,7 +3821,8 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The tenant which contains the instance.'}),
 
                         ('app', ('inet:service:app', {}), {
-                            'doc': 'The app which contains the instance.'}),
+                            'deprecated': True,
+                            'doc': 'Deprecated. Instances are no longer scoped to applications.'}),
                     )),
 
                     ('inet:service:app', {}, (
@@ -3816,6 +3847,25 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The name of the organization which provides the application.'}),
                     )),
 
+                    ('inet:service:agent', {}, (
+
+                        ('name', ('str', {'lower': True, 'onespace': True}), {
+                            'alts': ('names',),
+                            'doc': 'The name of the service agent instance.'}),
+
+                        ('names', ('array', {'type': 'str',
+                                             'typeopts': {'onespace': True, 'lower': True},
+                                             'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of alternate names for the service agent instance.'}),
+
+                        ('desc', ('str', {}), {
+                            'disp': {'hint': 'text'},
+                            'doc': 'A description of the deployed service agent instance.'}),
+
+                        ('software', ('it:prod:softver', {}), {
+                            'doc': 'The latest known software version running on the service agent instance.'}),
+                    )),
+
                     ('inet:service:account', {}, (
 
                         ('user', ('inet:user', {}), {
@@ -3911,6 +3961,9 @@ class InetModule(s_module.CoreModule):
 
                     ('inet:service:login', {}, (
 
+                        ('url', ('inet:url', {}), {
+                            'doc': 'The URL of the login endpoint used for this login attempt.'}),
+
                         ('method', ('inet:service:login:method:taxonomy', {}), {
                             'doc': 'The type of authentication used for the login. For example "password" or "multifactor.sms".'}),
 

synapse/models/infotech.py

@@ -803,6 +803,9 @@ class ItModule(s_module.CoreModule):
                 ('it:dev:repo:diff', ('guid', {}), {
                     'doc': 'A diff of a file being applied in a single commit.',
                 }),
+                ('it:dev:repo:entry', ('guid', {}), {
+                    'doc': 'A file included in a repository.',
+                }),
                 ('it:dev:repo:issue:label', ('guid', {}), {
                     'interfaces': ('inet:service:object',),
                     'template': {'service:base': 'repository issue label'},
@@ -1119,6 +1122,10 @@ class ItModule(s_module.CoreModule):
                     'doc': 'The YARA rule is intended for use in detecting the target node.'}),
                 (('it:dev:repo', 'has', 'inet:url'), {
                     'doc': 'The repo has content hosted at the URL.'}),
+                (('it:dev:repo:commit', 'has', 'it:dev:repo:entry'), {
+                    'doc': 'The file entry is present in the commit version of the repository.'}),
+                (('it:log:event', 'about', None), {
+                    'doc': 'The it:log:event is about the target node.'}),
             ),
             'forms': (
                 ('it:hostname', {}, ()),
@@ -2001,6 +2008,17 @@ class ItModule(s_module.CoreModule):
                         'doc': 'The URL where the diff is hosted.'}),
                 )),
 
+                ('it:dev:repo:entry', {}, (
+
+                    ('repo', ('it:dev:repo', {}), {
+                        'doc': 'The repository which contains the file.'}),
+
+                    ('file', ('file:bytes', {}), {
+                        'doc': 'The file which the repository contains.'}),
+
+                    ('path', ('file:path', {}), {
+                        'doc': 'The path to the file in the repository.'}),
+                )),
                 ('it:dev:repo:issue', {}, (
 
                     ('repo', ('it:dev:repo', {}), {

synapse/tests/test_cortex.py

@@ -9093,3 +9093,116 @@ class CortexBasicTest(s_t_utils.SynTest):
         async with self.getRegrCore('2.213.0-queue-authgates') as core:
             self.nn(await core.getAuthGate('queue:stillhere'))
             self.none(await core.getAuthGate('queue:authtest'))
+
+    async def test_cortex_prop_copy(self):
+        async with self.getTestCore() as core:
+            q = '[test:arrayprop=(ap0,) :strs=(foo, bar, baz)]'
+            self.len(1, await core.nodes(q))
+
+            q = 'test:arrayprop=(ap0,) $l=:strs $r=$l.rem(baz) return(($r, $l))'
+            valu = await core.callStorm(q)
+            self.true(valu[0])
+            self.sorteq(valu[1], ['foo', 'bar'])
+
+            # modifying the property value shouldn't update the node
+            nodes = await core.nodes('test:arrayprop=(ap0,) $l=:strs $l.rem(baz)')
+            self.len(1, nodes)
+            self.sorteq(nodes[0].get('strs'), ['foo', 'bar', 'baz'])
+
+            data = {
+                'str': 'strval',
+                'int': 1,
+                'dict': {'dictkey': 'dictval'},
+                'list': ('listval0', 'listval1'),
+                'tuple': ('tupleval0', 'tupleval1'),
+            }
+
+            opts = {
+                'vars': {
+                    'data': data,
+                }
+            }
+            q = '''
+                [ test:guid=(d0,)
+                    :data=$data
+                    :comp=(1, foo)
+                    :mutcomp=(foo, (1, 2, 3))
+                ]
+            '''
+            self.len(1, await core.nodes(q, opts=opts))
+
+            q = '''
+                test:guid=(d0,)
+                $d=:data
+                $d.list.rem(listval0)
+                $d.str = foo
+                $d.int = ($d.int + 1)
+                $d.dict.foo = bar
+                $d.tuple.append(tupleval2)
+                return($d)
+            '''
+            valu = await core.callStorm(q)
+            self.eq(valu, {
+                    'str': 'foo',
+                    'int': 2,
+                    'dict': {'dictkey': 'dictval', 'foo': 'bar'},
+                    'list': ('listval1',),
+                    'tuple': ('tupleval0', 'tupleval1', 'tupleval2'),
+            })
+
+            # modifying the property value shouldn't update the node
+            q = '''
+                test:guid=(d0,)
+                $d=:data
+                $d.dict = $lib.undef
+            '''
+            nodes = await core.nodes(q)
+            self.len(1, nodes)
+            self.eq(nodes[0].get('data')['dict'], {'dictkey': 'dictval'})
+
+            q = '''
+                test:guid=(d0,)
+                $c=:comp
+                $c.rem((1))
+                $m=:mutcomp
+                $m.1.rem((3))
+                return(($c, :comp, $m, :mutcomp))
+            '''
+            valu = await core.callStorm(q)
+            self.eq(valu, (
+                (1, 'foo'),
+                (1, 'foo'),
+                ('foo', (1, 2)),
+                ('foo', (1, 2, 3)),
+            ))
+
+            # Nodeprops could have mutable types in them so make sure modifying
+            # them doesn't cause modifications to the node
+            q = '''
+                $data = { test:guid=(d0,) return(:data) }
+                [ test:str=foobar :baz=(test:guid:data, $data) ]
+                ($prop, $valu) = :baz
+                $valu.list.rem(listval0)
+                return((:baz, $valu))
+            '''
+            valu = await core.callStorm(q)
+
+            exp = {
+                'str': 'strval',
+                'int': 1,
+                'dict': {'dictkey': 'dictval'},
+                'list': ('listval1',),
+                'tuple': ('tupleval0', 'tupleval1'),
+            }
+
+            self.eq(valu, (('test:guid:data', data), exp))
+
+            # Make sure $node.props aren't modifiable either
+            nodes = await core.nodes('test:str=foobar $node.props.baz.1.list.rem(listval0)')
+            self.len(1, nodes)
+            self.eq(nodes[0].get('baz'), ('test:guid:data', data))
+
+            # Dereferencing mutable types from $node.props should
+            # return mutable instances without mutating the original prop valu
+            valu = await core.callStorm('test:str=foobar ($prop, $valu) = :baz $valu.list.rem(listval0) return((:baz, $valu))')
+            self.eq(valu, (('test:guid:data', data), exp))

synapse/tests/test_lib_agenda.py

@@ -295,7 +295,7 @@ class AgendaTest(s_t_utils.SynTest):
 
                 # Cancel the Wednesday/Friday appt
                 await agenda.delete(guid)
-                await self.asyncraises(s_exc.NoSuchIden, agenda.delete(b'1234'))
+                await self.asyncraises(s_exc.NoSuchIden, agenda.delete('1234'))
 
                 # Then Dec 25
                 unixtime = datetime.datetime(year=2018, month=12, day=25, hour=10, minute=16, tzinfo=tz.utc).timestamp()
@@ -1205,32 +1205,6 @@ class AgendaTest(s_t_utils.SynTest):
                     self.false(cron01[0].get('isrunning'))
                     self.eq(cron01[0].get('lasterrs')[0], 'aborted')
 
-    async def test_agenda_clear_running_none_nexttime(self):
-
-        async with self.getTestCore() as core:
-
-            cdef = {
-                'creator': core.auth.rootuser.iden,
-                'iden': s_common.guid(),
-                'storm': '$lib.log.info("test")',
-                'reqs': {},
-                'incunit': 'minute',
-                'incvals': 1
-            }
-            await core.addCronJob(cdef)
-
-            appt = core.agenda.appts[cdef['iden']]
-            self.true(appt in core.agenda.apptheap)
-
-            appt.isrunning = True
-            appt.nexttime = None
-
-            await core.agenda.clearRunningStatus()
-            self.false(appt in core.agenda.apptheap)
-
-            crons = await core.callStorm('return($lib.cron.list())')
-            self.len(1, crons)
-
     async def test_agenda_lasterrs(self):
 
         async with self.getTestCore() as core:
@@ -1262,3 +1236,142 @@ class AgendaTest(s_t_utils.SynTest):
             appt = await core.agenda.get('test')
             self.true(isinstance(appt.lasterrs, list))
             self.eq(appt.lasterrs, ['error1', 'error2'])
+
+    async def test_cron_at_mirror_cleanup(self):
+
+        with self.getTestDir() as dirn:
+
+            dirn00 = s_common.genpath(dirn, 'core00')
+            dirn01 = s_common.genpath(dirn, 'core01')
+
+            async with self.getTestAha() as aha:
+
+                conf = {'aha:provision': await aha.addAhaSvcProv('00.cortex')}
+                core00 = await aha.enter_context(self.getTestCore(conf=conf, dirn=dirn00))
+
+                conf = {'aha:provision': await aha.addAhaSvcProv('01.cortex', {'mirror': 'cortex'})}
+                core01 = await aha.enter_context(self.getTestCore(conf=conf, dirn=dirn01))
+
+                msgs = await core00.stormlist('cron.at --minute +1 { $lib.log.info(cronran) }')
+                await core01.sync()
+
+                with self.getAsyncLoggerStream('synapse.storm.log', 'cronran') as stream:
+                    core00.agenda._addTickOff(60)
+                    self.true(await stream.wait(timeout=12))
+
+                await core01.sync()
+
+                # appt.recs should be cleared on both leader and mirror
+                appt = list(core00.agenda.appts.values())[0]
+                self.len(0, appt.recs)
+
+                appt = list(core01.agenda.appts.values())[0]
+                self.len(0, appt.recs)
+
+                # apptheap should also now be empty on both
+                self.len(0, core00.agenda.apptheap)
+                self.len(0, core01.agenda.apptheap)
+
+                await core00.fini()
+                core00 = await aha.enter_context(self.getTestCore(dirn=dirn00))
+
+                await core01.fini()
+                core01 = await aha.enter_context(self.getTestCore(dirn=dirn01))
+
+                # Job still exists on leader and mirror, wasn't removed due to being invalid
+                cron00 = await core00.listCronJobs()
+                cron01 = await core01.listCronJobs()
+                self.len(1, cron00)
+                self.eq(cron00, cron01)
+
+                await core00.delCronJob(cron00[0]['iden'])
+
+                # Add a job that is past due that will be deleted on startup
+                xmas = {'dayofmonth': 25, 'month': 12, 'year': 2099}
+                cdef = {'creator': core00.auth.rootuser.iden,
+                        'storm': '#happyholidays',
+                        'reqs': (xmas,)}
+                guid = s_common.guid()
+                cdef['iden'] = guid
+
+                await core00.addCronJob(cdef)
+                await core01.sync()
+
+                # Move the year back to the past
+                apptdef = core01.agenda.apptdefs.get(guid)
+                apptdef['recs'][0][0]['year'] = 1999
+
+                core00.agenda.apptdefs.set(guid, apptdef)
+                core01.agenda.apptdefs.set(guid, apptdef)
+
+                with self.getAsyncLoggerStream('synapse.lib.agenda', 'This appointment will be removed') as stream:
+                    await core01.fini()
+                    core01 = await aha.enter_context(self.getTestCore(dirn=dirn01))
+                    self.true(await stream.wait(timeout=12))
+
+                # Mirror warns about the invalid appointment but does not remove it
+                self.nn(core01.agenda.apptdefs.get(guid))
+                self.nn(await core01.getAuthGate(guid))
+
+                with self.getAsyncLoggerStream('synapse.lib.agenda', 'Removing invalid appointment') as stream:
+                    await core00.fini()
+                    core00 = await aha.enter_context(self.getTestCore(dirn=dirn00))
+                    self.true(await stream.wait(timeout=12))
+
+                await core01.sync()
+
+                # Leader removes the appointment via delCronJob which cleans up properly
+                self.none(core00.agenda.apptdefs.get(guid))
+                self.none(core01.agenda.apptdefs.get(guid))
+
+                self.none(await core00.getAuthGate(guid))
+                self.none(await core01.getAuthGate(guid))
+
+                # Add a job with iden mismatch for coverage
+                cdef = {'creator': core00.auth.rootuser.iden,
+                        'storm': '#happyholidays',
+                        'reqs': (xmas,)}
+                guid = s_common.guid()
+                cdef['iden'] = guid
+
+                await core00.addCronJob(cdef)
+                await core01.sync()
+
+                apptdef = core01.agenda.apptdefs.get(guid)
+                apptdef['iden'] = s_common.guid()
+
+                core00.agenda.apptdefs.set(guid, apptdef)
+                core01.agenda.apptdefs.set(guid, apptdef)
+
+                with self.getAsyncLoggerStream('synapse.lib.agenda', 'Removing invalid appointment') as stream:
+                    await core00.fini()
+                    core00 = await aha.enter_context(self.getTestCore(dirn=dirn00))
+
+                    await core01.fini()
+                    core01 = await aha.enter_context(self.getTestCore(dirn=dirn01))
+                    self.true(await stream.wait(timeout=12))
+
+                await core01.sync()
+
+                self.none(core00.agenda.apptdefs.get(guid))
+                self.none(core01.agenda.apptdefs.get(guid))
+
+                with self.getAsyncLoggerStream('synapse.storm.log', 'I AM A ERROR') as stream:
+                    q = "cron.at --now ${ while((true)) { $lib.log.error('I AM A ERROR') $lib.time.sleep(6) }  }"
+                    await core00.nodes(q)
+                    self.true(await stream.wait(timeout=12))
+                await core01.sync()
+
+                await core01.promote(graceful=True)
+                await core00.sync()
+
+                cron00 = await core00.listCronJobs()
+                cron01 = await core01.listCronJobs()
+
+                self.len(1, cron00)
+                self.false(cron00[0].get('isrunning'))
+                self.eq(cron00[0].get('lasterrs')[0], 'aborted')
+                self.eq(cron00, cron01)
+
+                self.len(0, core00.agenda.apptheap)
+                self.len(0, core01.agenda.apptheap)

synapse/tests/test_lib_lmdbslab.py

@@ -369,7 +369,9 @@ class LmdbSlabTest(s_t_utils.SynTest):
                 'vm.dirty_expire_centisecs',
                 'vm.dirty_writeback_centisecs',
                 'vm.dirty_background_ratio',
+                'vm.dirty_background_bytes',
                 'vm.dirty_ratio',
+                'vm.dirty_bytes',
             ], msgs[0].get('sysctls', {}).keys())
 
     async def test_lmdbslab_commit_over_max_xactops(self):

synapse/tests/test_lib_platforms_linux.py

@@ -60,3 +60,7 @@ class LinuxTest(s_t_utils.SynTest):
         self.isinstance(ret, dict)
         self.isin('vm.swappiness', ret)
         self.isinstance(ret['vm.swappiness'], int)
+        self.isin('vm.dirty_bytes', ret)
+        self.isinstance(ret['vm.dirty_bytes'], int)
+        self.isin('vm.dirty_background_bytes', ret)
+        self.isinstance(ret['vm.dirty_background_bytes'], int)

synapse/tests/test_lib_storm.py

@@ -1095,6 +1095,9 @@ class StormTest(s_t_utils.SynTest):
 
             await visi.addRule((True, ('storm', 'asroot', 'cmd', 'asroot', 'yep')))
 
+            msgs = await core.stormlist('asroot.yep', opts=opts)
+            self.stormIsInWarn('Command (asroot.yep) requires asroot permission which is deprecated', msgs)
+
             nodes = await core.nodes('asroot.yep', opts=opts)
             self.len(1, nodes)
             self.eq('false', nodes[0].ndef[1])
@@ -1184,6 +1187,9 @@ class StormTest(s_t_utils.SynTest):
             await visi.addRule((True, ('storm', 'asroot', 'mod', 'foo')))
             self.len(1, await core.nodes('yield $lib.import(foo.baz).lol()', opts=opts))
 
+            msgs = await core.stormlist('$lib.import(foo.bar)')
+            self.stormIsInWarn('Module (foo.bar) requires asroot permission but does not specify any asroot:perms', msgs)
+
             # coverage for dyncall/dyniter with asroot...
             await core.nodes('$lib.import(foo.bar).dyncall()', opts=opts)
             await core.nodes('$lib.import(foo.bar).dyniter()', opts=opts)

synapse/tests/test_lib_stormlib_aha.py

@@ -341,13 +341,13 @@ Connection information:
 
                 async def mockCellInfo():
                     return {
-                        'cell': {'ready': True, 'nexsindx': 10, 'uplink': None},
+                        'cell': {'ready': True, 'nexsindx': 10, 'active': True},
                         'synapse': {'verstring': '2.190.0'},
                     }
 
                 async def mockOutOfSyncCellInfo():
                     return {
-                        'cell': {'ready': True, 'nexsindx': 5, 'uplink': cell00.iden},
+                        'cell': {'ready': True, 'nexsindx': 5, 'active': False},
                         'synapse': {'verstring': '2.190.0'},
                     }
 
@@ -378,6 +378,10 @@ Connection information:
                         msgs = await core00.stormlist('aha.svc.mirror --timeout 1')
                         self.stormIsInPrint('Group Status: Out of Sync', msgs)
 
+                await cell01.nexsroot.client.fini()
+                msgs = await core00.stormlist('aha.svc.mirror')
+                self.stormIsInPrint('follower', msgs)
+
                 await aha.delAhaSvc('00.cell', network='synapse')
                 msgs = await core00.stormlist('aha.svc.mirror')
                 self.stormNotInPrint('Service Mirror Groups:', msgs)

synapse/tests/test_model_inet.py

@@ -2999,17 +2999,21 @@ class InetModelTest(s_t_utils.SynTest):
                 :names=("slack chat",)
                 :parent={[ inet:service:platform=({"name": "salesforce"}) ]}
                 :status=available
+                :family="  FooFam  "
                 :period=(2022, 2023)
                 :creator={[ inet:service:account=({"id": "bar"}) ]}
                 :remover={[ inet:service:account=({"id": "baz"}) ]}
                 :provider={ ou:org:name=$provname }
                 :provider:name=$provname
+                :type=foo.bar
             ]
             '''
             nodes = await core.nodes(q, opts=opts)
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('inet:service:platform', s_common.guid(('slack',))))
             self.eq('foo', nodes[0].get('id'))
+            self.eq('foo.bar.', nodes[0].get('type'))
+            self.eq('foofam', nodes[0].get('family'))
             self.eq(nodes[0].get('url'), 'https://slack.com')
             self.eq(nodes[0].get('urls'), ('https://slacker.com',))
             self.eq(nodes[0].get('zones'), ('slack.com', 'slacker.com'))
@@ -3039,6 +3043,9 @@ class InetModelTest(s_t_utils.SynTest):
             nodes = await core.nodes('[ inet:service:platform=({"zone": "slacker.com"}) ]')
             self.eq(nodes[0].ndef, platform.ndef)
 
+            nodes = await core.nodes('inet:service:platform:type:taxonomy')
+            self.sorteq(['foo.', 'foo.bar.'], [n.ndef[1] for n in nodes])
+
             q = '''
             [ inet:service:instance=(vertex, slack)
                 :id='T2XK1223Y'
@@ -3193,6 +3200,7 @@ class InetModelTest(s_t_utils.SynTest):
             q = '''
             [ inet:service:login=*
                 :method=password
+                :url=https://vertex.link/api/v1/login
                 :session=$blcksess
                 :server=tcp://10.10.10.4:443
                 :client=tcp://192.168.0.10:12345
@@ -3202,6 +3210,7 @@ class InetModelTest(s_t_utils.SynTest):
             nodes = await core.nodes(q, opts=opts)
             self.len(1, nodes)
             self.eq(nodes[0].get('method'), 'password.')
+            self.eq(nodes[0].get('url'), 'https://vertex.link/api/v1/login')
 
             server = await core.nodes('inet:server=tcp://10.10.10.4:443')
             self.len(1, server)
@@ -3561,6 +3570,28 @@ class InetModelTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('inet:service:subscription :pay:instrument -> econ:bank:account'))
             self.len(1, await core.nodes('inet:service:subscription :subscriber -> inet:service:tenant'))
 
+            nodes = await core.nodes('''
+                [ inet:service:agent=*
+                    :name=woot
+                    :names=(foo, bar)
+                    :desc="Foo Bar"
+                    :software={[ it:prod:softver=(hehe, haha) ]}
+                    :platform={inet:service:platform | limit 1}
+
+                    // ensure we got the interface...
+                    :creator={ inet:service:account | limit 1 }
+                ]
+            ''')
+            self.len(1, nodes)
+            self.eq(nodes[0].get('name'), 'woot')
+            self.eq(nodes[0].get('names'), ('bar', 'foo'))
+            self.eq(nodes[0].get('desc'), 'Foo Bar')
+            self.nn(nodes[0].get('creator'))
+            self.nn(nodes[0].get('platform'))
+
+            self.len(1, await core.nodes('inet:service:action | limit 1 | [ :agent={ inet:service:agent } ]'))
+            self.len(1, await core.nodes('inet:service:platform | limit 1 | [ :software={[ it:prod:softver=(hehe, haha) ]} ]'))
+
     async def test_model_inet_tls_ja4(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_model_infotech.py

@@ -2163,6 +2163,20 @@ class InfotechModelTest(s_t_utils.SynTest):
             self.eq(node.get('url'),
                     'https://github.com/vertexproject/synapse/commit/03c71e723bceedb38ef8fc14543c30b9e82e64cf')
 
+            nodes = await core.nodes('''
+                [ it:dev:repo:entry=*
+                    :repo={it:dev:repo | limit 1}
+                    :file=*
+                    :path=foo/bar/baz.exe
+                    <(has)+ { it:dev:repo:commit | limit 1 }
+                ]
+            ''')
+            self.nn(nodes[0].get('file'))
+            self.nn(nodes[0].get('repo'))
+            self.eq(nodes[0].get('path'), 'foo/bar/baz.exe')
+
+            self.len(1, await core.nodes('it:dev:repo:entry <(has)- it:dev:repo:commit'))
+
             props = {
                 'commit': commit,
                 'file': file,
@@ -2306,7 +2320,7 @@ class InfotechModelTest(s_t_utils.SynTest):
             self.len(2, nodes)
 
             nodes = await core.nodes('it:dev:repo <- *')
-            self.len(4, nodes)
+            self.len(5, nodes)
 
             nodes = await core.nodes('it:dev:repo:commit')
             self.len(3, nodes)

synapse/tests/test_tools_aha.py

@@ -273,13 +273,13 @@ class AhaToolsTest(s_t_utils.SynTest):
 
             async def mockCellInfo():
                 return {
-                    'cell': {'ready': True, 'nexsindx': 10, 'uplink': None},
+                    'cell': {'ready': True, 'nexsindx': 10, 'active': True},
                     'synapse': {'verstring': s_version.verstring},
                 }
 
             async def mockOutOfSyncCellInfo():
                 return {
-                    'cell': {'ready': True, 'nexsindx': 5, 'uplink': cell00.iden},
+                    'cell': {'ready': True, 'nexsindx': 5, 'active': False},
                     'synapse': {'verstring': s_version.verstring},
                 }
 

synapse/tests/utils.py

@@ -341,6 +341,10 @@ testmodel = {
             ('foo', 'test:int'),
             ('bar', ('str', {'lower': True}),),
         )}), {'doc': 'A complex comp type.'}),
+        ('test:mutcomp', ('comp', {'fields': (
+            ('str', 'str'),
+            ('list', 'array'))
+        }), {'doc': 'A mutable comp type.'}),
         ('test:hexa', ('hex', {}), {'doc': 'anysize test hex type.'}),
         ('test:hex4', ('hex', {'size': 4}), {'doc': 'size 4 test hex type.'}),
         ('test:hexpad', ('hex', {'size': 8, 'zeropad': True}), {'doc': 'size 8 test hex type, zero padded.'}),
@@ -420,6 +424,11 @@ testmodel = {
             ('bar', ('str', {'lower': 1}), {'ro': True})
         )),
 
+        ('test:mutcomp', {}, (
+            ('str', ('str', {}), {'ro': True}),
+            ('list', ('array', {'type': 'int'}), {'ro': True}),
+        )),
+
         ('test:int', {}, (
             ('loc', ('loc', {}), {}),
             ('int2', ('int', {}), {}),
@@ -441,6 +450,9 @@ testmodel = {
             ('size', ('test:int', {}), {}),
             ('name', ('test:str', {}), {}),
             ('tick', ('test:time', {}), {}),
+            ('data', ('data', {}), {}),
+            ('comp', ('test:comp', {}), {}),
+            ('mutcomp', ('test:mutcomp', {}), {}),
             ('posneg', ('test:sub', {}), {}),
             ('posneg:isbig', ('bool', {}), {}),
         )),

synapse/tools/aha/mirror.py

@@ -45,7 +45,7 @@ def build_status_list(members, cell_infos):
             cell_info = info.get('cell', {})
             status.update({
                 'nexs_indx': cell_info.get('nexsindx', 0),
-                'role': 'follower' if cell_info.get('uplink') else 'leader',
+                'role': 'leader' if cell_info.get('active') else 'follower',
                 'version': str(info.get('cell', {}).get('verstring', '')),
                 'synapse': str(info.get('synapse', {}).get('verstring', '')),
                 'online': 'True',

{synapse-2.225.0.dist-info → synapse-2.226.0.dist-info}/METADATA

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

{synapse-2.225.0.dist-info → synapse-2.226.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ synapse/__init__.py,sha256=R2kOXlF5j-8m6G0JkHuN7rXRPg_tHLmbMxr__94mHQk,1145
 synapse/axon.py,sha256=tHt1FQH-hLZFFh8NpANFRx0n7LJjSFY3sWhFt0_pvDo,66457
 synapse/cells.py,sha256=eNvdglfAoTURVhGOLGcgMXCGpfsIX1a02SQnyiklo3E,308
 synapse/common.py,sha256=h2ZPK9xNnKcZ4uOxfGzfr70OnzP3ldZZojM8ZAev7kA,37895
-synapse/cortex.py,sha256=XuInelqcWjR8dF-5NKF4RwlCcDZ1pEz0lFQFOzw1Qtg,274705
+synapse/cortex.py,sha256=uL50glDaj2QQgxPX0XOhScJBi4nTolXlUwnzSoComSM,274667
 synapse/cryotank.py,sha256=C747V7mCSmLUMwy3niEPl6_4wuXaYKHJdm5wB-o1MMQ,12202
 synapse/daemon.py,sha256=CllFBFGcZ8aI5jOmAu-7AQRXExjhojmq4saUE7uFOAQ,17171
 synapse/datamodel.py,sha256=aoxZlYbp4QevIwMC_JkdzFUXq_d302Cy2q6z5_jEqpI,40347
@@ -87,9 +87,9 @@ synapse/data/lark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 synapse/data/lark/imap.lark,sha256=LpPhhbI_oYjSYn30gL5q9kZVSWR4LT48OFDu1UdiF48,237
 synapse/data/lark/storm.lark,sha256=Q72SAVH49o4z8Wnlhp__sInEdi2xHiYMm2kCHH-0E2o,27436
 synapse/lib/__init__.py,sha256=qLS7nt8-Iot8jnD2Xss_6wZi5lJoyv2rqxF9kkektT0,129
-synapse/lib/agenda.py,sha256=v3g6LC7lD9i1V5sngnmpw9AYZTar6LwBu1or2qQ8QXc,34429
+synapse/lib/agenda.py,sha256=rSVsQXA5ozWjPDvhhx8qS-3GoXDdOBjN3bKv2fslKbw,35027
 synapse/lib/aha.py,sha256=FZC-NjEBN4QFdzOo1ENbRnJu_z0cBuZt7n8NRqbFYBg,56471
-synapse/lib/ast.py,sha256=il04TkWo1NIPzzGUAa1deUFHNkACuvIXWzQXq54Mi7I,166877
+synapse/lib/ast.py,sha256=hT7ug77ovEdGHebWUu8Te5bipwwraL5YD0t4YX-RPA8,166393
 synapse/lib/auth.py,sha256=B7-Ji3MzPlW6pvRNtb0ciJKDru54QC-_yvznGraZCJs,54400
 synapse/lib/autodoc.py,sha256=tM2OCPrV7yeth8Cx-wx-_VXBmBfzJS52vaubg_7BqCI,23217
 synapse/lib/base.py,sha256=yJVfv7SiZhnzAP9LWKHlFOsY_l6ztUDNtt2TDT22U4Q,23422
@@ -144,12 +144,12 @@ synapse/lib/slaboffs.py,sha256=Fd0RrIRBMjh159aQz5y1ONmzw0NvV040kVX_jZjQW6I,815
 synapse/lib/slabseqn.py,sha256=sKQJJeTq40QOC4n8nz_ZVfJsh8ee3O37d2w-U9vzuFo,11167
 synapse/lib/snap.py,sha256=3yG69MYqbju8eROoW65cAlwt-ksL7FYPN9ezxp-UL3o,64871
 synapse/lib/spooled.py,sha256=BQHIW-qZvEcvhEf8PpXhbDDGzq1go4TH63D6kn-1anM,6021
-synapse/lib/storm.py,sha256=bjLKLs3Tr7gUzHNYzYjJJquLuAb-Yp9sjneniOMfoXg,201026
+synapse/lib/storm.py,sha256=yNgGeQx1o3quHUxh1sWA1QAtlYRrRS_8oP0iYFETrlc,201501
 synapse/lib/storm_format.py,sha256=9cE8WNPYTcqgRakIqkmIQzOr16Hqbj_sM1QabHug3i0,4908
 synapse/lib/stormctrl.py,sha256=3UC2LOHClC17JwYNuo8NeyntuAvIXphjenXEzVP33mY,2523
 synapse/lib/stormhttp.py,sha256=D5xINUnGYwtWoBpstgW4PkDYEz0xibVlWQWZgG-DljM,29073
 synapse/lib/stormsvc.py,sha256=FURIsQUVNJmY8Z5TmhTF1O__DGXPiVg5pUiOoPM8r3g,7573
-synapse/lib/stormtypes.py,sha256=eAUuHxnWzy75V5KLmo-39J7O5RBiPWWsgrwy9qPLwaE,412164
+synapse/lib/stormtypes.py,sha256=OnVSwCUPZIuXKgSUxEpc3iyvrHCi03Wkwx-NbGI0m5w,412568
 synapse/lib/stormwhois.py,sha256=w7N2oCyMljNvi_sRt_bZb5BJwWwYkVGcRd7H_0oHY8Q,2554
 synapse/lib/structlog.py,sha256=v5MK5jtJIRSF-E4y4fQuzEVKmbocu8ByFLDTY8Ybjpk,1336
 synapse/lib/task.py,sha256=LVVM7Yr0VPUihIH6N_CrMHm3GHZR3bu-dw05SkG8zFE,6267
@@ -158,9 +158,9 @@ synapse/lib/thisplat.py,sha256=kQhj9Iy97zKHCnaxFSBoSnKabfza9vjpg9m6V7w-Xt4,417
 synapse/lib/threads.py,sha256=TSsC7ryXm_CbM0LQMsvk1vYV4iyvarzWzH59TrUzKuo,164
 synapse/lib/time.py,sha256=bk_1F6_MDuCWJ1ToPJ-XHkeTWVw5b4SE7cCixBqVxXo,9435
 synapse/lib/trigger.py,sha256=jxNZRcCw5OLpugyQOo64vIigisTDzDk7feWEfazBMwk,20985
-synapse/lib/types.py,sha256=0ILS8netSELraSJu1YfPyQf3P-bVbevYkVzSC-WigsU,70917
+synapse/lib/types.py,sha256=iMt5DKm7TMWxIf4IqYnbmjA9WQ5ydlXh4LwF4TmQX9w,71395
 synapse/lib/urlhelp.py,sha256=ljhnF91z9ihyOLdZZ6OoQYCN1WYjOj1imukD45xiKU0,3320
-synapse/lib/version.py,sha256=q1o5iz0LK07Od-DqDJ45tuqXPp3xqIQ6sVAZHWL5fak,7162
+synapse/lib/version.py,sha256=OqHEpXCuInFPjwoyDQE1BIqdV3HEU8s0eTLGx8YI0Sk,7162
 synapse/lib/view.py,sha256=yzN5MKN9A4NMeVrB_ZSIIFAoVygNXni27F2S4-QhTZQ,63301
 synapse/lib/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/lib/crypto/coin.py,sha256=_dhlkzIrHT8BvHdJOWK7PDThz3sK3dDRnWAUqjRpZJc,4910
@@ -172,10 +172,10 @@ synapse/lib/platforms/__init__.py,sha256=-_SwKehr4TtKgiEjUMPpJFiH3VucpGrVkqBmk-y
 synapse/lib/platforms/common.py,sha256=7D_PFtU5K-80G7f1ePPlWjavoYEDP3oJt36DxDVYJRw,1165
 synapse/lib/platforms/darwin.py,sha256=2Q5ohUyVLpZiVpZ1dHqDCOnI69_OnEFQIevPRzaDKFg,150
 synapse/lib/platforms/freebsd.py,sha256=0lJNc9W5a5TWfsz734o30gtF3vS3BH8QXWvy04pz1pY,149
-synapse/lib/platforms/linux.py,sha256=VBUn_tf7PYGgfBXDBBNfE16QBGWstSkuV2l4LXX0dvQ,8002
+synapse/lib/platforms/linux.py,sha256=LaBhGUrUUT7PO9V3ri9QHE2VetH1khAZAqXz13sgg6c,8146
 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=jHEI2XPRm_pI-EdF7OtSn64lpk4hg1IHCNNxuVrh_Gs,34493
+synapse/lib/stormlib/aha.py,sha256=tJd7i_ORA1WeVwI1GTCw7yBOiXjcSA683EZN3ebHnuo,34493
 synapse/lib/stormlib/auth.py,sha256=y0CrB7ws8vfk0WNxg7EEoPF1HMgd_A0BwjDsLCNI8N8,92939
 synapse/lib/stormlib/backup.py,sha256=-cR7lR9IRib-e0uMRV1oKVfdJJ3PYbowtwtH0i3mOtY,2846
 synapse/lib/stormlib/basex.py,sha256=BHnThzA7xv_wBaoxO3sVjjPGgS7K5PMXyGrFFQzmX2Y,2638
@@ -232,7 +232,7 @@ synapse/lookup/phonenum.py,sha256=TQb1Q6KvQb3Gs_kgiHcCjSOZ0hpYBhI7qUYcddj-Uic,16
 synapse/lookup/timezones.py,sha256=5_XejZyjbXMX0OHyVyiqVMiNYOMk6vlZ83ANCwO1z0A,996
 synapse/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/models/auth.py,sha256=G7QGVB99fjtG1UUness9eRAJuAYKfoAkiOUSkxPOylo,3097
-synapse/models/base.py,sha256=SXsAq1svfkJIL6D_dNgY4fw-KwS2xgdTSQSCpra6gaU,19616
+synapse/models/base.py,sha256=57KsKJI_jpTgejB8khf0LHZb08Q_iMnPuEHzRwdF-Qo,19738
 synapse/models/belief.py,sha256=lB61Wvp2cgaPlrwqBU2JTU-BOutAVOEKD597sTu0juo,2928
 synapse/models/biz.py,sha256=01i9qnxrWwWt712dNUCAOHqdL1N0TY84P1utx_O5G8g,14909
 synapse/models/crypto.py,sha256=dEgg3n6cY1hiBfnL8QbgJW7hQw-DWOKhbLWkq4hyXzQ,30160
@@ -243,8 +243,8 @@ synapse/models/entity.py,sha256=loHKByGwv2xyz6cYWWUpwk12mxWNzC06BKgDgWfX6ek,1617
 synapse/models/files.py,sha256=H_149eOWirYEPvFxDjhxQkc4VInocifcjQMmjGvtR3U,34444
 synapse/models/geopol.py,sha256=1DGxLJ60QlnSIe3WxxViYQ3KFSwm89vvGc534bbSNBo,11304
 synapse/models/geospace.py,sha256=Ix54xGdGRZNqLI0r6r9OA1t6vqB3XM1lkoy86Vjt5XA,21155
-synapse/models/inet.py,sha256=_4KrAV68rs9t1wtTzUzZxyV9gobJuRrEVAlnNB1IvPc,183315
-synapse/models/infotech.py,sha256=IfxcD3Ap9W4jrBGkI55kej6UOdnTE2ZL3dH4R9f3MbI,155406
+synapse/models/inet.py,sha256=A3Aq-xSewpBoA2naybXnIV2sc9RuR2U_dkRl20X0TYk,186268
+synapse/models/infotech.py,sha256=4X1h3l5DmzDJ8k2BjriuEaj8JncLVdLthBBALVCu5a4,156288
 synapse/models/language.py,sha256=hBVVIf5kc_FSIV7HZhWnberoc9ssxuqeff4fqC9iz4o,3640
 synapse/models/material.py,sha256=UvmnBEkbhBbdbnvWtTlgGJAJlKDrx9E-YSQ3K49ws5M,5405
 synapse/models/math.py,sha256=5zDLSwGbOcWI6T5-KspPL20sR8Bcs59pnRK2nEELzss,1775
@@ -277,7 +277,7 @@ synapse/tests/test_cmds_boss.py,sha256=SdBwM2qJHFzzfrjWYiZOLBKeye8uru7KeJ3NU_YSk
 synapse/tests/test_cmds_cortex.py,sha256=hVe4xxp14vFHbJywnWxFLkDvbxyc_XHBcP6HOUA85Ag,17187
 synapse/tests/test_cmds_hive.py,sha256=YospZkpYj3kjSFxpY_BwSbWLSU200AX1uYJzgi_wtb4,5904
 synapse/tests/test_common.py,sha256=viVCDLV7PbyFSNDzc-9kYJzkfYzia03SFrnkcn2aBBk,17376
-synapse/tests/test_cortex.py,sha256=H7oX8FEqD9VHep6m6S4_UYomuDODM7qShgBplAgrLr4,383626
+synapse/tests/test_cortex.py,sha256=ZpHaLZ4tSR0TBAWr0r1-HeXrO3asYUGObV0TR4bmVIU,387658
 synapse/tests/test_cryotank.py,sha256=ms2VkL0aUskMi-LArTzRt8LUYw0z_y8nQfOOBDiCkvI,12027
 synapse/tests/test_daemon.py,sha256=uwb3dK8Xx-49EAjxKCjLY0nXZwiE-GNKmc5spzxV5z0,7729
 synapse/tests/test_data.py,sha256=f8L-q6kpMq8XPG3hq1jwlyaFRQEinSBf7ZlsRFeCuoM,196
@@ -285,7 +285,7 @@ synapse/tests/test_datamodel.py,sha256=G1-BYTuiyLYQ5phrh2zfYaCCU8WPs5Gqvs7idsGV5
 synapse/tests/test_exc.py,sha256=Ado2J8SPImNXbKRKSsnq6pkHlKKksSZaETgBmdXsi-A,2181
 synapse/tests/test_glob.py,sha256=cSNrtEKWLsZXRhsjxQjRjjMqdgqfpl05yT4S53dC0NU,249
 synapse/tests/test_init.py,sha256=rHqYBVL_aFf1HO6zCF5akHVcHUP2g1kpJLRdTkV0yys,557
-synapse/tests/test_lib_agenda.py,sha256=YT-eVKMa2y_Y5aeDw5WKv9FSRMFq4OqtLUtPC80AzSU,57233
+synapse/tests/test_lib_agenda.py,sha256=_qiuxNM8oOD34-m9Uh_p6-Crpl2qKbCIU_BKhnbHmQI,62355
 synapse/tests/test_lib_aha.py,sha256=5cvDDPVfYxrZXSvDY2LMgPxlFmh3fYHC7BUF6L0sCs8,73522
 synapse/tests/test_lib_ast.py,sha256=Jl05O0yZ4YqBo-Pjo2isBvt33-MFzQhNum7MbO66bZc,194372
 synapse/tests/test_lib_auth.py,sha256=sjollaFisSeI6-PUYGuX1E0VSHt2_so1flHZ1U087aI,45127
@@ -319,7 +319,7 @@ synapse/tests/test_lib_json.py,sha256=RY9uyXknqiM4w1O5aC2bOJfzMBZHmhbFZ7XabjhvT_
 synapse/tests/test_lib_jsonstor.py,sha256=nGHM2MW8ih6p_JQEMhV-2T2oqJgGkdMGeRLQtPlhBSA,7864
 synapse/tests/test_lib_layer.py,sha256=l7q6PPKHAdX6ve_DScrs4yHZ-tSiZ-Sw0GtkS-pMZHA,101373
 synapse/tests/test_lib_link.py,sha256=JZZi3mt9k3dvIvLtRDNdzoVcmxet2bhmhrk8m4LB5hg,10311
-synapse/tests/test_lib_lmdbslab.py,sha256=2R80A17AoErvrt5cW5KattFlAdQrxMXzG02o82uD5So,67693
+synapse/tests/test_lib_lmdbslab.py,sha256=jFXCYBwJpPEKjTlAbekOvXCni0_tZQqk0qZsFjiL8cM,67772
 synapse/tests/test_lib_modelrev.py,sha256=DK9ueo4WCUFagGFBP2xqEHvLqA9gnQLdbJTuKQmJs5k,81055
 synapse/tests/test_lib_module.py,sha256=h2OyCW4HW-ZFiJBNQtZ-sPLjsnrlLdTFHQPaXpA8cds,3923
 synapse/tests/test_lib_msgpack.py,sha256=_cS-Kzap6InQstBH0nCgFj9HoVO_tB2dj7D2zCa2miU,10056
@@ -327,7 +327,7 @@ synapse/tests/test_lib_multislabseqn.py,sha256=nV9MMqq152FVECEsAoIFdn7Cke2Bi6DGF
 synapse/tests/test_lib_nexus.py,sha256=jSI6HeNE0-Azsf955X3UqOS7ZJrd9bsZl4JpqtKIXkU,17704
 synapse/tests/test_lib_node.py,sha256=ZSDVVcsKOI8wmTBCwz7zse0Dr5FflOXcbp0n7V26FCA,24733
 synapse/tests/test_lib_output.py,sha256=iYt3DSEVvJiolIUkGKhATYqHbSk-N92swIr4p6lmzl0,603
-synapse/tests/test_lib_platforms_linux.py,sha256=MgafTw5hq1ld9sKLREqf3LnmINk4Kdhz589jvE5NC0M,2556
+synapse/tests/test_lib_platforms_linux.py,sha256=f_9Spcvmja6KBh57opFIFBayCih7cRcQgan2Kmb4iyU,2764
 synapse/tests/test_lib_queue.py,sha256=pr1dTeBcu4zVD9p0li1PvgH3XTiXZ4oPQm2ibAXXMpg,829
 synapse/tests/test_lib_ratelimit.py,sha256=2aH3KodVGOEkxbe0hZ1RAQ4p6waF1tueSZP9h_QNya0,415
 synapse/tests/test_lib_reflect.py,sha256=C2GMXUPm705p2ySLRpICWZUNB-oo4NiluT6XU_gY_jA,3104
@@ -338,11 +338,11 @@ synapse/tests/test_lib_slaboffs.py,sha256=FHQ8mGZ27dGqVwGk6q2UJ4gkPRZN22eIVzS8hM
 synapse/tests/test_lib_slabseqn.py,sha256=Jup5xuUJUMrFSvQSFVWqZoDa_9J2p8Zc41DHhQigzFo,6314
 synapse/tests/test_lib_snap.py,sha256=OviJtj9N5LhBV-56TySkWvRly7f8VH9d-VBcNFLAtmg,27805
 synapse/tests/test_lib_spooled.py,sha256=Ki9UnzTPUtw7devwN_M0a8uwOst81fGQtGSVqSSh1u8,4002
-synapse/tests/test_lib_storm.py,sha256=nc6qX1eg3huB1r7wKATxZqVngF2mtb1qCal-0TwsSik,264149
+synapse/tests/test_lib_storm.py,sha256=3809AuNX5ztCCVx_MARBOh9B86zFUUIEAAkfV7aV59c,264510
 synapse/tests/test_lib_storm_format.py,sha256=tEZgQMmKAeG8FQZE5HUjOT7bnKawVTpNaVQh_3Wa630,277
 synapse/tests/test_lib_stormctrl.py,sha256=1vY7PGjgmz3AibgSiGcp_G4NSYl9YNifWdjPB0CDf1g,2877
 synapse/tests/test_lib_stormhttp.py,sha256=eR9dESCl5NRdJuZJpzk5t4HQHZ4D8YE5HQGkJwQGWQE,46709
-synapse/tests/test_lib_stormlib_aha.py,sha256=XhBokRnanwe2vWZf0PcwyZgJE3mu-7V4xKNhFf7Go4U,17782
+synapse/tests/test_lib_stormlib_aha.py,sha256=OixDfD6stMx2KrsNhfE3dJaTiY9vK0GOw2ZWCSeuchE,17947
 synapse/tests/test_lib_stormlib_auth.py,sha256=8JvqF8InTU8KTuUQTfnPUce9780UdKwXuiTRwcoN99k,65628
 synapse/tests/test_lib_stormlib_backup.py,sha256=3ZYE3swQ4A8aYJyVueFXzbekCdoKMC7jsHLoq0hTKGI,1644
 synapse/tests/test_lib_stormlib_basex.py,sha256=DDOsH3XDR8MdJ1uj5avyqnFqBnlaIu8L5stX61jqKrw,2049
@@ -414,8 +414,8 @@ synapse/tests/test_model_geospace.py,sha256=8ATsx662mrcKzurMpQGbshnQPYOWqO7wxOWp
 synapse/tests/test_model_gov_cn.py,sha256=FnfKNM_wnvmScLm4cYFSQXZ21kVaTPPDusiCD79awBA,675
 synapse/tests/test_model_gov_intl.py,sha256=mHYK056C2R0aDH-5-TnUxtH0ZlKnEOoSd9ODIMasmow,780
 synapse/tests/test_model_gov_us.py,sha256=kvZ9DudBrbKtZmqGm8X-b_IOw4oJ7XZMnvTgiDkzsrY,1525
-synapse/tests/test_model_inet.py,sha256=Nql6o0NBoJw-GKcJxkXFyR9Dxe-BIG2kDnVaVoJoU_A,162389
-synapse/tests/test_model_infotech.py,sha256=Haf6au6ZX97cZF5x4fm5c5vbQDuloWRHkTvVYu-CPJ8,115679
+synapse/tests/test_model_inet.py,sha256=gK-gEp1nNkq6xIUdT-GumkOcV8tZnwvWl_PkB01Sp3I,163839
+synapse/tests/test_model_infotech.py,sha256=qNqsD7tmZct6rDTCOK7T1nByWOr8eHmndC-32fxF3Lc,116211
 synapse/tests/test_model_language.py,sha256=49stF1B8_EwWJB67Xa5VXCG563Zfbr6S85iKN9Iom48,3046
 synapse/tests/test_model_material.py,sha256=Hkd8BJh6FdQE0RuFMV2NO6fGqw9kOCb5AeIuTYtwCEM,2723
 synapse/tests/test_model_math.py,sha256=x-rHBfm-59ueZdHXXzSi53eshldvVURoJeLeexWTL2U,826
@@ -435,7 +435,7 @@ synapse/tests/test_servers_cryotank.py,sha256=vDxTcF4mUP5QQyf3xD-PKXRsYD0EvLknlk
 synapse/tests/test_servers_stemcell.py,sha256=TJabX5aQVLbGNLffiVd3B7Uj5dH12Y-0KqAW56GM0G8,2320
 synapse/tests/test_servers_univ.py,sha256=eXesifJL05IA91f5od-9bjuIDVhNWMdo8qWzaHEr22s,2704
 synapse/tests/test_telepath.py,sha256=SHfZYZy02yeiLqjpH1JEWcQ64tYVWFhCfdYUT4Vl1ao,50670
-synapse/tests/test_tools_aha.py,sha256=dWvXn8SJohZSjo2oFlXMH9cX9GynAb7USSBVv7K19Sg,16788
+synapse/tests/test_tools_aha.py,sha256=BSD4TZjhNfxToeMtvdbqSteeSWsfpquhjQ5yBelQJIk,16782
 synapse/tests/test_tools_axon_copy.py,sha256=Enkk2K7AnjOFqga1MyhEMyisNay4TOGaQTiD_ayITBQ,1326
 synapse/tests/test_tools_axon_dump_load.py,sha256=xbB2a5v7Gw2x47D-YoTALHLfbWCK-aew0qfuBZgsozI,14619
 synapse/tests/test_tools_axon_get.py,sha256=No5mwpOcxnS87q9YW17yejeB1yCKBa015i_LBA2kRdY,2029
@@ -472,7 +472,7 @@ synapse/tests/test_tools_utils_rstorm.py,sha256=lwc2jaxCkIlaytEmZJQKYlKgKxA3xM_0
 synapse/tests/test_utils.py,sha256=AUilgkkXARC-amyYuCHwlEsdYcq02UGb-NiVrXb4hUI,10810
 synapse/tests/test_utils_getrefs.py,sha256=Cv0LT0DF-tCGwBmOXsYUVNIJdXQA73yRBgdSWxFL3oA,2623
 synapse/tests/test_utils_stormcov.py,sha256=H9p1vFH8kNE6qMLrGzSV0eH7KOgdZFh7QuarFe47FtU,6149
-synapse/tests/utils.py,sha256=evn6XG7TMWS7j4oxoXcILjSjoISxKg3jSK5pMSLuvAc,79579
+synapse/tests/utils.py,sha256=ybInX0t5M1gWmGvPbLOm2s3Sje4FltdCnAFKBCWeSYo,80023
 synapse/tests/files/TestUtilsGetrefs.test_basics.yaml,sha256=Ch8cEGFYfDUCZTEvzAqW5Ir79OnYb49pq4i9OJ7K9T0,8257
 synapse/tests/files/__init__.py,sha256=G0DpSelVbC5S6PncHNL3QjgFvjCfaq7Kb1GgksJgEO4,1774
 synapse/tests/files/cpedata.json,sha256=e_wajnxn4ZClQ3-hwlOxK-2MWzLQwrqgtWVUV5dUVF4,13799445
@@ -577,7 +577,7 @@ synapse/tools/aha/clone.py,sha256=fGgcBWIPe1boRq2w1HdmfmR_ENG6ajuLDgLML-O3LSk,15
 synapse/tools/aha/easycert.py,sha256=79iiLOJva3IrzPcr4HZBGYT-xRZtcXGbkagXvzDqG9Y,3198
 synapse/tools/aha/enroll.py,sha256=8FDD_l7Y0j7PAi8P_8Pi4lrUgspPaOpKkjuHhXfgMgo,3235
 synapse/tools/aha/list.py,sha256=O0fiMBTHbyzxXD1FAZCYhGzqxjoMTT8pR_mpnlVBttU,2693
-synapse/tools/aha/mirror.py,sha256=MUewnOEzEmscSpKvn5psEyc1PYWMHSflybuWUI9CKIQ,8104
+synapse/tools/aha/mirror.py,sha256=Nm42ogs4whuGCQfVRnHIIpqMcLpV9rz3eo7oBlIRfDA,8104
 synapse/tools/aha/provision/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/tools/aha/provision/service.py,sha256=SMF4QzgXR2d_lu2K6hl6TGY7f1z7SrpNWNdIpHQVmMw,3152
 synapse/tools/aha/provision/user.py,sha256=0x_kUWaJuODcd91WhproP9bK7pU4qLOK55V44G40jT8,1786
@@ -678,8 +678,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.225.0.dist-info/licenses/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
-synapse-2.225.0.dist-info/METADATA,sha256=5DwPaHtRy7uA-LwxkV5TDB8oV-MdUhs0oQXpLPOAWWs,4583
-synapse-2.225.0.dist-info/WHEEL,sha256=cRWFNt_CJSuf6BnJKAdKunDXUJxjAbWvbt_kstDCs1I,93
-synapse-2.225.0.dist-info/top_level.txt,sha256=v_1YsqjmoSCzCKs7oIhzTNmWtSYoORiBMv1TJkOhx8A,8
-synapse-2.225.0.dist-info/RECORD,,
+synapse-2.226.0.dist-info/licenses/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
+synapse-2.226.0.dist-info/METADATA,sha256=QQur3odiibjhIJ8IpU-_vy9yaTo8cy_dglm5fJtrHko,4583
+synapse-2.226.0.dist-info/WHEEL,sha256=cRWFNt_CJSuf6BnJKAdKunDXUJxjAbWvbt_kstDCs1I,93
+synapse-2.226.0.dist-info/top_level.txt,sha256=v_1YsqjmoSCzCKs7oIhzTNmWtSYoORiBMv1TJkOhx8A,8
+synapse-2.226.0.dist-info/RECORD,,