synapse 2.181.0__tar.gz → 2.182.0__tar.gz

{synapse-2.181.0/synapse.egg-info → synapse-2.182.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synapse
-Version: 2.181.0
+Version: 2.182.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0
@@ -22,7 +22,7 @@ License-File: LICENSE
 Requires-Dist: pyOpenSSL<25.0.0,>=24.0.0
 Requires-Dist: cryptography<44.0.0,>=43.0.1
 Requires-Dist: msgpack<1.1.0,>=1.0.5
-Requires-Dist: xxhash<3.5.0,>=1.4.4
+Requires-Dist: xxhash<3.6.0,>=1.4.4
 Requires-Dist: lmdb<1.5.0,>=1.2.1
 Requires-Dist: tornado<7.0.0,>=6.2.0
 Requires-Dist: regex>=2022.9.11
@@ -34,7 +34,7 @@ Requires-Dist: aiosmtplib<3.1.0,>=3.0.0
 Requires-Dist: prompt-toolkit<3.1.0,>=3.0.4
 Requires-Dist: lark==1.1.9
 Requires-Dist: Pygments<2.18.0,>=2.7.4
-Requires-Dist: packaging<24.0,>=20.0
+Requires-Dist: packaging<25.0,>=20.0
 Requires-Dist: fastjsonschema<2.20.0,>=2.18.0
 Requires-Dist: stix2-validator<4.0.0,>=3.2.0
 Requires-Dist: vcrpy<5.2.0,>=4.3.1

{synapse-2.181.0 → synapse-2.182.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.181.0'
+version = '2.182.0'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]
@@ -26,7 +26,7 @@ dependencies = [
     'pyOpenSSL>=24.0.0,<25.0.0',
     'cryptography>=43.0.1,<44.0.0',
     'msgpack>=1.0.5,<1.1.0',
-    'xxhash>=1.4.4,<3.5.0',
+    'xxhash>=1.4.4,<3.6.0',
     'lmdb>=1.2.1,<1.5.0',
     'tornado>=6.2.0,<7.0.0',
     'regex>=2022.9.11',
@@ -38,7 +38,7 @@ dependencies = [
     'prompt-toolkit>=3.0.4,<3.1.0',
     'lark==1.1.9',
     'Pygments>=2.7.4,<2.18.0',
-    'packaging>=20.0,<24.0',
+    'packaging>=20.0,<25.0',
     'fastjsonschema>=2.18.0,<2.20.0',
     'stix2-validator>=3.2.0,<4.0.0',
     'vcrpy>=4.3.1,<5.2.0',

{synapse-2.181.0 → synapse-2.182.0}/synapse/lib/auth.py

@@ -579,11 +579,28 @@ class Auth(s_nexus.Pusher):
         await self.feedBeholder('user:add', user.pack())
 
     async def addRole(self, name, iden=None):
+        '''
+        Add a Role to the Auth system.
+
+        Args:
+            name (str): The name of the role.
+            iden (str): A optional iden to use as the role iden.
+
+        Returns:
+            Role: A Role.
+        '''
         if self.roleidenbynamecache.get(name) is not None:
             raise s_exc.DupRoleName(mesg=f'Duplicate role name, {name=} already exists.', name=name)
 
         if iden is None:
             iden = s_common.guid()
+        else:
+            if not s_common.isguid(iden):
+                raise s_exc.BadArg(name='iden', arg=iden, mesg=f'Argument {iden} it not a valid iden.')
+
+            if self.rolebyidencache.get(iden) is not None:
+                raise s_exc.DupIden(name=name, iden=iden,
+                                    mesg=f'Role already exists for {iden=}.')
 
         await self._push('role:add', iden, name)
 

{synapse-2.181.0 → synapse-2.182.0}/synapse/lib/cell.py

@@ -443,8 +443,8 @@ class CellApi(s_base.Base):
         return await self.cell.delUser(iden)
 
     @adminapi(log=True)
-    async def addRole(self, name):
-        return await self.cell.addRole(name)
+    async def addRole(self, name, iden=None):
+        return await self.cell.addRole(name, iden=iden)
 
     @adminapi(log=True)
     async def delRole(self, iden):
@@ -1637,12 +1637,10 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
                        f'{disk.free / disk.total * 100:.2f}%), setting Cell to read-only.'
                 logger.error(mesg)
 
-            elif nexsroot.readonly:
-
-                await nexsroot.delWriteHold(diskspace)
+            elif nexsroot.readonly and await nexsroot.delWriteHold(diskspace):
 
                 mesg = f'Free space on {self.dirn} above minimum threshold (currently ' \
-                       f'{disk.free / disk.total * 100:.2f}%), re-enabling writes.'
+                       f'{disk.free / disk.total * 100:.2f}%), removing free space write hold.'
                 logger.error(mesg)
 
             await self._checkspace.timewait(timeout=self.FREE_SPACE_CHECK_FREQ)
@@ -2883,8 +2881,8 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
         logger.info(f'Deleted user={name}',
                    extra=await self.getLogExtra(target_user=iden, target_username=name, status='DELETE'))
 
-    async def addRole(self, name):
-        role = await self.auth.addRole(name)
+    async def addRole(self, name, iden=None):
+        role = await self.auth.addRole(name, iden=iden)
         logger.info(f'Added role={name}',
                     extra=await self.getLogExtra(target_role=role.iden, target_rolename=role.name, status='CREATE'))
         return role.pack()

{synapse-2.181.0 → synapse-2.182.0}/synapse/lib/storm.py

@@ -3691,6 +3691,12 @@ class MergeCmd(Cmd):
           expressions for specifying tags. For more information on tag glob
           expressions, check the Synapse documentation for $node.globtags().
 
+    NOTE: If --wipe is specified, and there are nodes that cannot be merged,
+          they will be skipped (with a warning printed) and removed when
+          the top layer is replaced. This should occur infrequently, for example,
+          when a form is locked due to deprecation, a form no longer exists,
+          or the data at rest fails normalization.
+
     Examples:
 
         // Having tagged a new #cno.mal.redtree subgraph in a forked view...
@@ -3923,6 +3929,8 @@ class MergeCmd(Cmd):
         async with await runt.snap.view.parent.snap(user=runt.user.iden) as snap:
             snap.strict = False
 
+            snap.on('warn', runt.snap.dist)
+
             async for node, path in genr:
 
                 # the timestamp for the adds/subs of each node merge will match
@@ -3971,10 +3979,14 @@ class MergeCmd(Cmd):
                             await runt.printf(f'{nodeiden} {form} = {valurepr}')
                         else:
                             delnode = True
-                            protonode = await editor.addNode(form, valu[0])
+                            if (protonode := await editor.addNode(form, valu[0])) is None:
+                                await asyncio.sleep(0)
+                                continue
 
                     elif doapply:
-                        protonode = await editor.addNode(form, node.ndef[1], norminfo={})
+                        if (protonode := await editor.addNode(form, node.ndef[1], norminfo={})) is None:
+                            await asyncio.sleep(0)
+                            continue
 
                     for name, (valu, stortype) in sode.get('props', {}).items():
 
@@ -4020,7 +4032,9 @@ class MergeCmd(Cmd):
                                 subs.append((s_layer.EDIT_PROP_DEL, (name, valu, stortype), ()))
 
                 if doapply and protonode is None:
-                    protonode = await editor.addNode(form, node.ndef[1], norminfo={})
+                    if (protonode := await editor.addNode(form, node.ndef[1], norminfo={})) is None:
+                        await asyncio.sleep(0)
+                        continue
 
                 if not notags:
                     for tag, valu in sode.get('tags', {}).items():

{synapse-2.181.0 → synapse-2.182.0}/synapse/lib/stormlib/auth.py

@@ -1969,6 +1969,7 @@ class LibRoles(s_stormtypes.Lib):
          'type': {'type': 'function', '_funcname': '_methRolesAdd',
                   'args': (
                       {'name': 'name', 'type': 'str', 'desc': 'The name of the role.', },
+                      {'name': 'iden', 'type': 'str', 'desc': 'The iden to assign to the new role.', 'default': None},
                   ),
                   'returns': {'type': 'auth:role', 'desc': 'The new role object.', }}},
         {'name': 'del', 'desc': 'Delete a Role from the Cortex.',
@@ -2028,10 +2029,11 @@ class LibRoles(s_stormtypes.Lib):
         if rdef is not None:
             return Role(self.runt, rdef['iden'])
 
-    async def _methRolesAdd(self, name):
+    async def _methRolesAdd(self, name, iden=None):
         if not self.runt.allowed(('auth', 'role', 'add')):
             self.runt.confirm(('storm', 'lib', 'auth', 'roles', 'add'))
-        rdef = await self.runt.snap.core.addRole(name)
+        iden = await s_stormtypes.tostr(iden, noneok=True)
+        rdef = await self.runt.snap.core.addRole(name, iden=iden)
         return Role(self.runt, rdef['iden'])
 
     async def _methRolesDel(self, iden):

{synapse-2.181.0 → synapse-2.182.0}/synapse/lib/stormlib/easyperm.py

@@ -38,7 +38,7 @@ class LibEasyPerm(s_stormtypes.Lib):
          'type': {'type': 'function', '_funcname': '_allowedEasyPerm',
                   'args': (
                       {'name': 'edef', 'type': 'dict', 'desc': 'The easy perm dictionary to check.'},
-                      {'name': 'level', 'type': 'str', 'desc': 'The required permission level number.'},
+                      {'name': 'level', 'type': 'int', 'desc': 'The required permission level number.'},
                   ),
                   'returns': {'type': 'boolean',
                               'desc': 'True if the user meets the requirement, false otherwise.', }}},
@@ -46,7 +46,7 @@ class LibEasyPerm(s_stormtypes.Lib):
          'type': {'type': 'function', '_funcname': '_confirmEasyPerm',
                   'args': (
                       {'name': 'edef', 'type': 'dict', 'desc': 'The easy perm dictionary to check.'},
-                      {'name': 'level', 'type': 'str', 'desc': 'The required permission level number.'},
+                      {'name': 'level', 'type': 'int', 'desc': 'The required permission level number.'},
                       {'name': 'mesg', 'type': 'str', 'default': None,
                        'desc': 'Optional error message to present if user does not have required permission level.'},
                   ),

{synapse-2.181.0 → synapse-2.182.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, 181, 0)
+version = (2, 182, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '9241eebaad4a9c7bb007c6c5abb63be4e4ffac44'
+commit = '72e535c8c22073fd1b7428121849de4b9fb034ae'

{synapse-2.181.0 → synapse-2.182.0}/synapse/tests/test_lib_cell.py

@@ -2355,6 +2355,18 @@ class CellTest(s_t_utils.SynTest):
 
             async with self.getTestCore() as core:
 
+                # This tmp_reason assertion seems counter-intuitive at first; but it's really
+                # asserting that the message which was incorrectly being logged is no longer logged.
+                log_enable_writes = f'Free space on {core.dirn} above minimum threshold'
+                with self.getAsyncLoggerStream('synapse.lib.cell', log_enable_writes) as stream:
+                    await core.nexsroot.addWriteHold(tmp_reason := 'something else')
+                    self.false(await stream.wait(1))
+                stream.seek(0)
+                self.eq(stream.read(), '')
+
+                await core.nexsroot.delWriteHold(tmp_reason)
+                revt.clear()
+
                 self.len(1, await core.nodes('[inet:fqdn=vertex.link]'))
 
                 with mock.patch('shutil.disk_usage', full_disk):

{synapse-2.181.0 → synapse-2.182.0}/synapse/tests/test_lib_storm.py

@@ -1,3 +1,4 @@
+import copy
 import json
 import asyncio
 import datetime
@@ -1554,6 +1555,43 @@ class StormTest(s_t_utils.SynTest):
             msgs = await core.stormlist('test:ro | merge', opts=altview)
             self.stormIsInWarn("Cannot merge read only property with conflicting value", msgs)
 
+    async def test_storm_merge_stricterr(self):
+
+        conf = {'modules': [('synapse.tests.utils.DeprModule', {})]}
+        async with self.getTestCore(conf=copy.deepcopy(conf)) as core:
+
+            await core.nodes('$lib.model.ext.addFormProp(test:deprprop, _str, (str, ({})), ({}))')
+
+            viewiden = await core.callStorm('return($lib.view.get().fork().iden)')
+            asfork = {'view': viewiden}
+
+            await core.nodes('[ test:deprprop=base ]')
+
+            self.len(1, await core.nodes('test:deprprop=base [ :_str=foo +#test ]', opts=asfork))
+            await core.nodes('[ test:deprprop=fork test:str=other ]', opts=asfork)
+
+            await core.nodes('model.deprecated.lock test:deprprop')
+
+            msgs = await core.stormlist('diff | merge --apply --no-tags', opts=asfork)
+            self.stormIsInWarn('Form test:deprprop is locked due to deprecation for valu=base', msgs)
+            self.stormIsInWarn('Form test:deprprop is locked due to deprecation for valu=fork', msgs)
+            self.stormHasNoErr(msgs)
+
+            msgs = await core.stormlist('diff | merge --apply --only-tags', opts=asfork)
+            self.stormIsInWarn('Form test:deprprop is locked due to deprecation for valu=base', msgs)
+            self.stormHasNoErr(msgs)
+
+            self.eq({
+                'meta:source': 1,
+                'syn:tag': 1,
+                'test:deprprop': 1,
+                'test:str': 1,
+            }, await core.callStorm('return($lib.view.get().getFormCounts())'))
+
+            nodes = await core.nodes('test:deprprop')
+            self.eq(['base'], [n.ndef[1] for n in nodes])
+            self.eq([], nodes[0].getTags())
+
     async def test_storm_merge_opts(self):
 
         async with self.getTestCore() as core:

{synapse-2.181.0 → synapse-2.182.0}/synapse/tests/test_lib_stormlib_auth.py

@@ -988,6 +988,21 @@ class StormLibAuthTest(s_test.SynTest):
             msgs = await core.stormlist(f'$lib.auth.roles.del({iden})', opts=aslowuser)
             self.stormHasNoWarnErr(msgs)
 
+            # Use arbitrary idens when creating roles.
+            iden = '9e0998f68b662ed3776b6ce33a2d21eb'
+            with self.raises(s_exc.BadArg):
+                await core.callStorm('$lib.auth.roles.add(runners, iden=12345)')
+            opts = {'vars': {'iden': iden}}
+            rdef = await core.callStorm('$r=$lib.auth.roles.add(runners, iden=$iden) return ( $r )',
+                            opts=opts)
+            self.eq(rdef.get('iden'), iden)
+            ret = await core.callStorm('return($lib.auth.roles.get($iden))', opts=opts)
+            self.eq(ret, rdef)
+            with self.raises(s_exc.DupRoleName):
+                await core.callStorm('$lib.auth.roles.add(runners, iden=$iden)', opts=opts)
+            with self.raises(s_exc.DupIden):
+                await core.callStorm('$lib.auth.roles.add(walkers, iden=$iden)', opts=opts)
+
     async def test_stormlib_auth_gateadmin(self):
 
         async with self.getTestCore() as core:

{synapse-2.181.0 → synapse-2.182.0}/synapse/tests/test_tools_storm.py

@@ -366,7 +366,7 @@ class StormCliTest(s_test.SynTest):
             self.isin(
                 Completion(
                     '.auth.easyperm.allowed',
-                    display='[lib] $lib.auth.easyperm.allowed(edef: dict, level: str) - Check if the current user has a permission level in an easy perm dictionary.'
+                    display='[lib] $lib.auth.easyperm.allowed(edef: dict, level: int) - Check if the current user has a permission level in an easy perm dictionary.'
                 ),
                 vals
             )

{synapse-2.181.0 → synapse-2.182.0/synapse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synapse
-Version: 2.181.0
+Version: 2.182.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0
@@ -22,7 +22,7 @@ License-File: LICENSE
 Requires-Dist: pyOpenSSL<25.0.0,>=24.0.0
 Requires-Dist: cryptography<44.0.0,>=43.0.1
 Requires-Dist: msgpack<1.1.0,>=1.0.5
-Requires-Dist: xxhash<3.5.0,>=1.4.4
+Requires-Dist: xxhash<3.6.0,>=1.4.4
 Requires-Dist: lmdb<1.5.0,>=1.2.1
 Requires-Dist: tornado<7.0.0,>=6.2.0
 Requires-Dist: regex>=2022.9.11
@@ -34,7 +34,7 @@ Requires-Dist: aiosmtplib<3.1.0,>=3.0.0
 Requires-Dist: prompt-toolkit<3.1.0,>=3.0.4
 Requires-Dist: lark==1.1.9
 Requires-Dist: Pygments<2.18.0,>=2.7.4
-Requires-Dist: packaging<24.0,>=20.0
+Requires-Dist: packaging<25.0,>=20.0
 Requires-Dist: fastjsonschema<2.20.0,>=2.18.0
 Requires-Dist: stix2-validator<4.0.0,>=3.2.0
 Requires-Dist: vcrpy<5.2.0,>=4.3.1

{synapse-2.181.0 → synapse-2.182.0}/synapse.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pyOpenSSL<25.0.0,>=24.0.0
 cryptography<44.0.0,>=43.0.1
 msgpack<1.1.0,>=1.0.5
-xxhash<3.5.0,>=1.4.4
+xxhash<3.6.0,>=1.4.4
 lmdb<1.5.0,>=1.2.1
 tornado<7.0.0,>=6.2.0
 regex>=2022.9.11
@@ -13,7 +13,7 @@ aiosmtplib<3.1.0,>=3.0.0
 prompt-toolkit<3.1.0,>=3.0.4
 lark==1.1.9
 Pygments<2.18.0,>=2.7.4
-packaging<24.0,>=20.0
+packaging<25.0,>=20.0
 fastjsonschema<2.20.0,>=2.18.0
 stix2-validator<4.0.0,>=3.2.0
 vcrpy<5.2.0,>=4.3.1