synapse 2.188.0__tar.gz → 2.188.1__tar.gz

{synapse-2.188.0/synapse.egg-info → synapse-2.188.1}/PKG-INFO

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

{synapse-2.188.0 → synapse-2.188.1}/pyproject.toml

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

{synapse-2.188.0 → synapse-2.188.1}/synapse/lib/drive.py

@@ -505,7 +505,7 @@ class Drive(s_base.Base):
     def getTypeSchema(self, typename):
         byts = self.slab.get(LKEY_TYPE + typename.encode(), db=self.dbname)
         if byts is not None:
-            return s_msgpack.un(byts)
+            return s_msgpack.un(byts, use_list=True)
 
     def getTypeSchemaVersion(self, typename):
         verskey = LKEY_TYPE_VERS + typename.encode()

{synapse-2.188.0 → synapse-2.188.1}/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, 188, 0)
+version = (2, 188, 1)
 verstring = '.'.join([str(x) for x in version])
-commit = '6d1f734406234e3750c72f5bf299f89a13d0825a'
+commit = '2cf97aa2a3266442393dfc78525749d3f65d9fc7'

{synapse-2.188.0 → synapse-2.188.1}/synapse/tests/test_lib_cell.py

@@ -29,6 +29,7 @@ import synapse.lib.coro as s_coro
 import synapse.lib.link as s_link
 import synapse.lib.drive as s_drive
 import synapse.lib.nexus as s_nexus
+import synapse.lib.config as s_config
 import synapse.lib.certdir as s_certdir
 import synapse.lib.msgpack as s_msgpack
 import synapse.lib.version as s_version
@@ -160,8 +161,9 @@ testDataSchema_v0 = {
     'properties': {
         'type': {'type': 'string'},
         'size': {'type': 'number'},
+        'stuff': {'type': ['number', 'null'], 'default': None}
     },
-    'required': ['type', 'size'],
+    'required': ['type', 'size', 'stuff'],
     'additionalProperties': False,
 }
 
@@ -170,6 +172,7 @@ testDataSchema_v1 = {
     'properties': {
         'type': {'type': 'string'},
         'size': {'type': 'number'},
+        'stuff': {'type': ['number', 'null'], 'default': None},
         'woot': {'type': 'string'},
     },
     'required': ['type', 'size', 'woot'],
@@ -180,202 +183,210 @@ class CellTest(s_t_utils.SynTest):
 
     async def test_cell_drive(self):
 
-        async with self.getTestCell() as cell:
-
-            with self.raises(s_exc.BadName):
-                s_drive.reqValidName('A' * 512)
-
-            info = {'name': 'users'}
-            pathinfo = await cell.addDriveItem(info)
-
-            info = {'name': 'root'}
-            pathinfo = await cell.addDriveItem(info, path='users')
-
-            with self.raises(s_exc.DupIden):
-                await cell.drive.addItemInfo(pathinfo[-1], path='users')
-
-            rootdir = pathinfo[-1].get('iden')
-            self.eq(0, pathinfo[-1].get('kids'))
-
-            info = {'name': 'win32k.sys', 'type': 'hehe'}
-            with self.raises(s_exc.NoSuchType):
-                info = await cell.addDriveItem(info, reldir=rootdir)
+        with self.getTestDir() as dirn:
+            async with self.getTestCell(dirn=dirn) as cell:
 
-            infos = [i async for i in cell.getDriveKids(s_drive.rootdir)]
-            self.len(1, infos)
-            self.eq(1, infos[0].get('kids'))
-            self.eq('users', infos[0].get('name'))
+                with self.raises(s_exc.BadName):
+                    s_drive.reqValidName('A' * 512)
 
-            # TODO how to handle iden match with additional property mismatch
+                info = {'name': 'users'}
+                pathinfo = await cell.addDriveItem(info)
 
-            self.true(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0))
-            self.true(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=1))
-            self.false(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=1))
+                info = {'name': 'root'}
+                pathinfo = await cell.addDriveItem(info, path='users')
 
