synapse 2.176.0__py311-none-any.whl → 2.178.0__py311-none-any.whl

synapse/tests/test_lib_link.py

@@ -63,10 +63,15 @@ class LinkTest(s_test.SynTest):
         host, port = serv.sockets[0].getsockname()
 
         link = await s_link.connect(host, port)
-
+        info = link.getAddrInfo()
+        self.eq(info.get('family'), 'tcp')
+        self.eq(info.get('ipver'), 'ipv4')
         await link.send(b'visi')
         self.eq(b'vert', await link.recvsize(4))
         self.none(await link.recvsize(1))
+        await link.fini()
+        # We can still get the info after we've closed the socket / fini'd the link.
+        self.eq(info, link.getAddrInfo())
 
     async def test_link_tx_sadpath(self):
 
@@ -295,3 +300,39 @@ class LinkTest(s_test.SynTest):
                         await s_link.connect(hostname, port=port, ssl=sslctx)
                 finally:
                     server.close()
+
+                # Ensure we can talk to a TLS link though.
+                async def func(link: s_link.Link):
+                    self.eq(b'go', await link.recv(2))
+                    await link.tx(link.getAddrInfo())
+                    await link.fini()
+
+                srv_sslctx = certdir.getServerSSLContext(hostname)  # type: ssl.SSLContext
+                server = await s_link.listen(hostname, lport, onlink=func, ssl=srv_sslctx)
+                sslctx = certdir.getClientSSLContext()  # type: ssl.SSLContext
+                _, port = server.sockets[0].getsockname()
+                print(f'listening on port {port=}')
+                async with await s_link.connect(hostname, port=port, ssl=sslctx) as link:
+                    await link.send(b'go')
+                    item = await link.rx()
+                    self.eq(link.getAddrInfo().get('family'), 'tls')
+                    self.eq(item.get('family'), 'tls')
+                server.close()
+
+    async def test_link_unix(self):
+        with self.getTestDir() as dirn:
+
+            async def func(link: s_link.Link):
+                self.eq(b'go', await link.recv(2))
+                await link.tx(link.getAddrInfo())
+                await link.fini()
+            fp = s_common.genpath(dirn, 'sock')
+            server = await s_link.unixlisten(fp, onlink=func)
+
+            async with await s_link.unixconnect(fp) as link:
+                await link.send(b'go')
+                item = await link.rx()
+                self.eq(link.getAddrInfo().get('family'), 'unix')
+                self.eq(item.get('addr'), fp)
+                self.eq(item.get('family'), 'unix')
+            server.close()

synapse/tests/test_lib_lmdbslab.py

@@ -1528,6 +1528,74 @@ class LmdbSlabTest(s_t_utils.SynTest):
 
                 self.eq(3, slab.count(b'foo', db=dupsdb))
 
+    async def test_safekeyval(self):
+        with self.getTestDir() as dirn:
+
+            path = os.path.join(dirn, 'test.lmdb')
+
+            async with await s_lmdbslab.Slab.anit(path) as slab:
+
+                safekv = slab.getSafeKeyVal('test')
+
+                subkv1 = safekv.getSubKeyVal('pref1')
+                subkv2 = subkv1.getSubKeyVal('pref2')
+
+                self.eq(subkv2.prefix, 'pref1pref2')
+
+                subkv2.set('foo', 'bar')
+                subkv2.set('baz', 'faz')
+
+                self.eq(list(subkv2.keys()), ['baz', 'foo'])
+                self.eq(list(safekv.keys()), ['pref1pref2baz', 'pref1pref2foo'])
+                self.eq(list(safekv.values()), ['faz', 'bar'])
+
+                await safekv.truncate()
+                self.len(0, safekv.items())
+
+                subkv2.set('wow', 'guys')
+
+                newp = 'a' * 512
+
+                with self.raises(s_exc.BadArg):
+                    safekv.getSubKeyVal(newp)
+
+                with self.raises(s_exc.BadArg):
+                    safekv.get(newp)
+
+                with self.raises(s_exc.BadArg):
+                    safekv.set(newp, 'newp')
+
+                with self.raises(s_exc.BadArg):
+                    safekv.pop(newp)
+
+                with self.raises(s_exc.BadArg):
+                    safekv.delete(newp)
+
+                with self.raises(s_exc.BadArg):
+                    list(safekv.keys(pref=newp))
+
+                with self.raises(s_exc.BadArg):
+                    list(safekv.items(pref=newp))
+
+                with self.raises(s_exc.BadArg):
+                    list(safekv.values(pref=newp))
+
+                with self.raises(s_exc.BadArg):
+                    await safekv.truncate(pref=newp)
+
+                with self.raises(s_exc.BadArg):
+                    safekv.getSubKeyVal('')
+
+                with self.raises(s_exc.BadArg):
+                    slab.getSafeKeyVal('newp', create=False)
+
+            async with await s_lmdbslab.Slab.anit(path) as slab:
+                safekv = slab.getSafeKeyVal('test', create=False)
+                subkv1 = safekv.getSubKeyVal('pref1')
+                subkv2 = subkv1.getSubKeyVal('pref2')
+                self.eq(list(subkv2.keys()), ['wow'])
+
+
 class LmdbSlabMemLockTest(s_t_utils.SynTest):
 
     async def test_lmdbslabmemlock(self):

synapse/tests/test_lib_nexus.py

@@ -4,9 +4,9 @@ from unittest import mock
 import synapse.exc as s_exc
 import synapse.common as s_common
 
+import synapse.lib.auth as s_auth
 import synapse.lib.cell as s_cell
 import synapse.lib.nexus as s_nexus
-import synapse.lib.hiveauth as s_hiveauth
 
 import synapse.tests.utils as s_t_utils
 
@@ -111,6 +111,14 @@ class NexusTest(s_t_utils.SynTest):
                     stream.seek(0)
                     self.isin('while replaying log', stream.read())
 
+    async def test_nexus_modroot(self):
+
+        async with self.getTestCell() as cell:
+            await cell.sync()
+            async with cell.nexslock:
+                await cell.modNexsRoot(cell._ctorNexsRoot)
+            await cell.sync()
+
     async def test_nexus_mixin(self):
         with self.getTestDir() as dirn:
             dir1 = s_common.genpath(dirn, 'nexus1')
@@ -207,7 +215,7 @@ class NexusTest(s_t_utils.SynTest):
 
     async def test_nexus_safety(self):
 
-        orig = s_hiveauth.Auth.reqUser
+        orig = s_auth.Auth.reqUser
         async def slowReq(self, iden):
             await asyncio.sleep(0.2)
             return await orig(self, iden)
@@ -215,7 +223,7 @@ class NexusTest(s_t_utils.SynTest):
         with self.getTestDir() as dirn:
             async with self.getTestCore(dirn=dirn) as core:
 
-                with mock.patch('synapse.lib.hiveauth.Auth.reqUser', slowReq):
+                with mock.patch('synapse.lib.auth.Auth.reqUser', slowReq):
 
                     vcnt = len(core.views)
                     deflayr = (await core.getLayerDef()).get('iden')
@@ -245,7 +253,7 @@ class NexusTest(s_t_utils.SynTest):
                 vcnt = len(core.views)
                 strt = await core.nexsroot.index()
 
-                with mock.patch('synapse.lib.hiveauth.Auth.reqUser', slowReq):
+                with mock.patch('synapse.lib.auth.Auth.reqUser', slowReq):
                     for x in range(3):
                         vdef = {'layers': (deflayr,), 'name': f'someview{x}'}
                         with self.raises(TimeoutError):

synapse/tests/test_lib_node.py

@@ -174,13 +174,6 @@ class NodeTest(s_t_utils.SynTest):
             self.isin('tick', props)
             self.notin('newp', props)
 
-        form = 'test:str'
-        valu = 'cool'
-        props = {'tick': 12345,
-                 'hehe': 'hehe',
-                 }
-        tval = (None, None)
-
         async with self.getTestCore() as core:
             await core.addTagProp('score', ('int', {}), {})
             await core.addTagProp('note', ('str', {'lower': True, 'strip': 'True'}), {})

synapse/tests/test_lib_storm.py

