Enh: More targeted drive prop set

synapse/lib/cell.py

@@ -1685,7 +1685,7 @@ async def addDrivePath(self, path, perm=None, reldir=s_drive.rootdir):
 
             info = {
                 'name': name,
-                'perm': perm,
+                'permissions': perm,
                 'iden': s_common.guid(),
                 'created': tick,
                 'creator': user,
@@ -1715,6 +1715,17 @@ async def delDriveInfo(self, iden):
     async def setDriveInfoPerm(self, iden, perm):
         return self.drive.setItemPerm(iden, perm)
 
+    @s_nexus.Pusher.onPushAuto('drive:data:path:set')
+    async def setDriveItemProp(self, iden, path, valu):
+        if isinstance(path, str):
+            path = (path,)
+        vers, item = await self.getDriveData(iden)
+        step = item
+        for p in path[:-1]:
+            step = step[p]
+        step[path[-1]] = valu
+        return await self.drive.setItemData(iden, vers, item)
+
     @s_nexus.Pusher.onPushAuto('drive:set:path')
     async def setDriveInfoPath(self, iden, path):
 

synapse/lib/drive.py

@@ -69,6 +69,9 @@ def _reqInfoType(self, info, typename):
 
     def getItemInfo(self, iden, typename=None):
         info = self._getItemInfo(s_common.uhex(iden))
+        if not info:
+            return
+
         if typename is not None:
             self._reqInfoType(info, typename)
         return info
@@ -210,7 +213,7 @@ def setItemPerm(self, iden, perm):
 
     def _setItemPerm(self, bidn, perm):
         info = self._reqItemInfo(bidn)
-        info['perm'] = perm
+        info['permissions'] = perm
         s_schemas.reqValidDriveInfo(info)
         self.slab.put(LKEY_INFO + bidn, s_msgpack.en(info), db=self.dbname)
         return info
@@ -286,7 +289,7 @@ async def addItemInfo(self, info, path=None, reldir=rootdir):
         info['kids'] = 0
         info['parent'] = pariden
 
-        info.setdefault('perm', {'users': {}, 'roles': {}})
+        info.setdefault('permissions', {'users': {}, 'roles': {}})
         info.setdefault('version', (0, 0, 0))
 
         s_schemas.reqValidDriveInfo(info)

synapse/lib/schemas.py

@@ -15,6 +15,7 @@
             'type': 'object',
             'items': {'type': 'number', 'minimum': 0, 'maximum': 3},
         },
+        'default': {'type': 'number', 'minimum': 0, 'maximum': 3}
     },
     'required': ['users', 'roles'],
 }
@@ -483,7 +484,8 @@
         'parent': {'type': 'string', 'pattern': s_config.re_iden},
         'type': {'type': 'string', 'pattern': re_drivename},
         'name': {'type': 'string', 'pattern': re_drivename},
-        'perm': s_msgpack.deepcopy(easyPermSchema),
+        # TODO: This used to be called `perm`, so migrate this as part of the big migration from 2.x
+        'permissions': s_msgpack.deepcopy(easyPermSchema),
         'kids': {'type': 'number', 'minimum': 0},
         'created': {'type': 'number'},
         'creator': {'type': 'string', 'pattern': s_config.re_iden},

synapse/tests/test_lib_cell.py

@@ -212,6 +212,9 @@ async def test_cell_drive(self):
 
                 tick = s_common.now()
                 rootuser = cell.auth.rootuser.iden
+                fooser = await cell.auth.addUser('foo')
+                neatrole = await cell.auth.addRole('neatrole')
+                await fooser.grant(neatrole.iden)
 
                 with self.raises(s_exc.SchemaViolation):
                     versinfo = {'version': (1, 0, 0), 'updated': tick, 'updater': rootuser}
@@ -266,13 +269,21 @@ async def test_cell_drive(self):
                 info, versinfo = await cell.setDriveData(iden, versinfo, {'type': 'haha', 'size': 17, 'stuff': 15})
                 self.eq(versinfo, (await cell.getDriveData(iden))[0])
 
+                await cell.setDriveItemProp(iden, ('stuff',), 1234)
+                data = await cell.getDriveData(iden)
+                self.eq(data[1]['stuff'], 1234)
+
                 # 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)
 
+                await cell.setDriveItemProp(iden, 'stuff', 3829)
+                data = await cell.getDriveData(iden)
+                self.eq(data[1]['stuff'], 3829)
+
                 versinfo, data = await cell.getDriveData(iden, vers=(1, 0, 0))
                 self.eq('woot', data.get('woot'))
 
@@ -313,8 +324,12 @@ async def migrate_v1(info, versinfo, data):
                 baziden = pathinfo[2].get('iden')
                 self.eq(pathinfo, await cell.drive.getItemPath(baziden))
 
-                info = await cell.setDriveInfoPerm(baziden, {'users': {rootuser: 3}, 'roles': {}})
-                self.eq(3, info['perm']['users'][rootuser])
+                info = await cell.setDriveInfoPerm(baziden, {'users': {rootuser: s_cell.PERM_ADMIN}, 'roles': {}})
+                # make sure drive perms work with easy perms
+                self.true(cell._hasEasyPerm(info, cell.auth.rootuser, s_cell.PERM_ADMIN))
+                # defaults to READ
+                self.true(cell._hasEasyPerm(info, fooser, s_cell.PERM_READ))
+                self.false(cell._hasEasyPerm(info, fooser, s_cell.PERM_EDIT))
 
                 with self.raises(s_exc.NoSuchIden):
                     # s_drive.rootdir is all 00s... ;)