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

synapse/axon.py

@@ -138,8 +138,8 @@ class AxonFileHandler(AxonHandlerMixin, s_httpapi.Handler):
 
         self.blobsize = await self.getAxon().size(sha256b)
         if self.blobsize is None:
-            self.set_status(404)
-            self.sendRestErr('NoSuchFile', f'SHA-256 not found: {s_common.ehex(sha256b)}')
+            self.sendRestErr('NoSuchFile', f'SHA-256 not found: {s_common.ehex(sha256b)}',
+                             status_code=s_httpapi.HTTPStatus.NOT_FOUND)
             return False
 
         status = 200
@@ -260,8 +260,8 @@ class AxonHttpBySha256V1(AxonFileHandler):
 
         sha256b = s_common.uhex(sha256)
         if not await self.getAxon().has(sha256b):
-            self.set_status(404)
-            self.sendRestErr('NoSuchFile', f'SHA-256 not found: {sha256}')
+            self.sendRestErr('NoSuchFile', f'SHA-256 not found: {sha256}',
+                             status_code=s_httpapi.HTTPStatus.NOT_FOUND)
             return
 
         resp = await self.getAxon().del_(sha256b)
@@ -1659,7 +1659,7 @@ class Axon(s_cell.Cell):
                         'code': resp.status,
                         'body': await resp.read(),
                         'reason': s_common.httpcodereason(resp.status),
-                        'headers': dict(resp.headers),
+                        'headers': {str(k): v for k, v in resp.headers.items()},
                     }
                     return info
 
@@ -1706,7 +1706,7 @@ class Axon(s_cell.Cell):
                         'url': str(resp.url),
                         'code': resp.status,
                         'reason': s_common.httpcodereason(resp.status),
-                        'headers': dict(resp.headers),
+                        'headers': {str(k): v for k, v in resp.headers.items()},
                     }
                     return info
 
@@ -1736,11 +1736,11 @@ class Axon(s_cell.Cell):
             'ok': True,
             'url': str(resp.real_url),
             'code': resp.status,
-            'headers': dict(resp.headers),
+            'headers': {str(k): v for k, v in resp.headers.items()},
             'reason': s_common.httpcodereason(resp.status),
             'request': {
                 'url': str(resp.request_info.real_url),
-                'headers': dict(resp.request_info.headers),
+                'headers': {str(k): v for k, v in resp.request_info.headers.items()},
                 'method': str(resp.request_info.method),
             }
         }

synapse/cortex.py

@@ -815,7 +815,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         },
         'modules': {
             'default': [],
-            'description': 'A list of module classes to load.',
+            'description': 'Deprecated. A list of module classes to load.',
             'type': 'array'
         },
         'storm:log': {
@@ -1397,6 +1397,16 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             {'perm': ('node', 'del', '<form>'), 'gate': 'layer',
              'desc': 'Controls removing a specific form of node in a layer.'},
 
+            {'perm': ('node', 'edge', 'add'), 'gate': 'layer',
+             'desc': 'Controls adding light edges to a node.'},
+            {'perm': ('node', 'edge', 'del'), 'gate': 'layer',
+             'desc': 'Controls adding light edges to a node.'},
+
+            {'perm': ('node', 'edge', 'add', '<verb>'), 'gate': 'layer',
+             'desc': 'Controls adding a specific light edge to a node.'},
+            {'perm': ('node', 'edge', 'del', '<verb>'), 'gate': 'layer',
+             'desc': 'Controls adding a specific light edge to a node.'},
+
             {'perm': ('node', 'tag'), 'gate': 'layer',
              'desc': 'Controls editing any tag on any node in a layer.'},
             {'perm': ('node', 'tag', 'add'), 'gate': 'layer',
@@ -6372,6 +6382,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         if isinstance(ctor, (list, tuple)):
             ctor, conf = ctor
 
+        if not ctor.startswith(('synapse.tests', 'synapse.models')):
+            s_common.deprecated("'modules' Cortex config value", curv='2.206.0')
+
         modu = self._loadCoreModule(ctor, conf=conf)
         if modu is None:
             return

synapse/lib/aha.py

@@ -79,12 +79,9 @@ class AhaProvisionServiceV1(s_httpapi.Handler):
             url = await self.cell.addAhaSvcProv(name, provinfo=provinfo)
         except asyncio.CancelledError:  # pragma: no cover
             raise
-        except s_exc.SynErr as e:
-            logger.exception(f'Error provisioning {name}')
-            return self.sendRestErr(e.__class__.__name__, e.get('mesg', str(e)))
-        except Exception as e:  # pragma: no cover
+        except Exception as e:
             logger.exception(f'Error provisioning {name}')
-            return self.sendRestErr(e.__class__.__name__, str(e))
+            return self.sendRestExc(e, status_code=s_httpapi.HTTPStatus.BAD_REQUEST)
         return self.sendRestRetn({'url': url})
 
 _getAhaSvcSchema = {
@@ -175,6 +172,7 @@ class AhaApi(s_cell.CellApi):
         if network is None:
             await self._reqUserAllowed(('aha', 'service', 'get'))
         else:
+            s_common.deprecated('getAhaSvcs() network argument', curv='v2.206.0')
             await self._reqUserAllowed(('aha', 'service', 'get', network))
 
         async for info in self.cell.getAhaSvcs(network=network):
@@ -187,6 +185,8 @@ class AhaApi(s_cell.CellApi):
         NOTE: In order for the service to remain marked "up" a caller
               must maintain the telepath link.
         '''
+        if network is not None:
+            s_common.deprecated('addAhaSvc() network argument', curv='v2.206.0')
         svcname, svcnetw, svcfull = self.cell._nameAndNetwork(name, network)
 
         await self._reqUserAllowed(('aha', 'service', 'add', svcnetw, svcname))
@@ -253,26 +253,31 @@ class AhaApi(s_cell.CellApi):
         '''
         Remove an AHA service entry.
         '''
+        if network is not None:
+            s_common.deprecated('delAhaSvc() network argument', curv='v2.206.0')
         svcname, svcnetw, svcfull = self.cell._nameAndNetwork(name, network)
         await self._reqUserAllowed(('aha', 'service', 'del', svcnetw, svcname))
         return await self.cell.delAhaSvc(name, network=network)
 
     async def getCaCert(self, network):
-
+        s_common.deprecated('getCaCert() will no longer accept a network argument', curv='v2.206.0')
         await self._reqUserAllowed(('aha', 'ca', 'get'))
         return await self.cell.getCaCert(network)
 
     async def genCaCert(self, network):
-
+        s_common.deprecated('genCaCert()', curv='v2.206.0')
         await self._reqUserAllowed(('aha', 'ca', 'gen'))
         return await self.cell.genCaCert(network)
 
     async def signHostCsr(self, csrtext, signas=None, sans=None):
-
+        if signas is not None:
+            s_common.deprecated('signHostCsr() signas argument', curv='v2.206.0')
         await self._reqUserAllowed(('aha', 'csr', 'host'))
         return await self.cell.signHostCsr(csrtext, signas=signas, sans=sans)
 
     async def signUserCsr(self, csrtext, signas=None):
+        if signas is not None:
+            s_common.deprecated('signUserCsr() signas argument', curv='v2.206.0')
         await self._reqUserAllowed(('aha', 'csr', 'user'))
         return await self.cell.signUserCsr(csrtext, signas=signas)