@@ -955,6 +955,42 @@ class StormTest(s_t_utils.SynTest):
                 | merge --apply
             ''', opts=opts)
 
+            # make a few more edits and merge some of them to test --wipe
+            await core.stormlist('[ inet:fqdn=hehehaha.com inet:fqdn=woottoow.com ]')
+
+            layrcount = len(core.layers.values())
+            await core.stormlist('[ inet:fqdn=hehehaha.com inet:fqdn=woottoow.com ]', opts=opts)
+            oldlayr = await core.callStorm('return($lib.view.get().layers.0.iden)', opts=opts)
+            msgs = await core.stormlist('inet:fqdn=hehehaha.com | merge --apply --wipe', opts=opts)
+            self.stormHasNoWarnErr(msgs)
+            newlayr = await core.callStorm('return($lib.view.get().layers.0.iden)', opts=opts)
+            self.ne(oldlayr, newlayr)
+            msgs = await core.stormlist('''
+                $layr = $lib.view.get().layers.0.iden
+                $user = $lib.auth.users.byname(visi)
+                $role = $lib.auth.roles.add(ninjas)
+
+                $user.grant($role.iden)
+
+                $user.setAdmin((true), gateiden=$layr)
+                $user.addRule(([true, ["foo", "bar"]]), gateiden=$layr)
+                $role.addRule(([true, ["baz", "faz"]]), gateiden=$layr)
+            ''', opts=opts)
+            self.stormHasNoWarnErr(msgs)
+            await core.callStorm('$lib.view.get().swapLayer()', opts=opts)
+            self.ne(newlayr, await core.callStorm('return($lib.view.get().layers.0.iden)', opts=opts))
+
+            self.true(await core.callStorm('''
+                $layr = $lib.view.get().layers.0.iden
+                return($lib.auth.users.byname(visi).allowed(foo.bar, gateiden=$layr))
+            ''', opts=opts))
+            self.true(await core.callStorm('''
+                $layr = $lib.view.get().layers.0.iden
+                return($lib.auth.users.byname(visi).allowed(baz.faz, gateiden=$layr))
+            ''', opts=opts))
+
+            self.len(0, await core.nodes('diff', opts=opts))
+
             self.len(0, await core.callStorm('''
                 $list = $lib.list()
                 for ($buid, $sode) in $lib.view.get().layers.0.getStorNodes() {
@@ -4235,6 +4271,15 @@ class StormTest(s_t_utils.SynTest):
                 msgs = await core.stormlist(pushq, opts={'user': visi.iden, 'vars': varz})
                 self.stormHasNoWarnErr(msgs)
 
+                l1iden = l1.get('iden')
+                pdef = list(core.getLayer(l1iden).layrinfo['pushs'].values())[0]
+                self.none(await core.addLayrPush(l1iden, pdef))
+                self.len(1, list(core.getLayer(l1iden).layrinfo['pushs'].values()))
+
+                pdef = list(core.getLayer(l1iden).layrinfo['pulls'].values())[0]
+                self.none(await core.addLayrPull(l1iden, pdef))
+                self.len(1, list(core.getLayer(l1iden).layrinfo['pulls'].values()))
+
     async def test_storm_tagprune(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_stormlib_aha.py

@@ -10,7 +10,7 @@ class AhaLibTest(s_test.SynTest):
 
     async def test_stormlib_aha_basics(self):
 
-        async with self.getTestAhaProv() as aha:
+        async with self.getTestAha() as aha:
 
             with self.getTestDir() as dirn:
 
@@ -36,24 +36,24 @@ class AhaLibTest(s_test.SynTest):
                 self.len(5, svcs)
 
                 svc = await core00.callStorm('return( $lib.aha.get(core...) )')
-                self.eq('core.loop.vertex.link', svc.get('name'))
-                svc = await core00.callStorm('return( $lib.aha.get(core.loop.vertex.link))')
-                self.eq('core.loop.vertex.link', svc.get('name'))
+                self.eq('core.synapse', svc.get('name'))
+                svc = await core00.callStorm('return( $lib.aha.get(core.synapse))')
+                self.eq('core.synapse', svc.get('name'))
                 svc = await core00.callStorm('return( $lib.aha.get(00.cell...))')
-                self.eq('00.cell.loop.vertex.link', svc.get('name'))
+                self.eq('00.cell.synapse', svc.get('name'))
                 svc = await core00.callStorm('return( $lib.aha.get(cell...))')
-                self.eq('cell.loop.vertex.link', svc.get('name'))
+                self.eq('cell.synapse', svc.get('name'))
                 svc = await core00.callStorm('$f=({"mirror": (true)}) return( $lib.aha.get(cell..., filters=$f))')
-                self.eq('01.cell.loop.vertex.link', svc.get('name'))
+                self.eq('01.cell.synapse', svc.get('name'))
 
                 # List the aha services available
                 msgs = await core00.stormlist('aha.svc.list --nexus')
                 self.stormIsInPrint('Nexus', msgs)
-                self.stormIsInPrint('00.cell.loop.vertex.link                      true   true   true', msgs)
-                self.stormIsInPrint('01.cell.loop.vertex.link                      false  true   true', msgs)
-                self.stormIsInPrint('cell.loop.vertex.link                         true   true   true', msgs)
-                self.stormIsInPrint('core.loop.vertex.link                         null   true   true', msgs)
-                self.stormIsInPrint('mysvc.loop.vertex.link                        null   true   true', msgs)
+                self.stormIsInPrint('00.cell.synapse                      true   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('01.cell.synapse                      false  true   true', msgs, whitespace=False)
+                self.stormIsInPrint('cell.synapse                         true   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('core.synapse                         null   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('mysvc.synapse                        null   true   true', msgs, whitespace=False)
 
                 msgs = await core00.stormlist('aha.svc.list')
                 self.stormNotInPrint('Nexus', msgs)
@@ -63,24 +63,24 @@ class AhaLibTest(s_test.SynTest):
                 # Omit checking part of that.
                 emsg = '''Resolved cell... to an AHA Service.
 
-Name:       cell.loop.vertex.link
+Name:       cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
 Cell iden:  ********************************
 Leader:     cell
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
-                self.stormIsInPrint('    hostname:   00.cell.loop.vertex.link', msgs)
+                self.stormIsInPrint('    hostname:   00.cell.synapse', msgs)
                 self.stormIsInPrint('    scheme:     ssl', msgs)
                 self.stormIsInPrint('    user:       root', msgs)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus cell...')
                 emsg = '''Resolved cell... to an AHA Service.
 
-Name:       cell.loop.vertex.link
+Name:       cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
@@ -88,14 +88,14 @@ Cell iden:  ********************************
 Leader:     cell
 Nexus:      1
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus 01.cell...')
                 emsg = '''Resolved 01.cell... to an AHA Service.
 
-Name:       01.cell.loop.vertex.link
+Name:       01.cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
@@ -103,15 +103,15 @@ Cell iden:  ********************************
 Leader:     cell
 Nexus:      1
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
                 # Full name works
-                msgs = await core00.stormlist('aha.svc.stat 01.cell.loop.vertex.link')
-                emsg = '''Resolved 01.cell.loop.vertex.link to an AHA Service.
+                msgs = await core00.stormlist('aha.svc.stat 01.cell.synapse')
+                emsg = '''Resolved 01.cell.synapse to an AHA Service.
 
-Name:       01.cell.loop.vertex.link
+Name:       01.cell.synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
@@ -128,8 +128,8 @@ Name:       01.cell.loop.vertex.link
                 emsg = '''Resolved pool00... to an AHA Pool.
 
 The pool currently has 1 members.
-AHA Pool:   pool00.loop.vertex.link
-Member:     00.cell.loop.vertex.link'''
+AHA Pool:   pool00.synapse
+Member:     00.cell.synapse'''
                 self.stormIsInPrint(emsg, msgs)
 
                 # Shut down a service
@@ -139,16 +139,15 @@ Member:     00.cell.loop.vertex.link'''
                 self.len(nevents, await waiter.wait(timeout=12))
 
                 msgs = await core00.stormlist('aha.svc.list')
-                self.stormIsInPrint('01.cell.loop.vertex.link                      false  false  false', msgs)
+                self.stormIsInPrint('01.cell.synapse false  false  false', msgs, whitespace=False)
 
                 # Fake a record
                 await aha.addAhaSvc('00.newp', info={'urlinfo': {'scheme': 'tcp', 'host': '0.0.0.0', 'port': '3030'}},
-                                    network='loop.vertex.link')
+                                    network='synapse')
 
                 msgs = await core00.stormlist('aha.svc.list --nexus')
-                emsg = '00.newp.loop.vertex.link                      null   false  null  0.0.0.0         3030  ' \
-                       'Service is not online. Will not attempt to retrieve its nexus offset.'
-                self.stormIsInPrint(emsg, msgs)
+                emsg = '00.newp.synapse                      null   false  null  0.0.0.0         3030  <offline>'
+                self.stormIsInPrint(emsg, msgs, whitespace=False)
 
                 self.none(await core00.callStorm('return($lib.aha.del(00.newp...))'))
                 msgs = await core00.stormlist('aha.svc.list')
@@ -161,22 +160,22 @@ Member:     00.cell.loop.vertex.link'''
                                                                  'port': '3030'},
                                                      'online': guid,
                                                      },
-                                    network='loop.vertex.link')
+                                    network='synapse')
                 msgs = await core00.stormlist('aha.svc.list --nexus')
