synapse 2.212.0__py311-none-any.whl → 2.214.0__py311-none-any.whl

synapse/lib/types.py

@@ -651,9 +651,10 @@ class Hex(Type):
 
     def postTypeInit(self):
         self._size = self.opts.get('size')
+        self._zeropad = self.opts.get('zeropad')
 
         # This is for backward compat with v2.142.x where zeropad was a bool
-        self._zeropad = self.opts.get('zeropad')
+        # TODO: Remove this compat check in 3xx
         if isinstance(self._zeropad, bool):
             if self._zeropad:
                 self._zeropad = self._size
@@ -678,6 +679,7 @@ class Hex(Type):
         if self._size:
             self._zeropad = min(self._zeropad, self._size)
 
+        self.setNormFunc(int, self._normPyInt)
         self.setNormFunc(str, self._normPyStr)
         self.setNormFunc(bytes, self._normPyBytes)
         self.storlifts.update({
@@ -703,21 +705,47 @@ class Hex(Type):
         return self._storLiftNorm(cmpr, valu)
 
     def _storLiftPref(self, cmpr, valu):
+        if not isinstance(valu, str):
+            vtyp = type(valu).__name__
+            mesg = f'Hex prefix lift values must be str, not {vtyp}.'
+            raise s_exc.BadTypeValu(mesg=mesg, type=vtyp, name=self.name)
+
         valu = self._preNormHex(valu)
         return (
             ('^=', valu, self.stortype),
         )
 
+    def _normPyInt(self, valu):
+        extra = 7
+        if valu < 0:
+            # Negative values need a little more space to store the sign
+            extra = 8
+
+        bytelen = max((valu.bit_length() + extra) // 8, self._zeropad // 2)
+
+        try:
+            byts = valu.to_bytes(bytelen, 'big', signed=(valu < 0))
+            hexval = s_common.ehex(byts)
+
+        except OverflowError as e: # pragma: no cover
+            mesg = f'Invalid width for {valu}.'
+            raise s_exc.BadTypeValu(mesg=mesg, name=self.name)
+
+        if self._size and len(hexval) != self._size:
+            raise s_exc.BadTypeValu(valu=valu, reqwidth=self._size, name=self.name,
+                                    mesg='Invalid width.')
+
+        return hexval, {}
+
     def _normPyStr(self, valu):
-        valu = valu.strip().lower()
-        if valu.startswith('0x'):
-            valu = valu[2:]
+        valu = self._preNormHex(valu)
 
-        valu = valu.replace(' ', '').replace(':', '')
+        if len(valu) % 2 != 0:
+            valu = f'0{valu}'
 
         if not valu:
-            raise s_exc.BadTypeValu(valu=valu, name='hex',
-                                    mesg='No string left after stripping')
+            raise s_exc.BadTypeValu(valu=valu, name=self.name,
+                                    mesg='No string left after stripping.')
 
         if self._zeropad and len(valu) < self._zeropad:
             padlen = self._zeropad - len(valu)
@@ -732,7 +760,7 @@ class Hex(Type):
 
         if self._size and len(valu) != self._size:
             raise s_exc.BadTypeValu(valu=valu, reqwidth=self._size, name=self.name,
-                                    mesg='invalid width')
+                                    mesg='Invalid width.')
         return valu, {}
 
     def _normPyBytes(self, valu):

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, 212, 0)
+version = (2, 214, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '68ec8184b0e2469fd1ef30cbeb29f5989c60c768'
+commit = '41e2ed0599236256e9452b8afeb152660e68e2c2'

synapse/models/inet.py

@@ -1780,6 +1780,8 @@ class InetModule(s_module.CoreModule):
                             ('remover', ('inet:service:account', {}), {
                                 'doc': 'The service account which removed or decommissioned the {service:base}.'}),
 
+                            ('app', ('inet:service:app', {}), {
+                                'doc': 'The app which contains the {service:base}.'}),
                         ),
                     }),
 
@@ -3748,6 +3750,9 @@ class InetModule(s_module.CoreModule):
 
                         ('tenant', ('inet:service:tenant', {}), {
                             'doc': 'The tenant which contains the instance.'}),