-            with self.raises(s_exc.BadVersion):
-                await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0)
+                with self.raises(s_exc.DupIden):
+                    await cell.drive.addItemInfo(pathinfo[-1], path='users')
 
-            info = {'name': 'win32k.sys', 'type': 'woot'}
-            info = await cell.addDriveItem(info, reldir=rootdir)
+                rootdir = pathinfo[-1].get('iden')
+                self.eq(0, pathinfo[-1].get('kids'))
 
-            iden = info[-1].get('iden')
+                info = {'name': 'win32k.sys', 'type': 'hehe'}
+                with self.raises(s_exc.NoSuchType):
+                    info = await cell.addDriveItem(info, reldir=rootdir)
 
-            tick = s_common.now()
-            rootuser = cell.auth.rootuser.iden
+                infos = [i async for i in cell.getDriveKids(s_drive.rootdir)]
+                self.len(1, infos)
+                self.eq(1, infos[0].get('kids'))
+                self.eq('users', infos[0].get('name'))
 
-            with self.raises(s_exc.SchemaViolation):
-                versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
-                await cell.setDriveData(iden, versinfo, {'newp': 'newp'})
-
-            versinfo = {'version': (1, 1, 0), 'updated': tick + 10, 'updater': rootuser}
-            info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 20})
-            self.eq(info.get('version'), (1, 1, 0))
-            self.eq(versinfo.get('version'), (1, 1, 0))
-
-            versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
-            info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'hehe', 'size': 0})
-            self.eq(info.get('version'), (1, 1, 0))
-            self.eq(versinfo.get('version'), (1, 0, 0))
-
-            versinfo10, data10 = await cell.getDriveData(iden, vers=(1, 0, 0))
-            self.eq(versinfo10.get('updated'), tick)
-            self.eq(versinfo10.get('updater'), rootuser)
-            self.eq(versinfo10.get('version'), (1, 0, 0))
-
-            versinfo11, data11 = await cell.getDriveData(iden, vers=(1, 1, 0))
-            self.eq(versinfo11.get('updated'), tick + 10)
-            self.eq(versinfo11.get('updater'), rootuser)
-            self.eq(versinfo11.get('version'), (1, 1, 0))
-
-            versions = [vers async for vers in cell.getDriveDataVersions(iden)]
-            self.len(2, versions)
-            self.eq(versions[0], versinfo11)
-            self.eq(versions[1], versinfo10)
-
-            info = await cell.delDriveData(iden, vers=(0, 0, 0))
-
-            versions = [vers async for vers in cell.getDriveDataVersions(iden)]
-            self.len(2, versions)
-            self.eq(versions[0], versinfo11)
-            self.eq(versions[1], versinfo10)
-
-            info = await cell.delDriveData(iden, vers=(1, 1, 0))
-            self.eq(info.get('updated'), tick)
-            self.eq(info.get('version'), (1, 0, 0))
-
-            info = await cell.delDriveData(iden, vers=(1, 0, 0))
-            self.eq(info.get('size'), 0)
-            self.eq(info.get('version'), (0, 0, 0))
-            self.none(info.get('updated'))
-            self.none(info.get('updater'))
-
-            # repopulate a couple data versions to test migration and delete
-            versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
-            info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'hehe', 'size': 0})
-            versinfo = {'version': (1, 1, 0), 'updated': tick + 10, 'updater': rootuser}
-            info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 17})
-            self.eq(versinfo, (await cell.getDriveData(iden))[0])
-
-            # This will be done by the cell in a cell storage version migration...
-            async def migrate_v1(info, versinfo, data):
-                data['woot'] = 'woot'
-                return data
-
-            await cell.drive.setTypeSchema('woot', testDataSchema_v1, migrate_v1)
-
-            versinfo, data = await cell.getDriveData(iden, vers=(1, 0, 0))
-            self.eq('woot', data.get('woot'))
-
-            versinfo, data = await cell.getDriveData(iden, vers=(1, 1, 0))
-            self.eq('woot', data.get('woot'))
+                # TODO how to handle iden match with additional property mismatch
 
