synapse 2.223.0__py311-none-any.whl → 2.224.0__py311-none-any.whl

synapse/common.py

@@ -144,7 +144,7 @@ def flatten(item):
         item: The python primitive object to normalize.
 
     Notes:
-        Only None, bool, int, bytes, strings, lists, tuples and dictionaries are acceptable input.
+        Only None, bool, int, bytes, strings, floats, lists, tuples and dictionaries are acceptable input.
         List objects will be converted to tuples.
         Dictionary objects must have keys which can be sorted.
 
@@ -155,7 +155,7 @@ def flatten(item):
     if item is None:
         return None
 
-    if isinstance(item, (str, int, bytes)):
+    if isinstance(item, (str, int, bytes, float)):
         return item
 
     if isinstance(item, (tuple, list)):

synapse/cortex.py

@@ -464,6 +464,15 @@ class CoreApi(s_cell.CellApi):
         '''
         return await self.cell.getTypeNorm(name, valu, typeopts=typeopts)
 
+    async def addType(self, typename, basetype, typeopts, typeinfo):
+        '''
+        Add an extended type to the data model.
+
+        Extended types must begin with _
+        '''
+        self.user.confirm(('model', 'type', 'add', typename))
+        return await self.cell.addType(typename, basetype, typeopts, typeinfo)
+
     async def addForm(self, formname, basetype, typeopts, typeinfo):
         '''
         Add an extended form to the data model.
@@ -535,6 +544,15 @@ class CoreApi(s_cell.CellApi):
         self.user.confirm(('model', 'tagprop', 'del'))
         return await self.cell.delTagProp(name)
 
+    async def addEdge(self, edge, edgeinfo):
+        '''
+        Add an extended edge definition to the data model.
+
+        Extended edge definitions must use a verb which begins with _
+        '''
+        self.user.confirm(('model', 'edge', 'add'))
+        return await self.cell.addEdge(edge, edgeinfo)
+
     async def addStormPkg(self, pkgdef, verify=False):
         self.user.confirm(('pkg', 'add'))
         return await self.cell.addStormPkg(pkgdef, verify=verify)
@@ -1440,6 +1458,11 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             {'perm': ('model', 'univ', 'del'), 'gate': 'cortex',
              'desc': 'Controls access to deleting extended model universal properties and values.'},
 
+            {'perm': ('model', 'edge', 'add'), 'gate': 'cortex',
+             'desc': 'Controls access to adding extended model edges.'},
+            {'perm': ('model', 'edge', 'del'), 'gate': 'cortex',
+             'desc': 'Controls access to deleting extended model edges.'},
+
             {'perm': ('node',), 'gate': 'layer',
              'desc': 'Controls all node edits in a layer.'},
             {'perm': ('node', 'add'), 'gate': 'layer',
@@ -2568,6 +2591,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         ctor.pkgname = cdef.get('pkgname')
         ctor.svciden = cdef.get('cmdconf', {}).get('svciden', '')
         ctor.forms = cdef.get('forms', {})
+        ctor.deprecated = cdef.get('deprecated', {})
 
         def getStorNode(form):
             ndef = (form.name, form.type.norm(cdef.get('name'))[0])
@@ -2596,6 +2620,18 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             if ctor.pkgname:
                 props['package'] = ctor.pkgname
 
+            if ctor.deprecated:
+                props['deprecated'] = True
+
+                if (eolvers := ctor.deprecated.get('eolvers')) is not None:
+                    props['deprecated:version'] = eolvers
+
+                if (eoldate := ctor.deprecated.get('eoldate')) is not None:
+                    props['deprecated:date'] = eoldate
+
+                if (mesg := ctor.deprecated.get('mesg')) is not None:
+                    props['deprecated:mesg'] = mesg
+
             pnorms = {}
             for prop, valu in props.items():
                 formprop = form.props.get(prop)
@@ -3662,6 +3698,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         return True
 
+    @s_cell.from_leader
     async def addUnivProp(self, name, tdef, info):
         if not isinstance(tdef, tuple):
             mesg = 'Universal property type definitions should be a tuple.'
@@ -3676,6 +3713,8 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             mesg = 'ext univ name must start with "_"'
             raise s_exc.BadPropDef(name=name, mesg=mesg)
 
+        self.model.getTypeClone(tdef)
+
         base = '.' + name
         if base in self.model.props:
             raise s_exc.DupPropName(mesg=f'Cannot add duplicate universal property {base}',
@@ -3697,6 +3736,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         if univ:
             await self.feedBeholder('model:univ:add', univ.pack())
 
+    @s_cell.from_leader
     async def addForm(self, formname, basetype, typeopts, typeinfo):
         if not isinstance(typeopts, dict):
             mesg = 'Form type options should be a dict.'
@@ -3718,6 +3758,8 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             mesg = f'Type already exists: {formname}'
             raise s_exc.DupTypeName.init(formname)
 
+        self.model.getTypeClone((basetype, typeopts))
+
         return await self._push('model:form:add', formname, basetype, typeopts, typeinfo)
 
     @s_nexus.Pusher.onPush('model:form:add')
@@ -3772,6 +3814,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         await self.fire('core:extmodel:change', form=formname, act='del', type='form')
         await self.feedBeholder('model:form:del', {'form': formname})
 
+    @s_cell.from_leader
     async def addType(self, typename, basetype, typeopts, typeinfo):
         if not isinstance(typeopts, dict):
             mesg = 'Type options should be a dict.'
@@ -3840,6 +3883,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         await self.fire('core:extmodel:change', name=typename, act='del', type='type')
         await self.feedBeholder('model:type:del', {'type': typename})
 
+    @s_cell.from_leader
     async def addFormProp(self, form, prop, tdef, info):
         if not isinstance(tdef, tuple):
             mesg = 'Form property type definitions should be a tuple.'
@@ -3858,6 +3902,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         if _form.prop(prop):
             raise s_exc.DupPropName(mesg=f'Cannot add duplicate form prop {form} {prop}',
                                      form=form, prop=prop)
+
+        self.model.getTypeClone(tdef)
+
         await self._push('model:prop:add', form, prop, tdef, info)
 
     @s_nexus.Pusher.onPush('model:prop:add')
@@ -4039,6 +4086,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         await self.fire('core:extmodel:change', name=prop, act='del', type='univ')
         await self.feedBeholder('model:univ:del', {'prop': univname})
 
+    @s_cell.from_leader
     async def addTagProp(self, name, tdef, info):
         if not isinstance(tdef, tuple):
             mesg = 'Tag property type definitions should be a tuple.'
@@ -4051,6 +4099,8 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         if self.exttagprops.get(name) is not None:
             raise s_exc.DupPropName(name=name)
 
+        self.model.getTypeClone(tdef)
+
         return await self._push('model:tagprop:add', name, tdef, info)
 
     @s_nexus.Pusher.onPush('model:tagprop:add')
@@ -4088,6 +4138,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         await self.fire('core:tagprop:change', name=name, act='del')
         await self.feedBeholder('model:tagprop:del', {'tagprop': name})
 
+    @s_cell.from_leader
     async def addEdge(self, edge, edgeinfo):
         if not isinstance(edgeinfo, dict):
             mesg = 'Edge info should be a dict.'
@@ -4667,6 +4718,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             s_stormlib_macro,
             s_stormlib_model,
             s_stormlib_pkg,
+            s_stormlib_task,
             s_stormlib_vault,
         ]
 
@@ -4674,9 +4726,6 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             for cdef in cmod.stormcmds:
                 await self._trySetStormCmd(cdef.get('name'), cdef)
 
-        for cdef in s_stormlib_task.stormcmds:
-            await self._trySetStormCmd(cdef.get('name'), cdef)
-
     async def _initPureStormCmds(self):
         oldcmds = []
         for name, cdef in self.cmddefs.items():

synapse/datamodel.py

@@ -738,7 +738,7 @@ class Model:
 
         base = self.types.get(typedef[0])
         if base is None:
-            raise s_exc.NoSuchType(name=typedef[0])
+            raise s_exc.NoSuchType.init(typedef[0])
 
         return base.clone(typedef[1])
 

synapse/lib/layer.py

@@ -127,7 +127,7 @@ class LayerApi(s_cell.CellApi):
         Scan the full layer and yield artificial nodeedit sets.
         '''
 
-        if not self.allowed(self.liftperm):
+        if not await self.allowed(self.liftperm):
             await self._reqUserAllowed(self.readperm)
         async for item in self.layr.iterLayerNodeEdits():
             yield item
@@ -167,14 +167,14 @@ class LayerApi(s_cell.CellApi):
 
         Once caught up with storage, yield them in realtime.
         '''
-        if not self.allowed(self.liftperm):
+        if not await self.allowed(self.liftperm):
             await self._reqUserAllowed(self.readperm)
         async for item in self.layr.syncNodeEdits(offs, wait=wait, reverse=reverse):
             yield item
             await asyncio.sleep(0)
 
     async def syncNodeEdits2(self, offs, wait=True):
-        if not self.allowed(self.liftperm):
+        if not await self.allowed(self.liftperm):
             await self._reqUserAllowed(self.readperm)
         async for item in self.layr.syncNodeEdits2(offs, wait=wait):
             yield item
@@ -184,7 +184,7 @@ class LayerApi(s_cell.CellApi):
         '''
         Returns what will be the *next* nodeedit log index.
         '''
-        if not self.allowed(self.liftperm):
+        if not await self.allowed(self.liftperm):
             await self._reqUserAllowed(self.readperm)
         return await self.layr.getEditIndx()
 
@@ -192,12 +192,12 @@ class LayerApi(s_cell.CellApi):
         '''
         Return the total number of (edits, meta) pairs in the layer changelog.
         '''
-        if not self.allowed(self.liftperm):
+        if not await self.allowed(self.liftperm):
             await self._reqUserAllowed(self.readperm)
         return await self.layr.getEditSize()
 
     async def getIden(self):
-        if not self.allowed(self.liftperm):
+        if not await self.allowed(self.liftperm):
             await self._reqUserAllowed(self.readperm)
         return self.layr.iden
 

synapse/lib/schemas.py

@@ -954,6 +954,7 @@ _reqValidPkgdefSchema = {
                     'items': {'type': 'array',
                         'items': {'type': 'string'}},
                 },
+                'deprecated': {'$ref': '#/definitions/deprecatedItem'},
             },
             'additionalProperties': True,
             'required': ['name', 'storm']