-                emsg = '00.newp.loop.vertex.link                      null   true   null  0.0.0.0         3030  ' \
-                       'Failed to connect to Telepath service: "aha://00.newp.loop.vertex.link/" error:'
-                self.stormIsInPrint(emsg, msgs)
+                emsg = '00.newp.synapse null   true   null  0.0.0.0         3030  ' \
+                       'Failed to connect to Telepath service: "aha://00.newp.synapse/" error:'
+                self.stormIsInPrint(emsg, msgs, whitespace=False)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus 00.newp...')
                 emsg = '''Resolved 00.newp... to an AHA Service.
 
-Name:       00.newp.loop.vertex.link
+Name:       00.newp.synapse
 Online:     true
 Ready:      null
 Run iden:   $lib.null
 Cell iden:  $lib.null
 Leader:     Service did not register itself with a leader name.
-Nexus:      Failed to connect to Telepath service: "aha://00.newp.loop.vertex.link/" error: [Errno 111] Connect call failed ('0.0.0.0', 3030)
+Nexus:      Failed to connect to Telepath service: "aha://00.newp.synapse/" error: [Errno 111] Connect call failed ('0.0.0.0', 3030)
 Connection information:
     host:       0.0.0.0
     port:       3030
@@ -185,7 +184,7 @@ Connection information:
                 self.stormIsInPrint(emsg, msgs)
 
                 # Delete the fake service with its full service name
-                self.none(await core00.callStorm('return($lib.aha.del(00.newp.loop.vertex.link))'))
+                self.none(await core00.callStorm('return($lib.aha.del(00.newp.synapse))'))
                 self.none(await core00.callStorm('return($lib.aha.get(00.newp...))'))
 
                 # Coverage for sad paths

synapse/tests/test_lib_stormlib_auth.py

@@ -480,6 +480,9 @@ class StormLibAuthTest(s_test.SynTest):
 
             await core.callStorm('$lib.user.vars.set(foo, foovalu)', opts=asvisi)
 
+            msgs = await core.stormlist('for $valu in $lib.user.vars { $lib.print($valu) }', opts=asvisi)
+            self.stormIsInPrint("('foo', 'foovalu')", msgs)
+
             q = 'return($lib.auth.users.byname(visi).vars.foo)'
             self.eq('foovalu', await core.callStorm(q, opts=asvisi))
 
@@ -494,6 +497,24 @@ class StormLibAuthTest(s_test.SynTest):
             await core.callStorm('$lib.auth.users.byname(visi).vars.foo=$lib.undef')
             self.none(await core.callStorm('return($lib.auth.users.byname(visi).vars.foo)'))
 
+            with self.raises(s_exc.StormRuntimeError):
+                await core.callStorm('$lib.user.vars.set((1), newp)')
+
+            await core.callStorm('$lib.user.profile.set(bar, foovalu)', opts=asvisi)
+
+            self.eq('foovalu', await core.callStorm('return($lib.user.profile.get(bar))', opts=asvisi))
+
+            self.eq((('bar', 'foovalu'),), await core.callStorm('return($lib.user.profile.list())', opts=asvisi))
+
+            msgs = await core.stormlist('for $valu in $lib.user.profile { $lib.print($valu) }', opts=asvisi)
+            self.stormIsInPrint("('bar', 'foovalu')", msgs)
+
+            await core.callStorm('$lib.user.profile.pop(bar)', opts=asvisi)
+            self.none(await core.callStorm('return($lib.user.profile.get(bar))', opts=asvisi))
+
+            with self.raises(s_exc.StormRuntimeError):
+                await core.callStorm('$lib.user.profile.set((1), newp)')
+
     async def test_stormlib_auth_base(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_stormlib_cell.py

@@ -76,18 +76,7 @@ class StormCellTest(s_test.SynTest):
 
     async def test_stormlib_cell_getmirrors(self):
 
-        conf = {
-            'aha:name': 'aha',
-            'aha:network': 'mynet',
-            'provision:listen': 'tcp://127.0.0.1:0',
-        }
-        async with self.getTestCell(s_aha.AhaCell, conf=conf) as aha:
-
-            provaddr, provport = aha.provdmon.addr
-            aha.conf['provision:listen'] = f'tcp://127.0.0.1:{provport}'
-
-            ahahost, ahaport = await aha.dmon.listen('ssl://127.0.0.1:0?hostname=aha.mynet&ca=mynet')
-            aha.conf['aha:urls'] = (f'ssl://127.0.0.1:{ahaport}?hostname=aha.mynet',)
+        async with self.getTestAha() as aha:
 
             provurl = await aha.addAhaSvcProv('00.cortex')
             coreconf = {'aha:provision': provurl}
@@ -116,7 +105,7 @@ class StormCellTest(s_test.SynTest):
                     await core01.nodes('[ inet:ipv4=1.2.3.4 ]')
                     self.len(1, await core00.nodes('inet:ipv4=1.2.3.4'))
 
-                    expurls = ['aha://01.cortex.mynet']
+                    expurls = ['aha://01.cortex.synapse']
 
                     self.eq(expurls, await core00.callStorm('return($lib.cell.getMirrorUrls())'))
                     self.eq(expurls, await core01.callStorm('return($lib.cell.getMirrorUrls())'))
@@ -148,11 +137,11 @@ class StormCellTest(s_test.SynTest):
 
                         await svc01.sync()
 
-                        expurls = ('aha://01.testsvc.mynet',)
+                        expurls = ('aha://01.testsvc.synapse',)
 
                         self.eq(expurls, await core00.callStorm('return($lib.cell.getMirrorUrls(name=testsvc))'))
 
-                    await aha.delAhaSvc('00.testsvc.mynet')
+                    await aha.delAhaSvc('00.testsvc.synapse')
 
                     with self.raises(s_exc.NoSuchName):
                         await core00.callStorm('return($lib.cell.getMirrorUrls(name=testsvc))')

synapse/tests/test_lib_stormlib_cortex.py

@@ -489,10 +489,10 @@ $request.reply(206, headers=$headers, body=({"no":"body"}))
                 await core.callStorm(q, opts={'vars': {'iden': iden3}})
 
             msgs = await core.stormlist('cortex.httpapi.list')
-            self.stormIsInPrint(f'0     {iden0}', msgs)
-            self.stormIsInPrint(f'1     {iden1}', msgs)
-            self.stormIsInPrint(f'2     {iden2}', msgs)
-            self.stormIsInPrint(f'3     {iden3}', msgs)
+            self.stormIsInPrint(f'0     | {iden0}', msgs)
+            self.stormIsInPrint(f'1     | {iden1}', msgs)
+            self.stormIsInPrint(f'2     | {iden2}', msgs)
+            self.stormIsInPrint(f'3     | {iden3}', msgs)
 
             q = '''
             $ret = $lib.null $api = $lib.cortex.httpapi.getByPath($path)
@@ -528,10 +528,10 @@ $request.reply(206, headers=$headers, body=({"no":"body"}))
             self.eq(iden0, await core.callStorm(q, opts={'vars': {'path': 'hehe/ohmy'}}))
 
             msgs = await core.stormlist('cortex.httpapi.list')
-            self.stormIsInPrint(f'0     {iden1}', msgs)
-            self.stormIsInPrint(f'1     {iden0}', msgs)
-            self.stormIsInPrint(f'2     {iden2}', msgs)
-            self.stormIsInPrint(f'3     {iden3}', msgs)
+            self.stormIsInPrint(f'0     | {iden1}', msgs)
+            self.stormIsInPrint(f'1     | {iden0}', msgs)
+            self.stormIsInPrint(f'2     | {iden2}', msgs)
+            self.stormIsInPrint(f'3     | {iden3}', msgs)
 
             # The wildcard handler does not match the more specific request as a result of the new order
             async with self.getHttpSess(auth=('root', 'root'), port=hport) as sess:
@@ -569,10 +569,10 @@ $request.reply(206, headers=$headers, body=({"no":"body"}))
             self.stormIsInPrint(f'Set HTTP API {iden0} to index 3', msgs)
 
             msgs = await core.stormlist('cortex.httpapi.list')
-            self.stormIsInPrint(f'0     {iden1}', msgs)
-            self.stormIsInPrint(f'1     {iden2}', msgs)
-            self.stormIsInPrint(f'2     {iden3}', msgs)
-            self.stormIsInPrint(f'3     {iden0}', msgs)
+            self.stormIsInPrint(f'0     | {iden1}', msgs)
+            self.stormIsInPrint(f'1     | {iden2}', msgs)
+            self.stormIsInPrint(f'2     | {iden3}', msgs)
+            self.stormIsInPrint(f'3     | {iden0}', msgs)
 
             # iden Prefix + name matching
             msgs = await core.stormlist('cortex.httpapi.index $iden 0', opts={'vars': {'iden': iden1[:6]}})