-            with self.raises(s_exc.NoSuchIden):
-                await cell.reqDriveInfo('d7d6107b200e2c039540fc627bc5537d')
+                self.true(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0))
+                self.true(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=1))
+                self.false(await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=1))
 
-            with self.raises(s_exc.TypeMismatch):
-                await cell.getDriveInfo(iden, typename='newp')
+                with self.raises(s_exc.BadVersion):
+                    await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0)
 
-            self.nn(await cell.getDriveInfo(iden))
-            self.len(2, [vers async for vers in cell.getDriveDataVersions(iden)])
+                info = {'name': 'win32k.sys', 'type': 'woot'}
+                info = await cell.addDriveItem(info, reldir=rootdir)
 
-            await cell.delDriveData(iden)
-            self.len(1, [vers async for vers in cell.getDriveDataVersions(iden)])
+                iden = info[-1].get('iden')
 
-            await cell.delDriveInfo(iden)
+                tick = s_common.now()
+                rootuser = cell.auth.rootuser.iden
 
-            self.none(await cell.getDriveInfo(iden))
-            self.len(0, [vers async for vers in cell.getDriveDataVersions(iden)])
+                with self.raises(s_exc.SchemaViolation):
+                    versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
+                    await cell.setDriveData(iden, versinfo, {'newp': 'newp'})
 
-            with self.raises(s_exc.NoSuchPath):
-                await cell.getDrivePath('users/root/win32k.sys')
+                versinfo = {'version': (1, 1, 0), 'updated': tick + 10, 'updater': rootuser}
+                info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 20, 'stuff': 12})
+                self.eq(info.get('version'), (1, 1, 0))
+                self.eq(versinfo.get('version'), (1, 1, 0))
 
-            pathinfo = await cell.addDrivePath('foo/bar/baz')
-            self.len(3, pathinfo)
-            self.eq('foo', pathinfo[0].get('name'))
-            self.eq(1, pathinfo[0].get('kids'))
-            self.eq('bar', pathinfo[1].get('name'))
-            self.eq(1, pathinfo[1].get('kids'))
-            self.eq('baz', pathinfo[2].get('name'))
-            self.eq(0, pathinfo[2].get('kids'))
+                versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
+                info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'hehe', 'size': 0, 'stuff': 13})
+                self.eq(info.get('version'), (1, 1, 0))
+                self.eq(versinfo.get('version'), (1, 0, 0))
+
+                versinfo10, data10 = await cell.getDriveData(iden, vers=(1, 0, 0))
+                self.eq(versinfo10.get('updated'), tick)
+                self.eq(versinfo10.get('updater'), rootuser)
+                self.eq(versinfo10.get('version'), (1, 0, 0))
+
+                versinfo11, data11 = await cell.getDriveData(iden, vers=(1, 1, 0))
+                self.eq(versinfo11.get('updated'), tick + 10)
+                self.eq(versinfo11.get('updater'), rootuser)
+                self.eq(versinfo11.get('version'), (1, 1, 0))
+
+                versions = [vers async for vers in cell.getDriveDataVersions(iden)]
+                self.len(2, versions)
+                self.eq(versions[0], versinfo11)
+                self.eq(versions[1], versinfo10)
+
+                info = await cell.delDriveData(iden, vers=(0, 0, 0))
+
+                versions = [vers async for vers in cell.getDriveDataVersions(iden)]
+                self.len(2, versions)
+                self.eq(versions[0], versinfo11)
+                self.eq(versions[1], versinfo10)
+
+                info = await cell.delDriveData(iden, vers=(1, 1, 0))
+                self.eq(info.get('updated'), tick)
+                self.eq(info.get('version'), (1, 0, 0))
+
+                info = await cell.delDriveData(iden, vers=(1, 0, 0))
+                self.eq(info.get('size'), 0)
+                self.eq(info.get('version'), (0, 0, 0))
+                self.none(info.get('updated'))
+                self.none(info.get('updater'))
+
+                # repopulate a couple data versions to test migration and delete
+                versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
+                info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'hehe', 'size': 0, 'stuff': 14})
+                versinfo = {'version': (1, 1, 0), 'updated': tick + 10, 'updater': rootuser}
+                info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 17, 'stuff': 15})
+                self.eq(versinfo, (await cell.getDriveData(iden))[0])
 
