synapse 2.205.0__py311-none-any.whl → 2.206.0__py311-none-any.whl

synapse/lib/modelrev.py

@@ -1455,7 +1455,7 @@ class ModelMigration_0_2_31:
 
         # Pick up and classify all bad CPE nodes
         for idx, layer in enumerate(self.layers):
-            logger.debug(f'Classifying nodes in layer {idx}')
+            logger.debug('Classifying nodes in layer %s %s', idx, layer.iden)
 
             async for buid, sode in layer.getStorNodesByForm('it:sec:cpe'):
 
@@ -1499,7 +1499,7 @@ class ModelMigration_0_2_31:
 
         # Pick up all related CPE node info. The majority of the work happens in this loop
         for idx, layer in enumerate(self.layers):
-            logger.debug(f'Processing nodes in layer {idx}')
+            logger.debug('Processing nodes in layer %s %s', idx, layer.iden)
 
             for buid, node in self.nodes.items():
                 await self._loadNode(layer, buid, node=node)
@@ -1541,7 +1541,7 @@ class ModelMigration_0_2_31:
             await self.todos.clear()
 
             for idx, layer in enumerate(self.layers):
-                logger.debug(f'Processing references in layer {idx}')
+                logger.debug('Processing references in layer %s %s', idx, layer.iden)
 
                 async for entry in todotmp:
                     match entry:

synapse/lib/schemas.py

@@ -1128,3 +1128,14 @@ _reqValidOauth2TokenResponseSchema = {
     'required': ['access_token', 'expires_in'],
 }
 reqValidOauth2TokenResponse = s_config.getJsValidator(_reqValidOauth2TokenResponseSchema)
+
+_httpLoginV1Schema = {
+    'type': 'object',
+    'properties': {
+        'user': {'type': 'string'},
+        'passwd': {'type': 'string'},
+        },
+    'additionalProperties': False,
+    'required': ['user', 'passwd'],
+}
+reqValidHttpLoginV1 = s_config.getJsValidator(_httpLoginV1Schema)

synapse/lib/spooled.py

@@ -8,6 +8,7 @@ import synapse.lib.msgpack as s_msgpack
 import synapse.lib.lmdbslab as s_lmdbslab
 
 MAX_SPOOL_SIZE = 10000