+
+                        ('app', ('inet:service:app', {}), {
+                            'doc': 'The app which contains the instance.'}),
                     )),
 
                     ('inet:service:app', {}, (

synapse/telepath.py

@@ -1605,8 +1605,6 @@ async def openinfo(info):
         # cell://rel/path/to/celldir:share
         path = info.get('path')
 
-        name = info.get('name', '*')
-
         # support cell://<relpath>/<to>/<cell>
         # by detecting host...
         host = info.get('host')
@@ -1614,9 +1612,12 @@ async def openinfo(info):
             path = path.strip('/')
             path = os.path.join(host, path)
 
+        name = '*'
         if ':' in path:
             path, name = path.split(':')
 
+        name = info.get('name', name)
+
         full = os.path.join(path, 'sock')
         link = await s_link.unixconnect(full)
 
@@ -1626,6 +1627,7 @@ async def openinfo(info):
         path = info.get('path')
         if ':' in path:
             path, name = path.split(':')
+        name = info.get('name', name)
         link = await s_link.unixconnect(path)
 
     elif scheme in ('tcp', 'ssl'):

synapse/tests/files/testpkg_build_docs/docs/bar.rst

@@ -0,0 +1,15 @@
+:tocdepth: 2
+
+:orphan:
+
+.. highlight:: none
+.. storm-cortex:: default
+
+Bar
+---
+
+A wild node appears!
+
+.. storm-cli:: [inet:asn=1]
+
+Words!

synapse/tests/files/testpkg_build_docs/docs/foo.rst

@@ -0,0 +1,4 @@
+Hello world
+-----------
+
+Words

synapse/tests/files/testpkg_build_docs/storm/testcmd.storm

@@ -0,0 +1,5 @@
+$lib.debug = $cmdopts.debug
+
+$lib.print('Testcmd!')
+
+if $lib.debug { $lib.print('Debug enabled!') }

synapse/tests/files/testpkg_build_docs/testpkg.yaml

@@ -0,0 +1,69 @@
+name: testpkg
+version: 1.2.3
+synapse_version: ">=2.64.0,<3.0.0"
+
+genopts:
+  dotstorm: true
+
+author:
+  url: https://vertex.link
+  name: The Vertex Project, LLC.
+
+desc: The test package does things
+
+docs:
+    - title: Foo
+      path: docs/_build/foo.md
+    - title: Bar
+      path: docs/_build/bar.md
+    - title: Package Documentation
+      path: docs/_build/stormpackage.md
+
+modules:
+  - name: testmod
+  - name: apimod
+    apidefs:
+      - name: search
+        desc: |
+          Execute a search
+          
+          This API will foo the bar.
+          
+          Examples:
+              Foo the ``bar``::
+          
+                yield $lib.import(apimod).search(bar)
+          
+              Baz the bam::
+          
+                yield $lib.import(apimod).search(bam)
+
+        type:
+          type: function
+          args:
+            - { name: text, type: str, desc: "The text." }
+            - { name: mintime, type: [str, int], desc: "The mintime.", default: "-30days" }
+            - { name: foo, type: str, desc: "The foo." }
+            - { name: bar, type: str, desc: "The bar." }
+            - { name: baz, type: str, desc: "The baz." }
+          returns:
+            name: yields
+            type: node
+            desc: Yields it:dev:str nodes.
+      - name: status
+        desc: Get the status of the foo.
+        type:
+          type: function
+          returns:
+            type: dict
+            desc: A status dictionary.
+
+commands:
+  - name: testcmd
+    descr: |
+      A testcmd!
+    cmdargs:
+      - - --debug
+        - default: false
+          action: store_true
+          help: Show verbose debug output.

synapse/tests/test_cortex.py

@@ -5785,6 +5785,12 @@ class CortexBasicTest(s_t_utils.SynTest):
                     ddef = await core01.callStorm('return($lib.dmon.get($iden))', opts=opts)
                     self.none(ddef)
 
+                    await core00.callStorm('queue.del hehe')
+                    await core01.sync()
+
+                    self.none(await core00.getAuthGate('queue:hehe'))
+                    self.none(await core01.getAuthGate('queue:hehe'))
+
             # now lets start up in the opposite order...
             async with self.getTestCore(dirn=path01, conf=core01conf) as core01:
 
@@ -5889,7 +5895,7 @@ class CortexBasicTest(s_t_utils.SynTest):
 
                     # consumer offline
                     await asyncio.sleep(0)
-                    await self.asyncraises(ConnectionRefusedError, core00.callStorm(strim, opts=opts))
+                    await self.asyncraises(s_exc.LinkErr, core00.callStorm(strim, opts=opts))
 
                     # admin can still cull and break the mirror
                     await core00.nodes('[ inet:ipv4=127.0.0.1/28 ]')
@@ -8478,6 +8484,14 @@ class CortexBasicTest(s_t_utils.SynTest):
                     self.eq(msgs[1].get('hash'), qhash)
                     self.eq(msgs[1].get('pool:from'), f'00.core.{ahanet}')
 
+                    with self.getLoggerStream('synapse') as stream:
+                        core01.boss.is_shutdown = True
+                        self.stormHasNoWarnErr(await core00.stormlist('inet:asn=0'))
+                        core01.boss.is_shutdown = False
+
+                    stream.seek(0)
+                    self.isin('Proxy for pool mirror [01.core.synapse] is shutting down. Skipping.', stream.read())
+
                     with patch('synapse.cortex.CoreApi.getNexsIndx', _hang):
 
                         with self.getLoggerStream('synapse') as stream:
@@ -8761,3 +8775,8 @@ class CortexBasicTest(s_t_utils.SynTest):
                 self.eq(core._test_post_service_storage_index, offs)
                 self.eq(core._test_pre_nexus_index, offs)
                 self.ge(core._test_post_nexus_index, core._test_pre_nexus_index)
+
+    async def test_cortex_queue_mirror_authgates(self):
+        async with self.getRegrCore('2.213.0-queue-authgates') as core:
+            self.nn(await core.getAuthGate('queue:stillhere'))
+            self.none(await core.getAuthGate('queue:authtest'))

synapse/tests/test_daemon.py

@@ -98,7 +98,7 @@ class DaemonTest(s_t_utils.SynTest):
 
                 # Invalid data casues a link to fail on rx
                 async with await prox.getPoolLink() as link:
-                    with self.getAsyncLoggerStream('synapse.lib.link', 'rx error') as stream:
+                    with self.getAsyncLoggerStream('synapse.lib.link', 'rx closed unexpectedly') as stream:
                         byts = b'\x16\x03\x01\x02\x00\x01\x00\x01\xfc\x03\x03\xa6\xa3D\xd5\xdf%\xac\xa9\x92\xc3'
                         await link.send(byts)
                         self.true(await stream.wait(timeout=6))

synapse/tests/test_exc.py

@@ -54,3 +54,9 @@ class ExcTest(s_t_utils.SynTest):
 
         with self.raises(s_exc.BadArg):
             s_exc.StormRaise(mesg='newp')
+
+    async def test_reprexc(self):
+        exc = s_exc.SynErr(mesg='woot')
+        self.eq('woot', s_exc.reprexc(exc))
+        self.eq('ValueError()', s_exc.reprexc(ValueError()))
+        self.eq("ValueError('woot')", s_exc.reprexc(ValueError('woot')))

synapse/tests/test_lib_ast.py

@@ -2192,17 +2192,24 @@ class AstTest(s_test.SynTest):
             self.eq(nodes[1].ndef, ('test:str', 'init2'))
             self.eq(nodes[1].get('hehe'), 'hi')
 
-            # Non-runtsafe init fails to execute
+            # Non-runtsafe values allowed in init
+            q = '''
+            init {
+                [test:str=cool :hehe=runtsafety]
+                $lib.print(:hehe)
+            }
+            '''
+            msgs = await core.stormlist(q)
+            self.stormIsInPrint('runtsafety', msgs)
+
+            # Non-runtsafe init doesn't create the node
             q = '''
             test:str^=init +:hehe $hehe=:hehe
             init {
                 [test:str=$hehe]
             }
             '''
-            msgs = await core.stormlist(q)
-            erfo = [m for m in msgs if m[0] == 'err'][0]
-            self.eq(erfo[1][0], 'StormRuntimeError')
-            self.eq(erfo[1][1].get('mesg'), 'Init block query must be runtsafe')
+            self.len(2, await core.nodes(q))
 
             # Runtsafe init works and can yield nodes, this has inbound nodes as well
             q = '''
@@ -2231,7 +2238,7 @@ class AstTest(s_test.SynTest):
             self.eq(nodes[1].ndef, ('test:str', 'fini2'))
             self.eq(nodes[1].get('hehe'), 'hehe')
 
-            # Non-runtsafe fini example which fails
+            # Non-runtsafe fini example
             q = '''
             [test:str=fini3 :hehe="number3"]
             $hehe=:hehe
@@ -2239,10 +2246,10 @@ class AstTest(s_test.SynTest):
                 [(test:str=fini4 :hehe=$hehe)]
             }
             '''
-            msgs = await core.stormlist(q)
-            erfo = [m for m in msgs if m[0] == 'err'][0]
-            self.eq(erfo[1][0], 'StormRuntimeError')
-            self.eq(erfo[1][1].get('mesg'), 'Fini block query must be runtsafe')
+            nodes = await core.nodes(q)
+            self.len(2, nodes)
+            for node in nodes:
+                self.eq('number3', node.get('hehe'))
 
             # Tally use - case example for counting
             q = '''
@@ -2413,12 +2420,21 @@ class AstTest(s_test.SynTest):
             self.stormIsInPrint('blorp', msgs)
 
             q = '''
-            [test:str=latte :hehe=milk] $beep=:hehe | spin | empty { $lib.print($beep) }
+            [test:str=latte :hehe=milk] $beep=:hehe | spin | empty { $lib.print($beep) $lib.print(ok) }
             '''
             msgs = await core.stormlist(q)
             nodes = [m[1] for m in msgs if m[0] == 'node']
             self.len(0, nodes)
-            self.stormIsInErr('Empty block query must be runtsafe', msgs)
+            self.stormIsInPrint('ok', msgs)
+            self.stormNotInPrint('milk', msgs)
+
+            q = '''
+            empty { [test:str=runtsafety :hehe=optional] $beep=:hehe $lib.print($beep) }
+            '''
+            msgs = await core.stormlist(q)
+            nodes = [m[1] for m in msgs if m[0] == 'node']
+            self.len(1, nodes)
+            self.stormIsInPrint('optional', msgs)
 
             q = '''
             function foo() {
@@ -3224,11 +3240,11 @@ class AstTest(s_test.SynTest):
             off, end = errm[1][1]['highlight']['offsets']
             self.eq(':foo:bar', text[off:end])
 
-            text = 'init { $foo = :bar }'
+            text = 'init { $foo = $bar }'
             msgs = await core.stormlist(text)
             errm = [m for m in msgs if m[0] == 'err'][0]
             off, end = errm[1][1]['highlight']['offsets']
-            self.eq(':bar', text[off:end])
+            self.eq('bar', text[off:end])
 
             text = 'inet:ipv5'
             msgs = await core.stormlist(text)
@@ -3554,6 +3570,45 @@ class AstTest(s_test.SynTest):
 
             self.len(1, nodes)
 
+    async def test_ast_subgraph_multipivot(self):
+        async with self.getTestCore() as core:
+            guid = s_common.guid()
+            await core.nodes('''[
+                (test:guid=$guid :size=1234 :tick=now) +(refs)> {[test:str=blorp]}
+            ]''', opts={'vars': {'guid': guid}})
+
+            opts = {
+                'graph': {
+                    'pivots': ('-> *', '-(refs)> *'),
+                    'refs': True,
+                    'degrees': 1
+                }
+            }
+
+            nodes = []
+            async with await core.snap() as snap:
+                async for node, path in snap.storm('test:guid', opts=opts):
+                    nodes.append(node)
+
+            opts = {
+                'graph': {
+                    'pivots': ('-(refs)> *', '-> *'),
+                    'refs': True,
+                    'degrees': 1
+                }
+            }
+            nodes2 = []
+            async with await core.snap() as snap:
+                async for node, path in snap.storm('test:guid', opts=opts):
+                    nodes2.append(node)
+
+            self.eq(set(n.iden() for n in nodes), set(n.iden() for n in nodes2))
+            self.len(3, nodes)
+            ndefs = [n.ndef for n in nodes]
+            self.isin(('test:guid', guid), ndefs)
+            self.isin(('test:str', 'blorp'), ndefs)
+            self.isin(('test:int', 1234), ndefs)
+
     async def test_ast_double_init_fini(self):
         async with self.getTestCore() as core:
             q = '''

synapse/tests/test_lib_boss.py

@@ -62,3 +62,11 @@ class BossTest(s_test.SynTest):
                 coro = boss.schedCoro(double_promote())
                 self.true(await stream.wait(timeout=6))
                 await coro
+
+            async with boss.shutdown_lock:
+                with self.raises(s_exc.ShuttingDown):
+                    boss.reqNotShut()
+
+            boss.is_shutdown = True
+            with self.raises(s_exc.ShuttingDown):
+                boss.reqNotShut()

synapse/tests/test_lib_cell.py

@@ -187,6 +187,20 @@ testDataSchema_v1 = {
         'size': {'type': 'number'},
         'stuff': {'type': ['number', 'null'], 'default': None},
         'woot': {'type': 'string'},
+        'blorp': {
+            'type': 'object',
+            'properties': {
+                'bleep': {
+                    'type': 'array',
+                    'items': {
+                        'type': 'object',
+                        'properties': {
+                            'neato': {'type': 'string'}
+                        }
+                    }
+                }
+            }
+        }
     },
     'required': ['type', 'size', 'woot'],
     'additionalProperties': False,
@@ -194,6 +208,18 @@ testDataSchema_v1 = {
 
 class CellTest(s_t_utils.SynTest):
 
+    async def test_cell_getLocalUrl(self):
+        with self.getTestDir() as dirn:
+            async with self.getTestCell(dirn=dirn) as cell:
+                url = cell.getLocalUrl()
+                self.eq(url, f'cell://root@{dirn}')
+
+                url = cell.getLocalUrl(share='*/layer')
+                self.eq(url, f'cell://root@{dirn}:*/layer')
+
+                url = cell.getLocalUrl(user='lowuser', share='*/view')
+                self.eq(url, f'cell://lowuser@{dirn}:*/view')
+
     async def test_cell_drive(self):
 
         with self.getTestDir() as dirn:
@@ -232,13 +258,21 @@ class CellTest(s_t_utils.SynTest):
                 with self.raises(s_exc.BadVersion):
                     await cell.drive.setTypeSchema('woot', testDataSchema_v0, vers=0)
 
-                info = {'name': 'win32k.sys', 'type': 'woot'}
+                info = {'name': 'win32k.sys', 'type': 'woot', 'perm': {'users': {}}}
                 info = await cell.addDriveItem(info, reldir=rootdir)
+                self.notin('perm', info)
+                self.eq(info[0]['permissions'], {
+                    'users': {},
+                    'roles': {}
+                })
 
                 iden = info[-1].get('iden')
 
                 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}
@@ -293,6 +327,10 @@ class CellTest(s_t_utils.SynTest):
                 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, versinfo, ('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'
@@ -300,6 +338,37 @@ class CellTest(s_t_utils.SynTest):
 
                 await cell.drive.setTypeSchema('woot', testDataSchema_v1, migrate_v1)
 
+                versinfo['version'] = (1, 1, 1)
+                await cell.setDriveItemProp(iden, versinfo, 'stuff', 3829)
+                data = await cell.getDriveData(iden)
+                self.eq(data[0]['version'], (1, 1, 1))
+                self.eq(data[1]['stuff'], 3829)
+
+                await self.asyncraises(s_exc.NoSuchIden, cell.setDriveItemProp(s_common.guid(), versinfo, ('lolnope',), 'not real'))
+
+                await self.asyncraises(s_exc.BadArg, cell.setDriveItemProp(iden, versinfo, ('blorp', 0, 'neato'), 'my special string'))
+                data[1]['blorp'] = {
+                    'bleep': [{'neato': 'thing'}]
+                }
+                info, versinfo = await cell.setDriveData(iden, versinfo, data[1])
+                now = s_common.now()
+                versinfo['updated'] = now
+                await cell.setDriveItemProp(iden, versinfo, ('blorp', 'bleep', 0, 'neato'), 'my special string')
+                data = await cell.getDriveData(iden)
+                self.eq(now, data[0]['updated'])
+                self.eq('my special string', data[1]['blorp']['bleep'][0]['neato'])
+
+                versinfo['version'] = (1, 2, 1)
+                await cell.delDriveItemProp(iden, versinfo, ('blorp', 'bleep', 0, 'neato'))
+                vers, data = await cell.getDriveData(iden)
+                self.eq((1, 2, 1), vers['version'])
+                self.nn(data['blorp']['bleep'][0])
+                self.notin('neato', data['blorp']['bleep'][0])
+
+                await self.asyncraises(s_exc.NoSuchIden, cell.delDriveItemProp(s_common.guid(), versinfo, 'blorp'))
+
+                self.none(await cell.delDriveItemProp(iden, versinfo, ('lolnope', 'nopath')))
+
                 versinfo, data = await cell.getDriveData(iden, vers=(1, 0, 0))
                 self.eq('woot', data.get('woot'))
 
@@ -313,10 +382,10 @@ class CellTest(s_t_utils.SynTest):
                     await cell.getDriveInfo(iden, typename='newp')
 
                 self.nn(await cell.getDriveInfo(iden))
-                self.len(2, [vers async for vers in cell.getDriveDataVersions(iden)])
+                self.len(4, [vers async for vers in cell.getDriveDataVersions(iden)])
 
                 await cell.delDriveData(iden)
-                self.len(1, [vers async for vers in cell.getDriveDataVersions(iden)])
+                self.len(3, [vers async for vers in cell.getDriveDataVersions(iden)])
 
                 await cell.delDriveInfo(iden)
 
@@ -340,8 +409,12 @@ class CellTest(s_t_utils.SynTest):
                 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... ;)
@@ -636,6 +709,44 @@ class CellTest(s_t_utils.SynTest):
                 with self.raises(s_exc.NeedConfValu):
                     await echo.reqAhaProxy()
 
+    async def test_cell_drive_perm_migration(self):
+        async with self.getRegrCore('drive-perm-migr') as core:
+            item = await core.getDrivePath('driveitemdefaultperms')
+            self.len(1, item)
+            self.notin('perm', item)
+            self.eq(item[0]['permissions'], {'users': {}, 'roles': {}})
+
+            ldog = await core.auth.getRoleByName('littledog')
+            bdog = await core.auth.getRoleByName('bigdog')
+
+            louis = await core.auth.getUserByName('lewis')
+            tim = await core.auth.getUserByName('tim')
+            mj = await core.auth.getUserByName('mj')
+
+            item = await core.getDrivePath('permfolder/driveitemwithperms')
+            self.len(2, item)
+            self.notin('perm', item[0])
+            self.notin('perm', item[1])
+            self.eq(item[0]['permissions'], {'users': {tim.iden: s_cell.PERM_ADMIN}, 'roles': {}})
+            self.eq(item[1]['permissions'], {
+                'users': {
+                    mj.iden: s_cell.PERM_ADMIN
+                },
+                'roles': {
+                    ldog.iden: s_cell.PERM_READ,
+                    bdog.iden: s_cell.PERM_EDIT,
+                },
+                'default': s_cell.PERM_DENY
+            })
+
+            # make sure it's all good with easy perms
+            self.true(core._hasEasyPerm(item[0], tim, s_cell.PERM_ADMIN))
+            self.false(core._hasEasyPerm(item[0], mj, s_cell.PERM_EDIT))
+
+            self.true(core._hasEasyPerm(item[1], mj, s_cell.PERM_ADMIN))
+            self.true(core._hasEasyPerm(item[1], tim, s_cell.PERM_READ))
+            self.true(core._hasEasyPerm(item[1], louis, s_cell.PERM_EDIT))
+
     async def test_cell_unix_sock(self):
 
         async with self.getTestCore() as core:
@@ -2580,10 +2691,10 @@ class CellTest(s_t_utils.SynTest):
                     viewiden = view.get('iden')
 
                     opts = {'view': viewiden}
-                    with self.getLoggerStream('synapse.lib.lmdbslab',
+                    with self.getAsyncLoggerStream('synapse.lib.lmdbslab',
                                               'Error during slab resize callback - foo') as stream:
-                        nodes = await core.stormlist('for $x in $lib.range(200) {[inet:ipv4=$x]}', opts=opts)
-                        self.true(stream.wait(1))
+                        msgs = await core.stormlist('for $x in $lib.range(200) {[test:int=$x]}', opts=opts)
+                        self.true(await stream.wait(timeout=30))
 
         async with self.getTestCore() as core: