synapse 2.223.0__tar.gz → 2.224.0__tar.gz

{synapse-2.223.0/synapse.egg-info → synapse-2.224.0}/PKG-INFO

@@ -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 → synapse-2.224.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.223.0'
+version = '2.224.0'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]

{synapse-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/synapse/lib/stormlib/task.py

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

{synapse-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/synapse/lib/version.py

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

{synapse-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.0}/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-2.223.0 → synapse-2.224.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