+DEFAULT_MAPSIZE = s_const.mebibyte * 32
 
 class Spooled(s_base.Base):
     '''
@@ -48,7 +49,7 @@ class Spooled(s_base.Base):
 
         slabpath = tempfile.mkdtemp(dir=dirn, prefix='spooled_', suffix='.lmdb')
 
-        self.slab = await s_lmdbslab.Slab.anit(slabpath, map_size=s_const.mebibyte * 32)
+        self.slab = await s_lmdbslab.Slab.anit(slabpath, map_size=DEFAULT_MAPSIZE)
         if self.cell is not None:
             self.slab.addResizeCallback(self.cell.checkFreeSpace)
 

synapse/lib/stormlib/aha.py

@@ -691,6 +691,7 @@ The ready column indicates that a service has entered into the realtime change w
                     {"name": "host", "width": 16},
                     {"name": "port", "width": 8},
                     {"name": "version", "width": 12},
+                    {"name": "synapse", "width": 12},
                     {"name": "nexus idx", "width": 10},
                 ],
                 "separators": {
@@ -732,6 +733,7 @@ The ready column indicates that a service has entered into the realtime change w
                     'host': $svcinfo.urlinfo.host,
                     'port': $svcinfo.urlinfo.port,
                     'version': '<unknown>',
+                    'synapse_version': '<unknown>',
                     'nexs_indx': (0)
                 })
                 if ($cell_infos.$svcname) {
@@ -743,7 +745,8 @@ The ready column indicates that a service has entered into the realtime change w
                     } else {
                         $status.role = 'leader'
                     }
-                    $status.version = $info.synapse.verstring
+                    $status.version = $info.cell.verstring
+                    $status.synapse_version = $info.synapse.verstring
                 }
                 $group_status.append($status)
             }
@@ -779,6 +782,7 @@ The ready column indicates that a service has entered into the realtime change w
                     $status.host,
                     $status.port,
                     $status.version,
+                    $status.synapse_version,
                     $status.nexs_indx
                 )
                 $lib.print($printer.row($row))

synapse/lib/stormlib/model.py

@@ -1181,7 +1181,7 @@ class LibModelMigrations_0_2_31(s_stormtypes.Lib):
                 await self.runt.printf(f'    layer: {layriden}')
                 for iden, refinfo in reflist:
                     form, prop, *_ = refinfo
-                    await self.runt.printf(f'      - {form}:{prop} (iden: {iden}')
+                    await self.runt.printf(f'      - {form}:{prop} (iden: {iden})')
 
         n1edges = node['n1edges']
         n2edges = node['n2edges']

synapse/lib/stormtypes.py

@@ -3933,6 +3933,16 @@ class LibQueue(Lib):
                   'returns': {'type': 'list',
                               'desc': 'A list of queue definitions the current user is allowed to interact with.', }}},
     )
+    _storm_lib_perms = (
+        {'perm': ('queue', 'add'), 'gate': 'cortex',
+         'desc': 'Permits a user to create a named queue.'},
+        {'perm': ('queue', 'get'), 'gate': 'queue',
+         'desc': 'Permits a user to access a queue. This allows the user to read from the queue and remove items from it.'},
+        {'perm': ('queue', 'put'), 'gate': 'queue',
+         'desc': 'Permits a user to put items into a queue.'},
+        {'perm': ('queue', 'del'), 'gate': 'queue',
+         'desc': 'Permits a user to delete a queue.'},
+    )
     _storm_lib_path = ('queue',)
 
     def getObjLocals(self):

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, 205, 0)
+version = (2, 206, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = 'd985f8b93669529b2d90895baabb1dc289e287df'
+commit = '0be7ce9e061b2c752fb454adb50c5267cc14fdfe'

synapse/models/base.py

@@ -188,6 +188,15 @@ class BaseModule(s_module.CoreModule):
                 (('meta:ruleset', 'has', 'meta:rule'), {
                     'doc': 'The meta:ruleset includes the meta:rule.'}),
 
+                (('meta:ruleset', 'has', 'inet:service:rule'), {
+                    'doc': 'The meta:ruleset includes the inet:service:rule.'}),
+
+                (('meta:ruleset', 'has', 'it:app:snort:rule'), {
+                    'doc': 'The meta:ruleset includes the it:app:snort:rule.'}),
+
+                (('meta:ruleset', 'has', 'it:app:yara:rule'), {
+                    'doc': 'The meta:ruleset includes the it:app:yara:rule.'}),
+
                 (('meta:rule', 'matches', None), {
                     'doc': 'The meta:rule has matched on target node.'}),
 

synapse/models/inet.py

@@ -108,12 +108,20 @@ class Addr(s_types.Str):
         s_types.Str.postTypeInit(self)
         self.setNormFunc(str, self._normPyStr)
 
+        self.defport = self.opts.get('defport', None)
+        self.defproto = self.opts.get('defproto', 'tcp')
+
     def _getPort(self, valu):
+
         parts = valu.split(':', 1)
         if len(parts) == 2:
             valu, port = parts
             port = self.modl.type('inet:port').norm(port)[0]
             return valu, port, f':{port}'
+
+        if self.defport:
+            return valu, self.defport, f':{self.defport}'
+
         return valu, None, ''
 
     def _normPyStr(self, valu):
@@ -123,7 +131,7 @@ class Addr(s_types.Str):
         # no protos use case sensitivity yet...
         valu = valu.lower()
 
-        proto = 'tcp'
+        proto = self.defproto
         parts = valu.split('://', 1)
         if len(parts) == 2:
             proto, valu = parts

synapse/models/infotech.py

@@ -1296,6 +1296,11 @@ class ItModule(s_module.CoreModule):
                     ('net6', ('inet:net6', {}), {
                         'doc': 'The optional contiguous IPv6 address range of this network.'}),
 
+                    ('dns:resolvers', ('array', {'type': 'inet:server',
+                                                 'typeopts': {'defport': 53, 'defproto': 'udp'},
+                                                 'sorted': True, 'uniq': True}), {
+                        'doc': 'An array of DNS servers configured to resolve requests for hosts on the network.'})
+
                 )),
                 ('it:account', {}, (
                     ('user', ('inet:user', {}), {

synapse/models/telco.py

@@ -193,6 +193,11 @@ class TelcoModule(s_module.CoreModule):
                     'doc': 'A mobile cell site which a phone may connect to.'
                 }),
 
+                # TODO - eventually break out ISO-3 country code into a sub
+                # https://en.wikipedia.org/wiki/TADIG_code
+                ('tel:mob:tadig', ('str', {'regex': '^[A-Z0-9]{5}$', 'strip': True}), {
+                    'doc': 'A Transferred Account Data Interchange Group number issued to a GSM carrier.'}),
+
             ),
 
             'forms': (
@@ -322,6 +327,9 @@ class TelcoModule(s_module.CoreModule):
                     ('loc', ('loc', {}), {
                         'doc': 'Location the carrier operates from.'
                     }),
+
+                    ('tadig', ('tel:mob:tadig', {}), {
+                        'doc': 'The TADIG code issued to the carrier.'}),
                 )),
                 ('tel:mob:cell', {}, (
                     ('carrier', ('tel:mob:carrier', {}), {'doc': 'Mobile carrier.', 'ro': True, }),
@@ -340,6 +348,8 @@ class TelcoModule(s_module.CoreModule):
                         'doc': 'The place associated with the latlong property.'}),
                 )),
 
+                ('tel:mob:tadig', {}, ()),
+
                 ('tel:mob:telem', {}, (
 
                     ('time', ('time', {}), {}),

synapse/tests/test_axon.py

@@ -1,7 +1,7 @@
 import io
 import os
 import csv
-import sys
+import http
 import base64
 import shutil
 import struct
@@ -573,14 +573,14 @@ bar baz",vv
         # No auth - coverage
         async with self.getHttpSess() as sess:
             async with sess.get(f'{url_dl}/foobar') as resp:
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 info = await resp.json()
                 self.eq('NotAuthenticated', info.get('code'))
             async with sess.head(f'{url_dl}/foobar') as resp:
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 # aiohttp ignores HEAD bodies
             async with sess.delete(f'{url_dl}/foobar') as resp:
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 info = await resp.json()
                 self.eq('NotAuthenticated', info.get('code'))
 
@@ -588,31 +588,31 @@ bar baz",vv
         async with self.getHttpSess(auth=('newb', 'secret'), port=port) as sess:
 
             async with sess.get(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             async with sess.delete(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             async with sess.get(f'{url_hs}/{asdfhash_h}') as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             async with sess.head(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
 
             async with sess.post(url_de) as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             async with sess.post(url_ul, data=abuf) as resp:
-                self.eq(403, resp.status)
+                self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
@@ -631,27 +631,27 @@ bar baz",vv
         # Basic
         async with self.getHttpSess(auth=('newb', 'secret'), port=port) as sess:
             async with sess.get(f'{url_dl}/foobar') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 info = await resp.json()
                 self.eq('err', info.get('status'))
                 self.eq('BadArg', info.get('code'))
                 self.eq('Hash is not a SHA-256: foobar', info.get('mesg'))
 
             async with sess.get(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 info = await resp.json()
                 self.eq('err', info.get('status'))
                 self.eq('NoSuchFile', info.get('code'))
                 self.eq(f'SHA-256 not found: {asdfhash_h}', info.get('mesg'))
 
             async with sess.get(f'{url_hs}/{asdfhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 self.false(item.get('result'))
 
             async with sess.post(url_ul, data=abuf) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -661,13 +661,13 @@ bar baz",vv
                 self.true(await realaxon.has(asdfhash))
 
             async with sess.get(f'{url_hs}/{asdfhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 self.true(item.get('result'))
 
             async with sess.put(url_ul, data=abuf) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -676,14 +676,14 @@ bar baz",vv
                 self.true(await realaxon.has(asdfhash))
 
             async with sess.get(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 self.eq(abuf, await resp.read())
 
             # Streaming upload
             byts = io.BytesIO(bbuf)
 
             async with sess.post(url_ul, data=byts) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -694,7 +694,7 @@ bar baz",vv
             byts = io.BytesIO(bbuf)
 
             async with sess.put(url_ul, data=byts) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -705,7 +705,7 @@ bar baz",vv
             byts = io.BytesIO(b'')
 
             async with sess.post(url_ul, data=byts) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 result = item.get('result')
@@ -715,7 +715,7 @@ bar baz",vv
 
             # Streaming download
             async with sess.get(f'{url_dl}/{bbufhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
 
                 byts = []
                 async for bytz in resp.content.iter_chunked(1024):
@@ -726,44 +726,44 @@ bar baz",vv
 
             # HEAD
             async with sess.head(f'{url_dl}/{bbufhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 self.eq('33554437', resp.headers.get('content-length'))
                 self.none(resp.headers.get('content-range'))
 
             async with sess.head(f'{url_dl}/foobar') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 self.eq('0', resp.headers.get('content-length'))
 
             # DELETE method by sha256
             async with sess.delete(f'{url_dl}/foobar') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 info = await resp.json()
                 self.eq('err', info.get('status'))
                 self.eq('BadArg', info.get('code'))
                 self.eq('Hash is not a SHA-256: foobar', info.get('mesg'))
 
             async with sess.delete(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 self.true(item.get('result'))
 
             async with sess.delete(f'{url_dl}/{asdfhash_h}') as resp:
-                self.eq(404, resp.status)
+                self.eq(resp.status, http.HTTPStatus.NOT_FOUND)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
 
             # test /api/v1/axon/file/del API
             data = {'sha256s': (asdfhash_h, asdfhash_h)}
             async with sess.post(url_de, json=data) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 item = await resp.json()
                 self.eq('ok', item.get('status'))
                 self.eq(((asdfhash_h, False), (asdfhash_h, False)), item.get('result'))
 
             data = {'newp': 'newp'}
             async with sess.post(url_de, json=data) as resp:
-                self.eq(200, resp.status)
+                self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                 item = await resp.json()
                 self.eq('err', item.get('status'))
                 self.eq('SchemaViolation', item.get('code'))
@@ -783,7 +783,7 @@ bar baz",vv
 
                 headers = {'range': 'bytes=2-4'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('3', resp.headers.get('content-length'))
                     self.eq('bytes 2-4/12', resp.headers.get('content-range'))
                     buf = b''
@@ -793,7 +793,7 @@ bar baz",vv
 
                 headers = {'range': 'bytes=,2-'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('10', resp.headers.get('content-length'))
                     self.eq('bytes 2-11/12', resp.headers.get('content-range'))
                     buf = b''
@@ -803,7 +803,7 @@ bar baz",vv
 
                 headers = {'range': 'bytes=0-11'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('12', resp.headers.get('content-length'))
                     self.eq('bytes 0-11/12', resp.headers.get('content-range'))
                     buf = b''
@@ -813,7 +813,7 @@ bar baz",vv
 
                 headers = {'range': 'bytes=10-11'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('2', resp.headers.get('content-length'))
                     self.eq('bytes 10-11/12', resp.headers.get('content-range'))
                     buf = b''
@@ -823,7 +823,7 @@ bar baz",vv
 
                 headers = {'range': 'bytes=11-11'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('1', resp.headers.get('content-length'))
                     self.eq('bytes 11-11/12', resp.headers.get('content-range'))
                     buf = b''
@@ -833,7 +833,7 @@ bar baz",vv
 
                 headers = {'range': 'bytes=2-4,8-11'}
                 async with sess.get(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('3', resp.headers.get('content-length'))
                     self.eq('bytes 2-4/12', resp.headers.get('content-range'))
                     buf = b''
@@ -844,39 +844,40 @@ bar baz",vv
                 # HEAD tests
                 headers = {'range': 'bytes=2-4'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('3', resp.headers.get('content-length'))
                     self.eq('bytes 2-4/12', resp.headers.get('content-range'))
 
                 headers = {'range': 'bytes=10-11'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('2', resp.headers.get('content-length'))
                     self.eq('bytes 10-11/12', resp.headers.get('content-range'))
 
                 headers = {'range': 'bytes=11-11'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(206, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.PARTIAL_CONTENT)
                     self.eq('1', resp.headers.get('content-length'))
                     self.eq('bytes 11-11/12', resp.headers.get('content-range'))
 
+                # TODO - In python 3.13+ this can be HTTPStatus.RANGE_NOT_SATISFIABLE
                 # Reading past blobsize isn't valid HTTP
                 headers = {'range': 'bytes=10-20'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(416, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
                 headers = {'range': 'bytes=11-12'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(416, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
                 headers = {'range': 'bytes=20-40'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(416, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
                 # Negative size
                 headers = {'range': 'bytes=20-4'}
                 async with sess.head(f'{url_dl}/{shatext}', headers=headers) as resp:
-                    self.eq(416, resp.status)
+                    self.eq(resp.status, http.HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
 
     async def test_axon_perms(self):
         async with self.getTestAxon() as axon:

synapse/tests/test_cortex.py

@@ -1,5 +1,6 @@
 import os
 import copy
+import http
 import time
 import asyncio
 import hashlib
@@ -83,6 +84,12 @@ class CortexTest(s_t_utils.SynTest):
 
                 await core.nodes('[ inet:ipv4=1.2.3.4 :asn=99 .seen=now +#foo:score=10 ]')
 
+            conf = {'modules': [('NewpModule', {})]}
+            warn = '''"'modules' Cortex config value" is deprecated'''
+            with self.assertWarnsRegex(DeprecationWarning, warn) as cm:
+                async with self.getTestCore(dirn=dirn, conf=conf) as core:
+                    pass
+
     async def test_cortex_cellguid(self):
         iden = s_common.guid()
         conf = {'cell:guid': iden}
@@ -1178,11 +1185,11 @@ class CortexTest(s_t_utils.SynTest):
             async with self.getHttpSess(port=port, auth=('visi', 'secret')) as sess:
                 body = {'query': 'return(asdf)', 'opts': {'user': core.auth.rootuser.iden}}
                 async with sess.get(f'https://localhost:{port}/api/v1/storm/call', json=body) as resp:
-                    self.eq(resp.status, 403)
+                    self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
 
             async with self.getHttpSess(port=port) as sess:
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/call')
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
 
             async with self.getHttpSess() as sess:
                 async with sess.post(f'https://localhost:{port}/api/v1/login',
@@ -1193,12 +1200,14 @@ class CortexTest(s_t_utils.SynTest):
 
                 body = {'query': 'return (asdf)'}
                 async with sess.get(f'https://localhost:{port}/api/v1/storm/call', json=body) as resp:
+                    self.eq(resp.status, http.HTTPStatus.OK)
                     retn = await resp.json()
                     self.eq('ok', retn.get('status'))
                     self.eq('asdf', retn['result'])
 
                 body = {'query': '$foo=() $bar=$foo.index(10) return ( $bar )'}
                 async with sess.get(f'https://localhost:{port}/api/v1/storm/call', json=body) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     retn = await resp.json()
                     self.eq('err', retn.get('status'))
                     self.eq('StormRuntimeError', retn.get('code'))
@@ -1206,6 +1215,7 @@ class CortexTest(s_t_utils.SynTest):
 
                 body = {'query': 'return ( $lib.exit() )'}
                 async with sess.post(f'https://localhost:{port}/api/v1/storm/call', json=body) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     retn = await resp.json()
                     self.eq('err', retn.get('status'))
                     self.eq('StormExit', retn.get('code'))
@@ -1214,6 +1224,7 @@ class CortexTest(s_t_utils.SynTest):
                 # No body
                 async with sess.get(f'https://localhost:{port}/api/v1/storm/call') as resp:
                     retn = await resp.json()
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     self.eq('err', retn.get('status'))
                     self.eq('SchemaViolation', retn.get('code'))
 
@@ -7402,18 +7413,17 @@ class CortexBasicTest(s_t_utils.SynTest):
 
             async with self.getHttpSess(port=port) as sess:
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/export')
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
 
             async with self.getHttpSess(port=port, auth=('visi', 'secret')) as sess:
                 body = {'query': 'inet:ipv4', 'opts': {'user': core.auth.rootuser.iden}}
                 async with sess.get(f'https://localhost:{port}/api/v1/storm/export', json=body) as resp:
-                    self.eq(resp.status, 403)
+                    self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
 
             async with self.getHttpSess(port=port, auth=('root', 'secret')) as sess:
 
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/export')
-                self.eq(200, resp.status)
-
+                self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                 reply = await resp.json()
                 self.eq('err', reply.get('status'))
                 self.eq('SchemaViolation', reply.get('code'))
@@ -7423,6 +7433,7 @@ class CortexBasicTest(s_t_utils.SynTest):
                     'opts': {'scrub': {'include': {'tags': ('visi',)}}},
                 }
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/export', json=body)
+                self.eq(resp.status, http.HTTPStatus.OK)
                 byts = await resp.read()
 
                 podes = [i[1] for i in s_msgpack.Unpk().feed(byts)]
@@ -7440,6 +7451,7 @@ class CortexBasicTest(s_t_utils.SynTest):
                 body = {'query': 'inet:ipv4=asdfasdf'}
                 resp = await sess.post(f'https://localhost:{port}/api/v1/storm/export', json=body)
                 retval = await resp.json()
+                self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                 self.eq('err', retval['status'])
                 self.eq('BadTypeValu', retval['code'])