@@ -980,6 +981,7 @@ _reqValidPkgdefSchema = {
                             'type': 'string',
                             'enum': s_msgpack.deepcopy(datamodel_basetypes),
                         },
+                        'deprecated': {'$ref': '#/definitions/deprecatedItem'},
                     },
                 }
             ],

synapse/lib/storm.py

@@ -932,6 +932,7 @@ stormcmds = (
     },
     {
         'name': 'ps.list',
+        'deprecated': {'eolvers': 'v3.0.0', 'mesg': 'Use ``task.list`` instead.'},
         'descr': 'List running tasks in the cortex.',
         'cmdargs': (
             ('--verbose', {'default': False, 'action': 'store_true', 'help': 'Enable verbose output.'}),
@@ -958,6 +959,7 @@ stormcmds = (
     },
     {
         'name': 'ps.kill',
+        'deprecated': {'eolvers': 'v3.0.0', 'mesg': 'Use ``task.kill`` instead.'},
         'descr': 'Kill a running task/query within the cortex.',
         'cmdargs': (
             ('iden', {'help': 'Any prefix that matches exactly one valid process iden is accepted.'}),
@@ -1111,6 +1113,16 @@ stormcmds = (
     },
 )
 
+def deprmesg(name, depritem):
+    if (mesg := depritem.get('mesg')) is not None:
+        return f'"{name}" is deprecated: {mesg}'
+
+    if (eolvers := depritem.get('eolvers')) is not None:
+        return f'"{name}" is deprecated and will be removed in {eolvers}.'
+
+    eoldate = depritem.get('eoldate')
+    return f'"{name}" is deprecated and will be removed on {eoldate}.'
+
 @s_cache.memoize(size=1024)
 def queryhash(text):
     return s_common.queryhash(text)
@@ -1906,6 +1918,7 @@ class Parser:
         self.root = root
         self.exited = False
         self.mesgs = []
+        self.deprs = {}
 
         self.optargs = {}
         self.posargs = []
@@ -1931,7 +1944,7 @@ class Parser:
 
         choices = opts.get('choices')
         if choices is not None and opts.get('action') in ('store_true', 'store_false'):
-            mesg = f'Argument choices are not supported when action is store_true or store_false'
+            mesg = 'Argument choices are not supported when action is store_true or store_false'
             raise s_exc.BadArg(mesg=mesg, argtype=str(argtype))
 
         dest = self._get_dest(names)
@@ -1988,6 +2001,9 @@ class Parser:
 
             dest = argdef.get('dest')
 
+            if (deprecated := argdef.get('deprecated')) is not None:
+                self.deprs[item] = deprecated
+
             oact = argdef.get('action', 'store')
             if oact == 'store_true':
                 opts[dest] = True
@@ -2177,6 +2193,12 @@ class Parser:
 
         self._printf(f'Usage: {self.prog} [options] {posargs}')
 
+        if self.cdef is not None and (deprecated := self.cdef.get('deprecated')) is not None:
+            dmsg = deprmesg(self.prog, deprecated)
+            self._printf('')
+            self._printf(f'Deprecated: {dmsg}')
+            self._printf('')
+
         if self.cdef is not None and (endpoints := self.cdef.get('endpoints')):
             self._printf('')
             self._printf('Endpoints:')
@@ -2286,6 +2308,10 @@ class Parser:
         wrap_first = self._wrap_text(first, wrap_w)
         self._printf(f'{base:<{base_w-2}}: {wrap_first[0]}')
 
+        if (deprecated := argdef.get('deprecated')) is not None:
+            mesg = deprmesg(names[0], deprecated)
+            self._printf(f'{"":<{base_w-2}}  Deprecated: {mesg}')
+
         for ln in wrap_first[1:]: self._printf(f'{"":<{base_w}}{ln}')
         for ln in helplst[1:]:
             lead_s = len(ln) - len(ln.lstrip())
@@ -2401,6 +2427,10 @@ class Cmd:
         except s_exc.BadSyntax:  # pragma: no cover
             pass
 
+        for item, depr in self.pars.deprs.items():
+            mesg = deprmesg(item, depr)
+            await self.runt.snap.warnonce(mesg)
+
         for line in self.pars.mesgs:
             await self.runt.snap.printf(line)
 
@@ -2522,6 +2552,10 @@ class PureCmd(Cmd):
             }
         }
 
+        if (deprecated := self.cdef.get('deprecated')) is not None:
+            mesg = deprmesg(name, deprecated)
+            await self.runt.warnonce(mesg)
+
         if self.runtsafe:
             data = {'pathvars': {}}
             async def genx():

synapse/lib/stormlib/imap.py

@@ -526,14 +526,22 @@ class ImapLib(s_stormtypes.Lib):
 
         try:
             imap = await s_common.wait_for(coro, timeout)
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise s_exc.TimeOut(mesg='Timed out waiting for IMAP server hello.') from None
 
         async def fini():
-            async def _logout():
-                await s_common.wait_for(imap.logout(), 5)
+            async def imapfini():
+                if imap.isfini:
+                    return
+
+                try:
+                    await s_common.wait_for(imap.logout(), 5)
+                except TimeoutError:
+                    pass # pragma: no cover
+
                 await imap.fini()
-            s_coro.create_task(_logout())
+
+            self.runt.snap.core.schedCoro(imapfini())
 
         self.runt.snap.onfini(fini)
 

synapse/lib/stormlib/task.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 
 import synapse.exc as s_exc

synapse/lib/stormtypes.py

@@ -1910,6 +1910,7 @@ class LibPs(Lib):
          'type': {'type': 'function', '_funcname': '_list',
                   'returns': {'type': 'list', 'desc': 'A list of task definitions.', }}},
     )
+    _storm_lib_deprecation = {'eolvers': 'v3.0.0', 'mesg': 'Use the corresponding ``$lib.task`` function.'}
     _storm_lib_path = ('ps',)
 
     def getObjLocals(self):
@@ -2968,7 +2969,13 @@ class LibTime(Lib):
 
                     storm> $now=$lib.time.now() $str=$lib.time.format($now, '%A %d, %B %Y') $lib.print($str)
 