-            self.eq(pathinfo, await cell.addDrivePath('foo/bar/baz'))
+                # This will be done by the cell in a cell storage version migration...
+                async def migrate_v1(info, versinfo, data):
+                    data['woot'] = 'woot'
+                    return data
 
-            baziden = pathinfo[2].get('iden')
-            self.eq(pathinfo, await cell.drive.getItemPath(baziden))
+                await cell.drive.setTypeSchema('woot', testDataSchema_v1, migrate_v1)
 
-            info = await cell.setDriveInfoPerm(baziden, {'users': {rootuser: 3}, 'roles': {}})
-            self.eq(3, info['perm']['users'][rootuser])
+                versinfo, data = await cell.getDriveData(iden, vers=(1, 0, 0))
+                self.eq('woot', data.get('woot'))
 
-            with self.raises(s_exc.NoSuchIden):
-                # s_drive.rootdir is all 00s... ;)
-                await cell.setDriveInfoPerm(s_drive.rootdir, {'users': {}, 'roles': {}})
+                versinfo, data = await cell.getDriveData(iden, vers=(1, 1, 0))
+                self.eq('woot', data.get('woot'))
 
-            await cell.addDrivePath('hehe/haha')
-            pathinfo = await cell.setDriveInfoPath(baziden, 'hehe/haha/hoho')
+                with self.raises(s_exc.NoSuchIden):
+                    await cell.reqDriveInfo('d7d6107b200e2c039540fc627bc5537d')
 
-            self.eq('hoho', pathinfo[-1].get('name'))
-            self.eq(baziden, pathinfo[-1].get('iden'))
+                with self.raises(s_exc.TypeMismatch):
+                    await cell.getDriveInfo(iden, typename='newp')
 
-            self.true(await cell.drive.hasPathInfo('hehe/haha/hoho'))
-            self.false(await cell.drive.hasPathInfo('foo/bar/baz'))
+                self.nn(await cell.getDriveInfo(iden))
+                self.len(2, [vers async for vers in cell.getDriveDataVersions(iden)])
 
-            pathinfo = await cell.getDrivePath('foo/bar')
-            self.eq(0, pathinfo[-1].get('kids'))
+                await cell.delDriveData(iden)
+                self.len(1, [vers async for vers in cell.getDriveDataVersions(iden)])
 
-            pathinfo = await cell.getDrivePath('hehe/haha')
-            self.eq(1, pathinfo[-1].get('kids'))
+                await cell.delDriveInfo(iden)
 
-            with self.raises(s_exc.DupName):
-                iden = pathinfo[-2].get('iden')
-                name = pathinfo[-1].get('name')
-                cell.drive.reqFreeStep(iden, name)
+                self.none(await cell.getDriveInfo(iden))
+                self.len(0, [vers async for vers in cell.getDriveDataVersions(iden)])
 
-            walks = [item async for item in cell.drive.walkPathInfo('hehe')]
-            self.len(3, walks)
-            # confirm walked paths are yielded depth first...
-            self.eq('hoho', walks[0].get('name'))
-            self.eq('haha', walks[1].get('name'))
-            self.eq('hehe', walks[2].get('name'))
+                with self.raises(s_exc.NoSuchPath):
+                    await cell.getDrivePath('users/root/win32k.sys')
 
-            iden = walks[2].get('iden')
-            walks = [item async for item in cell.drive.walkItemInfo(iden)]
-            self.len(3, walks)
-            self.eq('hoho', walks[0].get('name'))
-            self.eq('haha', walks[1].get('name'))
-            self.eq('hehe', walks[2].get('name'))
+                pathinfo = await cell.addDrivePath('foo/bar/baz')
+                self.len(3, pathinfo)
+                self.eq('foo', pathinfo[0].get('name'))
+                self.eq(1, pathinfo[0].get('kids'))
+                self.eq('bar', pathinfo[1].get('name'))
+                self.eq(1, pathinfo[1].get('kids'))
+                self.eq('baz', pathinfo[2].get('name'))
+                self.eq(0, pathinfo[2].get('kids'))
 
