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

synapse/tests/test_common.py

@@ -80,6 +80,7 @@ class CommonTest(s_t_utils.SynTest):
         self.true(s_common.vertup('30.40.50') > (9, 0))
 
     def test_common_file_helpers(self):
+
         # genfile
         with self.getTestDir() as testdir:
             fd = s_common.genfile(testdir, 'woot', 'foo.bin')
@@ -149,30 +150,10 @@ class CommonTest(s_t_utils.SynTest):
             retn = tuple(s_common.listdir(dirn, glob='*.txt'))
             self.eq(retn, ((path,)))
 
-            # getDirSize: check against du
             real, appr = s_common.getDirSize(dirn)
-
-            duapprstr = subprocess.check_output(['du', '-bs', dirn])
-            duappr = int(duapprstr.split()[0])
-            self.eq(duappr, appr)
-
-            # The following does not work in a busybox based environment,
-            # but manual testing of the getDirSize() API does confirm
-            # that the results are still as expected when run there.
-            argv = ['du', '-B', '1', '-s', dirn]
-            proc = subprocess.run(argv, capture_output=True)
-            try:
-                proc.check_returncode()
-            except subprocess.CalledProcessError as e:
-                stderr = proc.stderr.decode()
-                if 'unrecognized option: B' in stderr and 'BusyBox' in stderr:
-                    logger.warning(f'Unable to run {"".join(argv)} in BusyBox.')
-                else:
-                    raise
-            else:
-                durealstr = proc.stdout.decode()
-                dureal = int(durealstr.split()[0])
-                self.eq(dureal, real)
+            self.eq(real % 512, 0)
+            self.gt(real, appr)
+            self.ge(appr, len(b'woot') + len(b'nope'))
 
     def test_common_intify(self):
         self.eq(s_common.intify(20), 20)

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'])
 

synapse/tests/test_lib_aha.py

@@ -1,4 +1,5 @@
 import os
+import http
 import asyncio
 
 from unittest import mock
@@ -304,6 +305,7 @@ class AhaTest(s_test.SynTest):
 
             async with self.getHttpSess(auth=('root', 'secret'), port=httpsport) as sess:
                 async with sess.get(svcsurl) as resp:
+                    self.eq(resp.status, http.HTTPStatus.OK)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -312,6 +314,7 @@ class AhaTest(s_test.SynTest):
                             {svcinfo.get('name') for svcinfo in result})
 
                 async with sess.get(svcsurl, json={'network': 'synapse'}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.OK)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -320,6 +323,7 @@ class AhaTest(s_test.SynTest):
                             {svcinfo.get('name') for svcinfo in result})
 
                 async with sess.get(svcsurl, json={'network': 'newp'}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.OK)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -327,11 +331,13 @@ class AhaTest(s_test.SynTest):
 
                 # Sad path
                 async with sess.get(svcsurl, json={'newp': 'hehe'}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
 
                 async with sess.get(svcsurl, json={'network': 'mynet', 'newp': 'hehe'}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
@@ -339,6 +345,7 @@ class AhaTest(s_test.SynTest):
             # Sad path
             async with self.getHttpSess(auth=('lowuser', 'lowuser'), port=httpsport) as sess:
                 async with sess.get(svcsurl) as resp:
+                    self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'AuthDeny')
@@ -877,6 +884,7 @@ class AhaTest(s_test.SynTest):
             async with self.getHttpSess(auth=('root', 'secret'), port=httpsport) as sess:
                 # Simple request works
                 async with sess.post(url, json={'name': '00.foosvc'}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.OK)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -904,6 +912,7 @@ class AhaTest(s_test.SynTest):
                         }
                         }
                 async with sess.post(url, json=data) as resp:
+                    self.eq(resp.status, http.HTTPStatus.OK)
                     info = await resp.json()
                     self.eq(info.get('status'), 'ok')
                     result = info.get('result')
@@ -919,30 +928,37 @@ class AhaTest(s_test.SynTest):
 
                 # Sad path
                 async with sess.post(url) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': 1234}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': ''}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': '00.newp', 'provinfo': 5309}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': '00.newp', 'provinfo': {'dmon:port': -1}}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'SchemaViolation')
                 async with sess.post(url, json={'name': 'doom' * 16}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.BAD_REQUEST)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'BadArg')
@@ -951,6 +967,7 @@ class AhaTest(s_test.SynTest):
             await aha.addUser('lowuser', passwd='lowuser')
             async with self.getHttpSess(auth=('lowuser', 'lowuser'), port=httpsport) as sess:
                 async with sess.post(url, json={'name': '00.newp'}) as resp:
+                    self.eq(resp.status, http.HTTPStatus.FORBIDDEN)
                     info = await resp.json()
                     self.eq(info.get('status'), 'err')
                     self.eq(info.get('code'), 'AuthDeny')

synapse/tests/test_lib_cell.py

@@ -1,3 +1,4 @@
+import http
 import os
 import ssl
 import sys
@@ -2923,7 +2924,7 @@ class CellTest(s_t_utils.SynTest):
                 headers2 = {'X-API-KEY': rtk1}
                 resp = await sess.post(f'https://localhost:{hport}/api/v1/auth/onepass/issue', headers=headers2,
                                        json={'user': lowuser})
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 answ = await resp.json()
                 self.eq('err', answ['status'])
 
@@ -2945,7 +2946,7 @@ class CellTest(s_t_utils.SynTest):
 
                 resp = await sess.post(f'https://localhost:{hport}/api/v1/auth/onepass/issue', headers=headers2,
                                        json={'user': lowuser})
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 answ = await resp.json()
                 self.eq('err', answ['status'])
 
@@ -2985,13 +2986,14 @@ class CellTest(s_t_utils.SynTest):
                 await cell.setUserLocked(lowuser, True)
                 resp = await sess.post(f'https://localhost:{hport}/api/v1/auth/password/{lowuser}', headers=headers2,
                                        json={'passwd': 'secret'})
-                self.eq(401, resp.status)
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 answ = await resp.json()
                 self.eq('err', answ['status'])
 
                 await cell.delUser(lowuser)
                 resp = await sess.post(f'https://localhost:{hport}/api/v1/auth/password/{lowuser}', headers=headers2,
                                        json={'passwd': 'secret'})
+                self.eq(resp.status, http.HTTPStatus.UNAUTHORIZED)
                 answ = await resp.json()
                 self.eq('err', answ['status'])