-                    Tuesday 14, July 2020''',
+                    Tuesday 14, July 2020
+
+                Format a timestamp into a string using included format string::
+
+                    storm> $now=$lib.time.now() $str=$lib.time.format($now, $lib.time.formats.iso8601) $lib.print($str)
+
+                    2025-10-02T09:34:00Z''',
          'type': {'type': 'function', '_funcname': '_format',
                   'args': (
                       {'name': 'valu', 'type': 'int', 'desc': 'A timestamp in epoch milliseconds.', },
@@ -3103,6 +3110,10 @@ class LibTime(Lib):
                       {'name': 'timezone', 'desc': 'A timezone name. See python pytz docs for options.', 'type': 'str'},
                   ),
                   'returns': {'type': 'list', 'desc': 'An ($ok, $valu) tuple.', }}},
+        {'name': 'formats.iso8601', 'desc': 'ISO8601 time format string in UTC timezone (Z).', 'type': 'str'},
+        {'name': 'formats.iso8601us', 'desc': 'ISO8601 time format string (with microseconds) in UTC timezone (Z).', 'type': 'str'},
+        {'name': 'formats.rfc2822', 'desc': 'RFC 2822 time format string in UT timezone.', 'type': 'str'},
+        {'name': 'formats.synapse', 'desc': 'Synapse time format string.', 'type': 'str'},
     )
     _storm_lib_path = ('time',)
 
@@ -3127,6 +3138,13 @@ class LibTime(Lib):
             'dayofyear': self.dayofyear,
             'dayofmonth': self.dayofmonth,
             'monthofyear': self.monthofyear,
+
+            'formats': {
+                'iso8601': '%Y-%m-%dT%H:%M:%SZ',
+                'iso8601us': '%Y-%m-%dT%H:%M:%S.%fZ',
+                'rfc2822': '%d %b %Y %H:%M:%S UT',
+                'synapse': '%Y/%m/%d %H:%M:%S.%f',
+            },
         }
 
     @stormfunc(readonly=True)

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, 223, 0)
+version = (2, 224, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = 'b40e64b75fa2820856ad138b8ad9f8c4b6e9547e'
+commit = '7c6e619bf5fd9c5801891b489b11bbee7fdbebd0'

synapse/models/inet.py

@@ -3700,6 +3700,9 @@ class InetModule(s_module.CoreModule):
                     )),
                     ('inet:service:platform', {}, (
 
+                        ('id', ('str', {'strip': True}), {
+                            'doc': 'An ID which identifies the platform.'}),
+
                         ('url', ('inet:url', {}), {
                             'ex': 'https://twitter.com',
                             'alts': ('urls',),
@@ -3708,6 +3711,13 @@ class InetModule(s_module.CoreModule):
                         ('urls', ('array', {'type': 'inet:url', 'sorted': True, 'uniq': True}), {
                             'doc': 'An array of alternate URLs for the platform.'}),
 
+                        ('zone', ('inet:fqdn', {}), {
+                            'alts': ('zones',),
+                            'doc': 'The primary zone for the platform.'}),
+
+                        ('zones', ('array', {'type': 'inet:fqdn', 'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of alternate zones for the platform.'}),
+
                         ('name', ('str', {'onespace': True, 'lower': True}), {
                             'ex': 'twitter',
                             'alts': ('names',),
@@ -3722,6 +3732,21 @@ class InetModule(s_module.CoreModule):
                             'disp': {'hint': 'text'},
                             'doc': 'A description of the service platform.'}),
 
+                        ('parent', ('inet:service:platform', {}), {
+                            'doc': 'A parent platform which owns this platform.'}),
+
+                        ('status', ('inet:service:object:status', {}), {
+                            'doc': 'The status of the platform.'}),
+
+                        ('period', ('ival', {}), {
+                            'doc': 'The period when the platform existed.'}),
+
+                        ('creator', ('inet:service:account', {}), {
+                            'doc': 'The service account which created the platform.'}),
+
+                        ('remover', ('inet:service:account', {}), {
+                            'doc': 'The service account which removed or decommissioned the platform.'}),
+
                         ('provider', ('ou:org', {}), {
                             'doc': 'The organization which operates the platform.'}),
 

synapse/models/proj.py

@@ -166,6 +166,9 @@ class ProjectModule(s_module.CoreModule):
                         ('created', ('time', {}), {
                             'doc': 'The time the comment was added.'}),
 
+                        ('ext:creator', ('ps:contact', {}), {
+                            'doc': 'The contact information of the creator from an external system.'}),
+
                         ('updated', ('time', {'ismax': True}), {
                             'doc': 'The last time the comment was updated.'}),
 

synapse/models/risk.py

@@ -269,6 +269,9 @@ class RiskModule(s_module.CoreModule):
 
                 (('risk:outage', 'impacted', None), {
                     'doc': 'The outage event impacted the availability of the target node.'}),
+
+                (('risk:alert', 'about', None), {
+                    'doc': 'The alert is about the target node.'}),
             ),
             'forms': (
 
@@ -800,6 +803,9 @@ class RiskModule(s_module.CoreModule):
                     ('detected', ('time', {}), {
                         'doc': 'The time the alerted condition was detected.'}),
 
+                    ('updated', ('time', {}), {
+                        'doc': 'The time the alert was most recently modified.'}),
+
                     ('vuln', ('risk:vuln', {}), {
                         'doc': 'The optional vulnerability that the alert indicates.'}),
 

synapse/models/syn.py

@@ -365,6 +365,14 @@ class SynModule(s_module.CoreModule):
                     ('nodedata', ('array', {'type': 'syn:nodedata'}), {
                         'deprecated': True,
                         'doc': 'The list of nodedata that may be added by the command.', 'uniq': True, 'sorted': True, 'ro': True}),
+                    ('deprecated', ('bool', {}), {
+                        'doc': 'Set to true if this command is scheduled to be removed.'}),
+                    ('deprecated:version', ('it:semver', {}), {
+                        'doc': 'The Synapse version when this command will be removed.'}),
+                    ('deprecated:date', ('time', {}), {
+                        'doc': 'The date when this command will be removed.'}),
+                    ('deprecated:mesg', ('str', {}), {
+                        'doc': 'Optional description of this deprecation.'}),
                 )),
             ),
         }),)

synapse/tests/test_common.py

@@ -75,6 +75,10 @@ class CommonTest(s_t_utils.SynTest):
         self.ne('15c8a3727942fa01e04d6a7a525666a2', s_common.guid(item))
         self.eq('15c8a3727942fa01e04d6a7a525666a2', s_common.guid(s_common.flatten(item)))
 
+        item = {'foo': 'bar', 'baz': 10, 'gronk': True, 'hehe': ['ha', 'ha'], 'tupl': (1, 'two', 1.23), 'newp': None}
+        self.ne('02efa9b7612f371dbb65a596cd303d9a', s_common.guid(item))
+        self.eq('02efa9b7612f371dbb65a596cd303d9a', s_common.guid(s_common.flatten(item)))
+
     def test_common_vertup(self):
         self.eq(s_common.vertup('1.3.30'), (1, 3, 30))
         self.true(s_common.vertup('30.40.50') > (9, 0))

synapse/tests/test_cortex.py

@@ -6650,6 +6650,57 @@ class CortexBasicTest(s_t_utils.SynTest):
                     with self.raises(s_exc.BadPropDef):
                         await prox.addTagProp('_blah:blah^blah', ('int', {}), {})
 
