Merge branch 'master' into epiphyte-storm-http-errs

Author: vEpiphyte

changes/116c175a74bfbfefae62a705b3d7fe32.yaml

@@ -0,0 +1,5 @@
+---
+desc: Added missing permission declarations for light edges and queues.
+prs: []
+type: bug
+...

changes/c68703107768a6df0c087c3a0e3e1238.yaml

@@ -0,0 +1,5 @@
+---
+desc: Deprecated the ``modules`` Cortex configuration option.
+prs: []
+type: deprecation
+...

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 @@ def _initCorePerms(self):
             {'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 @@ async def _preLoadCoreModule(self, ctor, mods, cmds, mdefs, custom=False):
         if isinstance(ctor, (list, tuple)):
             ctor, conf = ctor
 
+        if not ctor.startswith('synapse.tests'):
+            s_common.deprecated("'modules' Cortex config value", curv='2.206.0')
+
         modu = self._loadCoreModule(ctor, conf=conf)
         if modu is None:
             return

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': ('cron', 'del'), 'gate': 'queue',
+         'desc': 'Permits a user to delete a queue.'},
+    )
     _storm_lib_path = ('queue',)
 
     def getObjLocals(self):

synapse/tests/test_cortex.py

@@ -84,6 +84,12 @@ async def test_cortex_basics(self):
 
                 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) as core:
+                    pass
+
     async def test_cortex_cellguid(self):
         iden = s_common.guid()
         conf = {'cell:guid': iden}