-            self.none(cell.drive.getTypeSchema('newp'))
+                self.eq(pathinfo, await cell.addDrivePath('foo/bar/baz'))
 
-            cell.drive.validators.pop('woot')
-            self.nn(cell.drive.getTypeValidator('woot'))
+                baziden = pathinfo[2].get('iden')
+                self.eq(pathinfo, await cell.drive.getItemPath(baziden))
 
-            # move to root dir
-            pathinfo = await cell.setDriveInfoPath(baziden, 'zipzop')
-            self.len(1, pathinfo)
-            self.eq(s_drive.rootdir, pathinfo[-1].get('parent'))
+                info = await cell.setDriveInfoPerm(baziden, {'users': {rootuser: 3}, 'roles': {}})
+                self.eq(3, info['perm']['users'][rootuser])
 
-            pathinfo = await cell.setDriveInfoPath(baziden, 'hehe/haha/hoho')
-            self.len(3, pathinfo)
+                with self.raises(s_exc.NoSuchIden):
+                    # s_drive.rootdir is all 00s... ;)
+                    await cell.setDriveInfoPerm(s_drive.rootdir, {'users': {}, 'roles': {}})
+
+                await cell.addDrivePath('hehe/haha')
+                pathinfo = await cell.setDriveInfoPath(baziden, 'hehe/haha/hoho')
+
+                self.eq('hoho', pathinfo[-1].get('name'))
+                self.eq(baziden, pathinfo[-1].get('iden'))
+
+                self.true(await cell.drive.hasPathInfo('hehe/haha/hoho'))
+                self.false(await cell.drive.hasPathInfo('foo/bar/baz'))
+
+                pathinfo = await cell.getDrivePath('foo/bar')
+                self.eq(0, pathinfo[-1].get('kids'))
+
+                pathinfo = await cell.getDrivePath('hehe/haha')
+                self.eq(1, pathinfo[-1].get('kids'))
+
+                with self.raises(s_exc.DupName):
+                    iden = pathinfo[-2].get('iden')
+                    name = pathinfo[-1].get('name')
+                    cell.drive.reqFreeStep(iden, name)
+
+                walks = [item async for item in cell.drive.walkPathInfo('hehe')]
+                self.len(3, walks)
+                # confirm walked paths are yielded depth first...
+                self.eq('hoho', walks[0].get('name'))
+                self.eq('haha', walks[1].get('name'))
+                self.eq('hehe', walks[2].get('name'))
+
+                iden = walks[2].get('iden')
+                walks = [item async for item in cell.drive.walkItemInfo(iden)]
+                self.len(3, walks)
+                self.eq('hoho', walks[0].get('name'))
+                self.eq('haha', walks[1].get('name'))
+                self.eq('hehe', walks[2].get('name'))
+
+                self.none(cell.drive.getTypeSchema('newp'))
+
+                cell.drive.validators.pop('woot')
+                self.nn(cell.drive.getTypeValidator('woot'))
+
+                # move to root dir
+                pathinfo = await cell.setDriveInfoPath(baziden, 'zipzop')
+                self.len(1, pathinfo)
+                self.eq(s_drive.rootdir, pathinfo[-1].get('parent'))
+
+                pathinfo = await cell.setDriveInfoPath(baziden, 'hehe/haha/hoho')
+                self.len(3, pathinfo)
+
+            async with self.getTestCell(dirn=dirn) as cell:
+                data = {'type': 'woot', 'size': 20, 'stuff': 12, 'woot': 'woot'}
+                # explicitly clear out the cache JsValidators, otherwise we get the cached, pre-msgpack
+                # version of the validator, which will be correct and skip the point of this test.
+                s_config._JsValidators.clear()
+                cell.drive.reqValidData('woot', data)
 
     async def test_cell_auth(self):
 

{synapse-2.188.0 → synapse-2.188.1/synapse.egg-info}/PKG-INFO

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