+        # Mirrors on newer model versions should not be able to add extended model elements
+        # based on model elements the leader doesn't have
+        async with self.getTestAha() as aha:
+
+            conf = {'aha:provision': await aha.addAhaSvcProv('00.cortex')}
+            core00 = await aha.enter_context(self.getTestCore(conf=conf))
+
+            conf = {'aha:provision': await aha.addAhaSvcProv('01.cortex', {'mirror': 'cortex'})}
+            core01 = await aha.enter_context(self.getTestCore(conf=conf))
+
+            # Add a type directly to the mirror's model to simulate different model version
+            core01.model.addType('_newmodel:type', 'str', {}, {})
+
+            with self.raises(s_exc.NoSuchType):
+                await core01.addType('_test:type', '_newmodel:type', {}, {})
+
+            await core01.sync()
+            self.none(core01.model.type('_test:type'))
+
+            with self.raises(s_exc.NoSuchType):
+                await core01.addUnivProp('_woot', ('_newmodel:type', {}), {})
+
+            await core01.sync()
+            self.none(core01.model.prop('._woot'))
+
+            with self.raises(s_exc.NoSuchType):
+                await core01.addForm('_hehe:haha', '_newmodel:type', {}, {})
+
+            await core01.sync()
+            self.none(core01.model.form('_hehe:haha'))
+
+            with self.raises(s_exc.NoSuchType):
+                await core01.addFormProp('inet:asn', '_newer', ('_newmodel:type', {}), {})
+
+            await core01.sync()
+            self.none(core01.model.prop('inet:asn:_newer'))
+
+            with self.raises(s_exc.NoSuchType):
+                await core01.addTagProp('user', ('_newmodel:type', {}), {})
+
+            await core01.sync()
+            self.none(core01.model.tagprop('user'))
+
+            core01.model.addForm('_newmodel:type', {}, {})
+
+            with self.raises(s_exc.NoSuchForm):
+                await core01.addEdge(('_newmodel:type', '_foo', None), {})
+
+            await core01.sync()
+            self.none(core01.model.edge(('_newmodel:type', '_foo', None)))
+
     async def test_cortex_axon(self):
         async with self.getTestCore() as core:
             # By default, a cortex has a local Axon instance available

synapse/tests/test_lib_storm.py

@@ -4627,6 +4627,103 @@ class StormTest(s_t_utils.SynTest):
             self.stormIsInPrint('$lib.bytes.hashset`` has been deprecated and will be removed in version v3.0.0', msgs)
             self.stormIsInPrint('Use the corresponding ``$lib.axon`` function.', msgs)
 
+    async def test_storm_cmd_deprecations(self):
+
+        async with self.getTestCore() as core:
+
+            deprpkg = {
+                'name': 'testdepr',
+                'version': '0.0.1',
+                'synapse_version': '>=2.8.0,<3.0.0',
+                'commands': (
+                    {
+                        'name': 'deprmesg',
+                        'descr': 'deprecated command',
+                        'deprecated': {'eolvers': 'v3.0.0', 'mesg': 'Please use something else.'},
+                        'storm': '[ inet:ipv4=1.2.3.4 ]',
+                    },
+                    {
+                        'name': 'deprnomesg',
+                        'descr': 'deprecated command',
+                        'deprecated': {'eoldate': '2099-01-01'},
+                        'storm': '[ inet:ipv4=1.2.3.4 ]',
+                    },
+                    {
+                        'name': 'deprargs',
+                        'descr': 'deprecated command',
+                        'storm': '[ inet:ipv4=1.2.3.4 ]',
+                        'cmdargs': (
+                            ('--start-time', {
+                                'type': 'time',
+                                'deprecated': {'eolvers': 'v3.0.0', 'mesg': 'Use --period instead.'},
+                            }),
+                            ('--end-time', {
+                                'type': 'time',
+                                'deprecated': {'eolvers': 'v3.0.0'},
+                            }),
+                            ('--period', {
+                                'type': 'time',
+                            }),
+                        ),
+                    },
+                ),
+            }
+
+            self.none(await core.addStormPkg(deprpkg))
+
+            # Deprecation message shows up in command help
+            deprmesg = '"deprmesg" is deprecated: Please use something else.'
+            msgs = await core.stormlist('deprmesg -h')
+            self.stormIsInPrint(f'Deprecated: {deprmesg}', msgs)
+            self.stormHasNoWarnErr(msgs)
+
+            # Deprecation message shows up in command execution as warning
+            msgs = await core.stormlist('deprmesg')
+            self.stormIsInWarn(deprmesg, msgs)
+
+            # Deprecation message shows up in command help (with no message specified)
+            deprmesg = '"deprnomesg" is deprecated and will be removed on 2099-01-01.'
+            msgs = await core.stormlist('deprnomesg -h')
+            self.stormIsInPrint(f'Deprecated: {deprmesg}', msgs)
+            self.stormHasNoWarnErr(msgs)
+
+            # Deprecation message shows up in command execution as warning (with no message specified)
+            msgs = await core.stormlist('deprnomesg')
+            self.stormIsInWarn(deprmesg, msgs)
+
+            # Deprecation message shows up in help for command args
+            msgs = await core.stormlist('deprargs -h')
+            self.stormIsInPrint('  Deprecated: "--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormIsInPrint('  Deprecated: "--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+            self.stormHasNoWarnErr(msgs)
+
+            # Deprecation message doesn't show up in command execution when not using deprecated args
+            msgs = await core.stormlist('deprargs')
+            self.stormHasNoWarnErr(msgs)
+
+            # Deprecation message shows up in command execution as warning
+            msgs = await core.stormlist('deprargs --start-time now')
+            self.stormIsInWarn('"--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormNotInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+
+            msgs = await core.stormlist('deprargs --end-time now')
+            self.stormNotInWarn('"--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormIsInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+
+            msgs = await core.stormlist('deprargs --start-time now --end-time now')
+            self.stormIsInWarn('"--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormIsInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+
+            # Deprecation message only appears once per runtime
+            msgs = await core.stormlist('[ inet:ipv4=10.0.0.0/28 ] | deprmesg')
+            self.stormIsInWarn('"deprmesg" is deprecated: Please use something else.', msgs)
+            self.len(1, [m for m in msgs if m[0] == 'warn'])
+
+            msgs = await core.stormlist('[ inet:ipv4=10.0.0.0/28 ] | deprargs --start-time now --end-time now')
+            self.stormIsInWarn('"--start-time" is deprecated: Use --period instead.', msgs)
+            self.stormIsInWarn('"--end-time" is deprecated and will be removed in v3.0.0.', msgs)
+            self.len(2, [m for m in msgs if m[0] == 'warn'])
+
     async def test_liftby_edge(self):
         async with self.getTestCore() as core:
 

synapse/tests/test_lib_stormlib_imap.py

@@ -445,6 +445,8 @@ class ImapTest(s_test.SynTest):
 
         while not link.isfini:
             mesg = await link.rx()
+            if mesg is None:
+                break
 
             # Receive commands from client
             command = mesg.get('command')
@@ -854,6 +856,8 @@ class ImapTest(s_test.SynTest):
                 self.stormIsInErr('Cannot process EXPUNGE command.', mesgs)
 
             imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+            core.onfini(imap)
+
             await imap.login('user01@vertex.link', 'spaces lol')
             await imap.select('INBOX')
             self.eq(
@@ -868,6 +872,8 @@ class ImapTest(s_test.SynTest):
 
             # Normal response
             imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+            core.onfini(imap)
+
             await imap.login(user, 'pass00')
             await imap.select('INBOX')
             ret = await imap.uid_fetch('1', '(RFC822 BODY[HEADER])')
@@ -884,6 +890,8 @@ class ImapTest(s_test.SynTest):
 
             # Normal response
             imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+            core.onfini(imap)
+
             await imap.login(user, 'pass00')
             self.eq(
                 await imap.logout(),
@@ -897,6 +905,8 @@ class ImapTest(s_test.SynTest):
 
             with mock.patch.object(IMAPServer, 'logout', logout_no):
                 imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+                core.onfini(imap)
+
                 await imap.login(user, 'pass00')
                 self.eq(
                     await imap.logout(),
@@ -910,6 +920,8 @@ class ImapTest(s_test.SynTest):
 
             with mock.patch.object(IMAPServer, 'logout', logout_nobye):
                 imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+                core.onfini(imap)
+
                 await imap.login(user, 'pass00')
                 self.eq(
                     await imap.logout(),
@@ -932,6 +944,8 @@ class ImapTest(s_test.SynTest):
 
             # Check command validation
             imap = await s_link.connect('127.0.0.1', port, linkcls=s_imap.IMAPClient)
+            core.onfini(imap)
+
             with self.raises(s_exc.ImapError) as exc:
                 tag = imap._genTag()
                 await imap._command(tag, 'NEWP')

synapse/tests/test_lib_stormtypes.py

@@ -3297,6 +3297,18 @@ class StormTypesTest(s_test.SynTest):
             self.false(mesgs[0])
             self.isin('Ambiguous time', mesgs[1]['errinfo']['mesg'])
 
+            valu = await core.callStorm('return($lib.time.format($lib.cast(time, 20251002), $lib.time.formats.iso8601))')
+            self.eq(valu, '2025-10-02T00:00:00Z')
+
+            valu = await core.callStorm('return($lib.time.format($lib.cast(time, 20251002), $lib.time.formats.iso8601us))')
+            self.eq(valu, '2025-10-02T00:00:00.000000Z')
+
+            valu = await core.callStorm('return($lib.time.format($lib.cast(time, 20251002), $lib.time.formats.rfc2822))')
+            self.eq(valu, '02 Oct 2025 00:00:00 UT')
+
+            valu = await core.callStorm('return($lib.time.format($lib.cast(time, 20251002), $lib.time.formats.synapse))')
+            self.eq(valu, '2025/10/02 00:00:00.000000')
+
     async def test_storm_lib_time_ticker(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_model_inet.py

@@ -2991,10 +2991,17 @@ class InetModelTest(s_t_utils.SynTest):
 
             q = '''
             [ inet:service:platform=(slack,)
+                :id=foo
                 :url="https://slack.com"
                 :urls=(https://slacker.com,)
+                :zones=(slack.com, slacker.com)
                 :name=Slack
                 :names=("slack chat",)
+                :parent={[ inet:service:platform=({"name": "salesforce"}) ]}
+                :status=available
+                :period=(2022, 2023)
+                :creator={[ inet:service:account=({"id": "bar"}) ]}
+                :remover={[ inet:service:account=({"id": "baz"}) ]}
                 :provider={ ou:org:name=$provname }
                 :provider:name=$provname
             ]
@@ -3002,20 +3009,36 @@ class InetModelTest(s_t_utils.SynTest):
             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(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'))
             self.eq(nodes[0].get('name'), 'slack')
             self.eq(nodes[0].get('names'), ('slack chat',))
+            self.eq(nodes[0].repr('status'), 'available')
+            self.eq(nodes[0].repr('period'), ('2022/01/01 00:00:00.000', '2023/01/01 00:00:00.000'))
             self.eq(nodes[0].get('provider'), provider.ndef[1])
             self.eq(nodes[0].get('provider:name'), provname.lower())
             platform = nodes[0]
 
+            nodes = await core.nodes('inet:service:platform=(slack,) :parent -> *')
+            self.eq(['salesforce'], [n.get('name') for n in nodes])
+
+            nodes = await core.nodes('inet:service:platform=(slack,) :creator -> *')
+            self.eq(['bar'], [n.get('id') for n in nodes])
+
+            nodes = await core.nodes('inet:service:platform=(slack,) :remover -> *')
+            self.eq(['baz'], [n.get('id') for n in nodes])
+
             nodes = await core.nodes('[ inet:service:platform=({"name": "slack chat"}) ]')
             self.eq(nodes[0].ndef, platform.ndef)
 
             nodes = await core.nodes('[ inet:service:platform=({"url": "https://slacker.com"}) ]')
             self.eq(nodes[0].ndef, platform.ndef)
 
+            nodes = await core.nodes('[ inet:service:platform=({"zone": "slacker.com"}) ]')
+            self.eq(nodes[0].ndef, platform.ndef)
+
             q = '''
             [ inet:service:instance=(vertex, slack)
                 :id='T2XK1223Y'

synapse/tests/test_model_proj.py

@@ -1,4 +1,5 @@
 import synapse.exc as s_exc
+import synapse.common as s_common
 import synapse.tests.utils as s_test
 
 class ProjModelTest(s_test.SynTest):
@@ -256,13 +257,14 @@ class ProjModelTest(s_test.SynTest):
             self.eq('highest', nodes[0].repr('priority'))
             self.eq(proj, nodes[0].get('project'))
 
-            nodes = await core.nodes('proj:comment')
+            nodes = await core.nodes('proj:comment [ :ext:creator={[ps:contact=(visi,) :name=visi ]} ]')
             self.len(1, nodes)
             self.nn(nodes[0].get('created'))
             self.nn(nodes[0].get('updated'))
             self.eq(tick, nodes[0].get('ticket'))
             self.eq('hithere', nodes[0].get('text'))
             self.eq(visi.iden, nodes[0].get('creator'))
+            self.eq(s_common.guid(('visi',)), nodes[0].get('ext:creator'))
 
             self.eq('foo', await core.callStorm('return($lib.projects.get($proj).name)', opts=opts))
             self.eq('bar', await core.callStorm('return($lib.projects.get($proj).epics.get($epic).name)', opts=opts))

synapse/tests/test_model_risk.py

@@ -3,6 +3,7 @@ import logging
 import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.lib.chop as s_chop
+import synapse.lib.time as s_time
 import synapse.tests.utils as s_t_utils
 
 logger = logging.getLogger(__name__)
@@ -325,6 +326,15 @@ class RiskModelTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('risk:alert :service:platform -> inet:service:platform'))
             self.len(1, await core.nodes('risk:alert :service:instance -> inet:service:instance'))
 
+            opts = {'vars': {'ndef': nodes[0].ndef[1]}}
+            nodes = await core.nodes('risk:alert=$ndef [ :updated=20251003 ]', opts=opts)
+            self.len(1, nodes)
+            self.eq(s_time.parse('20251003'), nodes[0].get('updated'))
+
+            self.len(1, await core.nodes('[ risk:alert=({"name": "bazfaz"}) +(about)> {[ file:bytes=* :name=alert.txt]} ]'))
+            self.len(1, fnode := await core.nodes('risk:alert=({"name": "bazfaz"}) -(about)> file:bytes'))
+            self.eq(fnode[0].get('name'), 'alert.txt')
+
             nodes = await core.nodes('''[
                     risk:compromise=*
                     :vector=*

synapse/tests/test_model_syn.py

@@ -1,8 +1,9 @@
 import synapse.exc as s_exc
 import synapse.common as s_common
 import synapse.cortex as s_cortex
-import synapse.datamodel as s_datamodel
 
+import synapse.lib.time as s_time
+import synapse.lib.version as s_version
 import synapse.lib.stormsvc as s_stormsvc
 
 import synapse.tests.utils as s_t_utils
@@ -42,6 +43,21 @@ class TestService(s_stormsvc.StormSvc):
                     },
                     'storm': '',
                 },
+                {
+                    'name': 'deprvers',
+                    'storm': '',
+                    'deprecated': {'eolvers': 'v3.0.0'},
+                },
+                {
+                    'name': 'deprdate',
+                    'storm': '',
+                    'deprecated': {'eoldate': '2099-01-01'},
+                },
+                {
+                    'name': 'deprmesg',
+                    'storm': '',
+                    'deprecated': {'eoldate': '2099-01-01', 'mesg': 'Please use ``ohhai``.'},
+                },
             )
         },
     )
@@ -683,7 +699,7 @@ class SynModelTest(s_t_utils.SynTest):
 
                 # check that runt nodes for new commands are created
                 nodes = await core.nodes('syn:cmd +:package')
-                self.len(2, nodes)
+                self.len(5, nodes)
 
                 self.eq(nodes[0].ndef, ('syn:cmd', 'foobar'))
                 self.eq(nodes[0].get('doc'), 'foobar is a great service')
@@ -692,6 +708,7 @@ class SynModelTest(s_t_utils.SynTest):
                 self.eq(nodes[0].get('nodedata'), (('foo', 'inet:ipv4'), ('bar', 'inet:fqdn')))
                 self.eq(nodes[0].get('package'), 'foo')
                 self.eq(nodes[0].get('svciden'), iden)
+                self.none(nodes[0].get('deprecated'))
 
                 self.eq(nodes[1].ndef, ('syn:cmd', 'ohhai'))
                 self.eq(nodes[1].get('doc'), 'No description')
@@ -700,6 +717,41 @@ class SynModelTest(s_t_utils.SynTest):
                 self.none(nodes[1].get('nodedata'))
                 self.eq(nodes[1].get('package'), 'foo')
                 self.eq(nodes[1].get('svciden'), iden)
+                self.none(nodes[1].get('deprecated'))
+
+                self.eq(nodes[2].ndef, ('syn:cmd', 'deprvers'))
+                self.true(nodes[2].get('deprecated'))
+                self.eq(nodes[2].get('deprecated:version'), s_version.packVersion(3, 0, 0))
+                self.none(nodes[2].get('deprecated:date'))
+                self.none(nodes[2].get('deprecated:mesg'))
+
+                self.eq(nodes[3].ndef, ('syn:cmd', 'deprdate'))
+                self.true(nodes[3].get('deprecated'))
+                self.none(nodes[3].get('deprecated:version'))
+                self.eq(nodes[3].get('deprecated:date'), s_time.parse('2099-01-01'))
+                self.none(nodes[3].get('deprecated:mesg'))
+
+                self.eq(nodes[4].ndef, ('syn:cmd', 'deprmesg'))
+                self.true(nodes[4].get('deprecated'))
+                self.none(nodes[4].get('deprecated:version'))
+                self.eq(nodes[4].get('deprecated:date'), s_time.parse('2099-01-01'))
+                self.eq(nodes[4].get('deprecated:mesg'), 'Please use ``ohhai``.')
+
+                nodes = await core.nodes('syn:cmd:deprecated')
+                self.len(5, nodes)
+                self.sorteq(['deprvers', 'deprdate', 'deprmesg', 'ps.list', 'ps.kill'], [k.ndef[1] for k in nodes])
+
+                nodes = await core.nodes('syn:cmd:deprecated:version')
+                self.len(3, nodes)
+                self.sorteq(['deprvers', 'ps.list', 'ps.kill'], [k.ndef[1] for k in nodes])
+
+                nodes = await core.nodes('syn:cmd:deprecated:date')
+                self.len(2, nodes)
+                self.sorteq(['deprdate', 'deprmesg'], [k.ndef[1] for k in nodes])
+
+                nodes = await core.nodes('syn:cmd:deprecated:mesg')
+                self.len(3, nodes)
+                self.sorteq(['deprmesg', 'ps.list', 'ps.kill'], [k.ndef[1] for k in nodes])
 
                 # Pivot from cmds to their forms
                 nodes = await core.nodes('syn:cmd=foobar -> *')

{synapse-2.223.0.dist-info → synapse-2.224.0.dist-info}/METADATA

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

{synapse-2.223.0.dist-info → synapse-2.224.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 synapse/__init__.py,sha256=R2kOXlF5j-8m6G0JkHuN7rXRPg_tHLmbMxr__94mHQk,1145
 synapse/axon.py,sha256=HtKPfSDNt3ltOaQC2P_7satXhgdxf7fO2mGAioF78Iw,66029
 synapse/cells.py,sha256=eNvdglfAoTURVhGOLGcgMXCGpfsIX1a02SQnyiklo3E,308
-synapse/common.py,sha256=j8b3lrZ7O-utkjJswSf_kx1nySmKRTCNsk6I8bfNPGA,37880
-synapse/cortex.py,sha256=FLJbgqj1vZhoo5dHLnATHogPSgZK8RrRV1BLE7NFO7s,273040
+synapse/common.py,sha256=h2ZPK9xNnKcZ4uOxfGzfr70OnzP3ldZZojM8ZAev7kA,37895
+synapse/cortex.py,sha256=XuInelqcWjR8dF-5NKF4RwlCcDZ1pEz0lFQFOzw1Qtg,274705
 synapse/cryotank.py,sha256=C747V7mCSmLUMwy3niEPl6_4wuXaYKHJdm5wB-o1MMQ,12202
 synapse/daemon.py,sha256=CllFBFGcZ8aI5jOmAu-7AQRXExjhojmq4saUE7uFOAQ,17171
-synapse/datamodel.py,sha256=Lc8PF4tapY6leXv35M1UZHNQ3nDLxEWbfwS4crGNTV0,40347
+synapse/datamodel.py,sha256=aoxZlYbp4QevIwMC_JkdzFUXq_d302Cy2q6z5_jEqpI,40347
 synapse/exc.py,sha256=vZlFz9gbK9ZIjye_VhMKpHeGoB1HSdP9POzDx-qXnQo,9971
 synapse/glob.py,sha256=tb6NPtK6Jp6YES9sB1AQi26HP6f-BcEiHrZz2yEyZ90,3210
 synapse/mindmeld.py,sha256=TiijGH7wX2zdXIFSBUlN40CPOvYaFlw6Wxi66XZuB_M,26
@@ -119,7 +119,7 @@ synapse/lib/ingest.py,sha256=HNW1xs215c_UXVjKaxjipKBmVL4ujrjmarHBRvLPLkE,40
 synapse/lib/interval.py,sha256=PqpEhMGG6LD9mJxEms0oQWC-NB01H6gwsmLSc5LrDFk,1175
 synapse/lib/json.py,sha256=s5ULBdrpQ5lMy7DIUFvqwukEkrG8taH1kzHx7sxCE8s,8268
 synapse/lib/jsonstor.py,sha256=GAzIEqYszPkInIOHTfjPQbhXU1vo6GDNfalyNSgdaLo,19595
-synapse/lib/layer.py,sha256=Xk5NObx8I7ynWjlMn235XZ1Znt6RzeVtLh2cvkkwxRo,160457
+synapse/lib/layer.py,sha256=HAG_TbTTpqO8CAwzfLXGE99k80enDLJOJSPZSyVjC54,160493
 synapse/lib/link.py,sha256=qv1NK1TguHiqOlOHSsqVamhRn-WdQY1vc1gorMsLhmo,10657
 synapse/lib/lmdbslab.py,sha256=PcOUL1FeC5464MwYMWd9GbGv-xksfVu-KPgr9-QtO9M,61069
 synapse/lib/modelrev.py,sha256=bSBKjKjOeXJ2ZZYa0w4KSFLOz3J_HxBCww1l0_5DoRg,72568
@@ -136,7 +136,7 @@ synapse/lib/queue.py,sha256=omMtqD4HWg2mLOhhtIe4pA_evz234lJ9uhlAhC_xbW4,3879
 synapse/lib/ratelimit.py,sha256=BIeFPZb9Bk5GFIVvhM43Uw1s0abY6z7NgTuBorVajz4,1124
 synapse/lib/reflect.py,sha256=j7Y522UzAwNswUehyfi9kHFNkTxuHXsFuEKY4ATXWTQ,2783
 synapse/lib/rstorm.py,sha256=VgxWBpTmOSYPEsgpB-zFVaDOrGH3otiq70aYVjn-to8,22608
-synapse/lib/schemas.py,sha256=gn2XoiWZVbR2HmeZYGlhAflAc5d0SgBrBXYXKnyIDuI,42301
+synapse/lib/schemas.py,sha256=xWSuZXio5F6i7A95yQAScj1D-QNZlbtmDU0jOYAhibg,42453
 synapse/lib/scope.py,sha256=0CuSXLG_7pNleC1BcJ8_WbA50DswrX4DNjW5MyGGGNo,5496
 synapse/lib/scrape.py,sha256=ppUUkobkITN7n2gFov0nfzV3sVKpyPNrZKPtt1zwjjU,23979
 synapse/lib/share.py,sha256=wE0WE77QxJTbfcZmVLn_9hHbXMsptj6e2I4KbTho9_Q,605
@@ -144,12 +144,12 @@ synapse/lib/slaboffs.py,sha256=Fd0RrIRBMjh159aQz5y1ONmzw0NvV040kVX_jZjQW6I,815
 synapse/lib/slabseqn.py,sha256=LJ2SZEsZlROBAD3mdS-3JxNVVPXXkBW8GIJXsW0OGG8,10287
 synapse/lib/snap.py,sha256=3yG69MYqbju8eROoW65cAlwt-ksL7FYPN9ezxp-UL3o,64871
 synapse/lib/spooled.py,sha256=BQHIW-qZvEcvhEf8PpXhbDDGzq1go4TH63D6kn-1anM,6021
-synapse/lib/storm.py,sha256=nvRTc3HdBCjz1pCundWPKjOsbg5-IxBGz6BjKNLdoM8,199503
+synapse/lib/storm.py,sha256=PUHQ8XgZ8sUhhAMkDNqqRBl44yk61bEPgE5qTeBmgnc,200914
 synapse/lib/storm_format.py,sha256=9cE8WNPYTcqgRakIqkmIQzOr16Hqbj_sM1QabHug3i0,4908
 synapse/lib/stormctrl.py,sha256=3UC2LOHClC17JwYNuo8NeyntuAvIXphjenXEzVP33mY,2523
 synapse/lib/stormhttp.py,sha256=hy87c76CqMqplv9gLB5_P032uvZ2Cggp4IC27QzhRjY,28907
 synapse/lib/stormsvc.py,sha256=FURIsQUVNJmY8Z5TmhTF1O__DGXPiVg5pUiOoPM8r3g,7573
-synapse/lib/stormtypes.py,sha256=INiTDl7ufPIEXJB-NI_d7lj1A1nxLRAlWx_gLbcuV4M,411124
+synapse/lib/stormtypes.py,sha256=eAUuHxnWzy75V5KLmo-39J7O5RBiPWWsgrwy9qPLwaE,412164
 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
@@ -160,7 +160,7 @@ 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/urlhelp.py,sha256=ljhnF91z9ihyOLdZZ6OoQYCN1WYjOj1imukD45xiKU0,3320
-synapse/lib/version.py,sha256=GkkDQFutyUFrnF9F78bPbloDpjcFOaYmomGYIJt-Elk,7162
+synapse/lib/version.py,sha256=FI-I1ZjM6YCtzmQQkGHNc5w-1m0oTXPuUIYVGv2uDD4,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
@@ -191,7 +191,7 @@ synapse/lib/stormlib/gis.py,sha256=LUsFcPn0g3Y23lMDpKveegT2SwoOSAwkgmifpXpm23c,1
 synapse/lib/stormlib/graph.py,sha256=6ZDZlpV-OznhK2jTRiMBAYN2qrOIG6ZQWvRCDrrnnWw,7699
 synapse/lib/stormlib/hashes.py,sha256=h0gtVLiC70FZboJH8gPSR9G53i8-T6WNCFjVfXAH4ig,4751
 synapse/lib/stormlib/hex.py,sha256=6sGOvkCFwvpOngF4sfeDpXm0-ujnw2Hc8BMMe2ZpUOI,5855
-synapse/lib/stormlib/imap.py,sha256=C7X7J-uz6EjEdq3SSsVS2T-2qxR4hwsW-i5W2ZSQutQ,27089
+synapse/lib/stormlib/imap.py,sha256=MJyDg7oxYrY_aTc2Le0syIpf4mfr6tEw1E2SF66fXsw,27262
 synapse/lib/stormlib/index.py,sha256=f92Yn3nhojFhxbp7SUu9T-lRTGw-_miazfwMqG7QO14,1514
 synapse/lib/stormlib/infosec.py,sha256=QBIaXVFgly8-DeNpTft0h-BMhCJemhQ_q-61vKjb0OA,30376
 synapse/lib/stormlib/ipv6.py,sha256=Ik50Hpd6T-XCc7gVzJqmYqGQF8jfIwFIQvNCDPCMtLs,1557
@@ -216,7 +216,7 @@ synapse/lib/stormlib/stats.py,sha256=aRm-kf5ZKp0_czKiujtH8quO6XuxrIRsHjMfPlCRc-o
 synapse/lib/stormlib/stix.py,sha256=ZSIb2U1PmjmkbPJE1zUhyk2TZGPIEZtm9khMKu07898,53550
 synapse/lib/stormlib/storm.py,sha256=dnPwH6p3DaOaKXfagqu-9szqr1wNzmCySDyzGJ77n74,6246
 synapse/lib/stormlib/tabular.py,sha256=jZ-BvzwQONmDL5hvZoxZNBhdz8KPCiZv_pS8kTYyiKg,7374
-synapse/lib/stormlib/task.py,sha256=B_SrNTT7iixBd0fjJc6FpniabFSIUfP8AksJ5JAd5PE,4394
+synapse/lib/stormlib/task.py,sha256=4VzDadM4Z6AWPRB9wh2Y9ZnngVQwMOzxJT1WRJc5MzI,4379
 synapse/lib/stormlib/utils.py,sha256=ju3_RqnzpSUI5beCJCVG1ZBxLrBm1OIU6OEVCbD3XxU,1991
 synapse/lib/stormlib/vault.py,sha256=MjFxmsDnQqL2uWDTdjNdlm1xwfbA8Vzqdp7Lxti5-V0,30586
 synapse/lib/stormlib/version.py,sha256=FHWLsU6qy--iFfuN_2ZFDpwFzkqKL4b3ESLZ9ByUXak,2431
@@ -243,7 +243,7 @@ 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=ufjSaLjBYHkkM_F6oUN4w1x1u1FzJdh9D3Tt_odyLLs,181816
+synapse/models/inet.py,sha256=bCKYzMQVw5jGzytO_sbrwoxhKSD7uHp0ZnUK3bph-Oo,183075
 synapse/models/infotech.py,sha256=IfxcD3Ap9W4jrBGkI55kej6UOdnTE2ZL3dH4R9f3MbI,155406
 synapse/models/language.py,sha256=hBVVIf5kc_FSIV7HZhWnberoc9ssxuqeff4fqC9iz4o,3640
 synapse/models/material.py,sha256=UvmnBEkbhBbdbnvWtTlgGJAJlKDrx9E-YSQ3K49ws5M,5405
@@ -252,10 +252,10 @@ synapse/models/media.py,sha256=wdXNzLrHb4YYRZ3NlGombNwZsphwfH20oZQQ9ICq7ZQ,3604
 synapse/models/orgs.py,sha256=leQKO9NP3bl2-iikScd62kYiehAWqGVaKqwPgOVD4qE,71755
 synapse/models/person.py,sha256=HiZy_zT0Q1AoeXbpogEJWuJe436bOo_Ai4kkmA9c2ZU,28568
 synapse/models/planning.py,sha256=vmrY4d3WRxizrNU1YBe36NGZTuuu4lhGS8KI5lCZ5yQ,7302
-synapse/models/proj.py,sha256=vl-2uZouiWSey8t4lTNA4BxUKhX94rqm3SuLrodQUP8,9904
-synapse/models/risk.py,sha256=7b7VUeWWKjJl3VfHhfv3tnu2FTlGMEKhZfo7LBPOta4,58269
+synapse/models/proj.py,sha256=ISMnL9ppme36Ymxe1FbfD4WxmAW5AXpe0697xUPEni8,10071
+synapse/models/risk.py,sha256=nwIRQbAZYbi6Xh6Y9PaTgJ2hiGqa4wgQBUCoQudMb8k,58520
 synapse/models/science.py,sha256=oSkKbjmVncYcVkVgx8rhM08XtcsgDgjf3mpunz5kL30,4329
-synapse/models/syn.py,sha256=u6-EB_2nMCD2LEo3Ir5Iduay2JBl2a2TF1TE26jmr1c,14789
+synapse/models/syn.py,sha256=tH9Rf99pNCdY0NM4_H5QR2O3XQOuhIL9e5L2nbK8jM0,15356
 synapse/models/telco.py,sha256=h6fx2ScjniS1Gvtcz3-n989SPcH6bavRDnDatL0dH1w,16530
 synapse/models/transport.py,sha256=GVyytNyhp6sB28x1x0bUBETaOXpWyR_JawVvMTlmz5M,29757
 synapse/models/gov/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -276,8 +276,8 @@ synapse/tests/test_axon.py,sha256=aBjvNB4M0jqDHJ7zHNgsp8V-CpJuSpHyrGnRk1RcKDQ,50
 synapse/tests/test_cmds_boss.py,sha256=SdBwM2qJHFzzfrjWYiZOLBKeye8uru7KeJ3NU_YSkWw,4718
 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=h9qBJmIc0EA70OIFVsBEGL8mZ4M7IkEBdWbhBNxGzMQ,17093
-synapse/tests/test_cortex.py,sha256=axk_Pm_-AQObP52fZisx77AZO2W12CQz8U544sSGxG0,381559
+synapse/tests/test_common.py,sha256=viVCDLV7PbyFSNDzc-9kYJzkfYzia03SFrnkcn2aBBk,17376
+synapse/tests/test_cortex.py,sha256=1CSQmBStuECkAK8YCKQBk84QgAv7-O78ESCgdkMBcV8,383610
 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
@@ -338,7 +338,7 @@ synapse/tests/test_lib_slaboffs.py,sha256=FHQ8mGZ27dGqVwGk6q2UJ4gkPRZN22eIVzS8hM
 synapse/tests/test_lib_slabseqn.py,sha256=74V6jU7DRTsy_hqUFDuT4C6dPlJ6ObNnjmI9qhbbyVc,5230
 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=CBN4Tg-MiNAP-NfjxEsGOpjm-iZHvDv8981CnK5sjOI,257092
+synapse/tests/test_lib_storm.py,sha256=YmF3sJTKHckZ3agh-ZI2EWgEbQ6v37z33zDQWZTFCfM,261972
 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=rhZ9xLTIzLm4GlJUFDieFqAcrhE0EFTDi2erGltPm0I,46056
@@ -357,7 +357,7 @@ synapse/tests/test_lib_stormlib_gen.py,sha256=Hb0GHe3jr7IYb6bYnDKqAc4-ZgRIjYEcT2
 synapse/tests/test_lib_stormlib_gis.py,sha256=uG1QQ0wqO-0tSzCnQZv1Ex_NbnabKEbZTlXcpCm8snE,767
 synapse/tests/test_lib_stormlib_hashes.py,sha256=rgty98QcyuOCXH699V7Vd3q7cFNa5I9HSJ5WeBajZB4,6015
 synapse/tests/test_lib_stormlib_hex.py,sha256=TqYZYQR6GxV4k5uYTVMCLYIUJiio_SoB1WZB6fYzHB4,3701
-synapse/tests/test_lib_stormlib_imap.py,sha256=4WCJ5JFKi1gi5PESec3gP_rPmMjPDUGdpCMXIFbTotg,48905
+synapse/tests/test_lib_stormlib_imap.py,sha256=bMg_DOGNBsNZiHEt4oR-d0vjr9H6o8HAoaDbV-IkT8c,49150
 synapse/tests/test_lib_stormlib_index.py,sha256=qz2pIJ1oZAyN3IEpIqYewiB4FVvKSfVLz27K24iAa_k,1672
 synapse/tests/test_lib_stormlib_infosec.py,sha256=uDaJ5WjTsujvALShSf-RDAOP4HhuddQcXfANTyIJkp4,27375
 synapse/tests/test_lib_stormlib_ipv6.py,sha256=sJDIM4lKayYct2qAGjRwgadmxzgegzSn8I3UxNRFF4M,877
@@ -385,7 +385,7 @@ synapse/tests/test_lib_stormlib_vault.py,sha256=pE_nDisXiyb-4Zm1hOrfsuEz3bjYwR8c
 synapse/tests/test_lib_stormlib_xml.py,sha256=asF-Y1LVpLoqHRK71_LWy727XJvsTNpf8qRSK-CynMM,3659
 synapse/tests/test_lib_stormlib_yaml.py,sha256=egTVXk8wW31V2msF__9WxP3THcqfysG1mYhc7hQG8rw,1358
 synapse/tests/test_lib_stormsvc.py,sha256=XeUQo6GzIdwV3EZJv8lU3sR4MpJY3iY90fahb9zsfa4,43972
-synapse/tests/test_lib_stormtypes.py,sha256=w-Vn3ujIApFQq_eivWpgIyoRbWr4R9m2wYQN9g-Bcyg,347751
+synapse/tests/test_lib_stormtypes.py,sha256=W9WyJ1fmMJUQnAFZIJiXEyk_wNrJ4SOzwtbwSEd3zvo,348461
 synapse/tests/test_lib_stormwhois.py,sha256=AWMUYEgZ5yqvDfPC_rM4evmhgfOA_Fv5aoTjmKmN1_0,4818
 synapse/tests/test_lib_structlog.py,sha256=BxglFqOsJFPE2RsZ8dQyTBCEe1frQrHWWXmUBO2fPJs,3898
 synapse/tests/test_lib_task.py,sha256=UQi14LdQ0rxDRCSy4TAxyq2OXDOXPQqnvp-nCK_aoBE,2454
@@ -414,7 +414,7 @@ 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=Vgy1BjDMl1CS3lRUooVWzdsG6mdhuVkdTMKHShnRKtI,160850
+synapse/tests/test_model_inet.py,sha256=7a4bCbx3v8aStZB6NFLnJpciBPnucBNuFFwVPnWujSw,162071
 synapse/tests/test_model_infotech.py,sha256=Haf6au6ZX97cZF5x4fm5c5vbQDuloWRHkTvVYu-CPJ8,115679
 synapse/tests/test_model_language.py,sha256=49stF1B8_EwWJB67Xa5VXCG563Zfbr6S85iKN9Iom48,3046
 synapse/tests/test_model_material.py,sha256=Hkd8BJh6FdQE0RuFMV2NO6fGqw9kOCb5AeIuTYtwCEM,2723
@@ -423,10 +423,10 @@ synapse/tests/test_model_media.py,sha256=OhMb3OwmZ7hXfoQYGeUBlnsqIk0sAohSodCLML2
 synapse/tests/test_model_orgs.py,sha256=YuKmjO7c6kzrydEwiVtmEdpZpSVlPfN_aCx_yqbKXDE,47881
 synapse/tests/test_model_person.py,sha256=CKfOtp7iCPAHQEfjlduDxPXLbFbi2LdVqExRyVwoxAc,19170
 synapse/tests/test_model_planning.py,sha256=U2kkE0uBO6CqtTfy7wlnhEIu_NFdSri4I_I5b-mRjBE,5615
-synapse/tests/test_model_proj.py,sha256=hCuM-CTyCAvqVPy7klP6NXOEtgJ61OyyT0x8mcJsjns,23238
-synapse/tests/test_model_risk.py,sha256=t2IVWF8h1Kj7hERUZR_wqMikFJl63m9yz_ZYB60z1O4,31543
+synapse/tests/test_model_proj.py,sha256=BYqM7p9_NEoiPk39R2irjIVn4HSfUvcbNvka25saVPk,23399
+synapse/tests/test_model_risk.py,sha256=tqvwXVHKuhNHJmkYJ6c7EqmWyXrFGRn07qjEHcE_vBg,32114
 synapse/tests/test_model_science.py,sha256=2T9VxdzpltDufgjkUB95q97TQP9AxH2-T_sBbHfPDRk,2450
-synapse/tests/test_model_syn.py,sha256=Air11lZMj6D6A5BDOMQV5mjcI873gNyUmfK5WMua5Cg,31900
+synapse/tests/test_model_syn.py,sha256=rrcKwhxwGuYRDc7EmyvbhUcL0wrcFRKyZH1yg_-kp0M,34382
 synapse/tests/test_model_telco.py,sha256=34PpU2-gxk8jT9EuTKcFbYgBw4q6kUDtdZUgMsn7jHg,13455
 synapse/tests/test_model_transport.py,sha256=kAR16Uc6szPZj3AN_sIjaHf3O0st_oV9bXixfF1QRGk,16308
 synapse/tests/test_servers_axon.py,sha256=x7NT6F32yuqP1RNwz1kUHWKg-zewL3Zt3N5a-kMbBG8,1098
@@ -649,8 +649,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.223.0.dist-info/licenses/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
-synapse-2.223.0.dist-info/METADATA,sha256=nPPIqal-uRmuXAIFsfR9UtlJ7FZUxWkxqLVbmIHhh24,4583
-synapse-2.223.0.dist-info/WHEEL,sha256=cRWFNt_CJSuf6BnJKAdKunDXUJxjAbWvbt_kstDCs1I,93
-synapse-2.223.0.dist-info/top_level.txt,sha256=v_1YsqjmoSCzCKs7oIhzTNmWtSYoORiBMv1TJkOhx8A,8
-synapse-2.223.0.dist-info/RECORD,,
+synapse-2.224.0.dist-info/licenses/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
+synapse-2.224.0.dist-info/METADATA,sha256=ecnwoeHtVokG3Uwrs2Y5a2dLj6UzisHEV6bHLz9YyA8,4583
+synapse-2.224.0.dist-info/WHEEL,sha256=cRWFNt_CJSuf6BnJKAdKunDXUJxjAbWvbt_kstDCs1I,93
+synapse-2.224.0.dist-info/top_level.txt,sha256=v_1YsqjmoSCzCKs7oIhzTNmWtSYoORiBMv1TJkOhx8A,8
+synapse-2.224.0.dist-info/RECORD,,