synapse 2.153.0__py311-none-any.whl → 2.154.0__py311-none-any.whl

synapse/cortex.py

@@ -1271,10 +1271,14 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         await self._initOAuthManager()
 
+        stormdmonhive = await self.hive.open(('cortex', 'storm', 'dmons'))
+        self.stormdmonhive = await stormdmonhive.dict()
         self.stormdmons = await s_storm.DmonManager.anit(self)
         self.onfini(self.stormdmons)
+
         self.agenda = await s_agenda.Agenda.anit(self)
         self.onfini(self.agenda)
+
         await self._initStormGraphs()
 
         self.trigson = self.conf.get('trigger:enable')
@@ -2233,10 +2237,6 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
     async def _initStormDmons(self):
 
-        node = await self.hive.open(('cortex', 'storm', 'dmons'))
-
-        self.stormdmonhive = await node.dict()
-
         for iden, ddef in self.stormdmonhive.items():
             try:
                 await self.runStormDmon(iden, ddef)

synapse/lib/ast.py

@@ -593,10 +593,15 @@ class SubQuery(Oper):
         async for item in self.kids[0].run(runt, genr):
             yield item
 
-    async def _compute(self, runt, limit):
+    async def _compute(self, runt, path, limit):
+
         retn = []
 
-        async with runt.getSubRuntime(self.kids[0]) as runt:
+        opts = {}
+        if path is not None:
+            opts['vars'] = path.vars.copy()
+
+        async with runt.getSubRuntime(self.kids[0], opts=opts) as runt:
             async for valunode, valupath in runt.execute():
 
                 retn.append(valunode.ndef[1])
@@ -615,7 +620,7 @@ class SubQuery(Oper):
         Its value is the primary property of the node yielded, or the returned value.
         '''
         try:
-            retn = await self._compute(runt, 1)
+            retn = await self._compute(runt, path, 1)
 
         except s_stormctrl.StormReturn as e:
             # a subquery assignment with a return; just use the returned value
@@ -631,7 +636,7 @@ class SubQuery(Oper):
         Use subquery as an array.
         '''
         try:
-            return await self._compute(runt, 128)
+            return await self._compute(runt, path, 128)
         except s_stormctrl.StormReturn as e:
             # a subquery assignment with a return; just use the returned value
             return e.item
@@ -3105,7 +3110,7 @@ async def expr_prefix(x, y):
     return x.startswith(y)
 
 async def expr_re(x, y):
-    if regex.search(await tostr(y), await tostr(x)):
+    if regex.search(await tostr(y), await tostr(x), flags=regex.I):
         return True
     return False
 

synapse/lib/autodoc.py

@@ -173,7 +173,7 @@ def getArgLines(rtype):
             for obj in atyp:
                 assert isinstance(obj, str)
             tdata = ', '.join([f'``{obj}``' for obj in atyp])
-            rline = f'The input type may one one of the following: {tdata}.'
+            rline = f'The input type may be one of the following: {tdata}.'
             line = f'    {name}: {desc} {rline}'
         elif isinstance(atyp, dict):
             logger.warning('Fully declarative input types are not yet supported.')
@@ -287,7 +287,7 @@ def getReturnLines(rtype, known_types=None, types_prefix=None, suffix=None, isst
     elif isinstance(rtype, dict):
         returns = rtype.get('returns')
         assert returns is not None, f'Invalid returns for {rtype}'
-        name = returns.get('name', 'Returns')
+        name = returns.get('name', 'Returns').title()
 
         desc = returns.get('desc')
         rettype = returns.get('type')

synapse/lib/cache.py

@@ -179,6 +179,14 @@ def getTagGlobRegx(name):
     regq = regexizeTagGlob(name)
     return regex.compile(regq)
 
+def regexizeEdgeGlob(edge):
+    return ReRegex.sub(r'(.+)', regex.escape(edge))
+
+@memoize()
+def getEdgeGlobRegx(name):
+    regq = regexizeEdgeGlob(name)
+    return regex.compile(regq)
+
 class TagGlobs:
     '''
     An object that manages multiple tag globs and values for caching.
@@ -191,7 +199,7 @@ class TagGlobs:
 
         self.cache.clear()
 
-        regx = getTagGlobRegx(name)
+        regx = self._getGlobRegex(name)
 
         glob = (regx, (name, valu))
 
@@ -213,5 +221,12 @@ class TagGlobs:
     def get(self, name):
         return self.cache.get(name)
 
+    def _getGlobRegex(self, name):
+        return getTagGlobRegx(name)
+
     def _getGlobMatches(self, name):
         return [g[1] for g in self.globs if g[0].fullmatch(name) is not None]
+
+class EdgeGlobs(TagGlobs):
+    def _getGlobRegex(self, name):
+        return getEdgeGlobRegx(name)

synapse/lib/layer.py

@@ -125,6 +125,7 @@ class LayerApi(s_cell.CellApi):
         await self._reqUserAllowed(self.liftperm)
         async for item in self.layr.iterLayerNodeEdits():
             yield item
+            await asyncio.sleep(0)
 
     @s_cell.adminapi()
     async def saveNodeEdits(self, edits, meta):
@@ -511,7 +512,7 @@ class StorType:
 
     async def _liftRegx(self, liftby, valu, reverse=False):
 
-        regx = regex.compile(valu)
+        regx = regex.compile(valu, flags=regex.I)
 
         abrvlen = liftby.abrvlen
         isarray = isinstance(liftby, IndxByPropArray)

synapse/lib/modelrev.py

@@ -8,7 +8,7 @@ import synapse.lib.layer as s_layer
 
 logger = logging.getLogger(__name__)
 
-maxvers = (0, 2, 21)
+maxvers = (0, 2, 22)
 
 class ModelRev:
 
@@ -35,6 +35,7 @@ class ModelRev:
             ((0, 2, 19), self.revModel_0_2_19),
             ((0, 2, 20), self.revModel_0_2_20),
             ((0, 2, 21), self.revModel_0_2_21),
+            ((0, 2, 22), self.revModel_0_2_22),
         )
 
     async def _uniqSortArray(self, todoprops, layers):
@@ -725,6 +726,9 @@ class ModelRev:
         await self._normPropValu(layers, 'risk:vuln:name')
         await self._propToForm(layers, 'risk:vuln:name', 'risk:vulnname')
 
+    async def revModel_0_2_22(self, layers):
+        await self._normFormSubs(layers, 'inet:ipv4', cmprvalu='100.64.0.0/10')
+
     async def runStorm(self, text, opts=None):
         '''
         Run storm code in a schedcoro and log the output messages.
@@ -880,7 +884,7 @@ class ModelRev:
             if nodeedits:
                 await save()
 
-    async def _normFormSubs(self, layers, formname, liftprop=None):
+    async def _normFormSubs(self, layers, formname, liftprop=None, cmprvalu=s_common.novalu, cmpr='='):
 
         # NOTE: this API may be used to re-normalize subs but *not* to change their storage types
         # and will *not* auto-populate linked forms from subs which are form types.
@@ -898,7 +902,36 @@ class ModelRev:
                 await layr.storNodeEdits(nodeedits, meta)
                 nodeedits.clear()
 
-            async for lkey, buid, sode in layr.liftByProp(form.name, liftprop):
+            if cmprvalu is s_common.novalu:
+                # This is for lifts such as:
+                #   <formname>
+                #   <formname>:<liftprop>
+                # E.g.:
+                #   inet:ipv4
+                #   inet:ipv4:type
+                genr = layr.liftByProp(form.name, liftprop)
+
+            elif liftprop is None:
+                # This is for lifts such as:
+                #   <formname><cmpr><cmprvalu>
+                # E.g.:
+                #   inet:ipv4=1.2.3.4
+
+                # Don't norm cmprvalu first because it may not be normable
+                cmprvals = form.type.getStorCmprs(cmpr, cmprvalu)
+                genr = layr.liftByFormValu(form.name, cmprvals)
+
+            else: # liftprop is not None  # pragma: no cover
+                # This is for lifts such as:
+                #   <formname>:<liftprop><cmpr><cmprvalu>
+                # E.g.:
+                #   inet:ipv4:type=private
+
+                # Don't norm cmprvalu first because it may not be normable
+                cmprvals = form.type.getStorCmprs(cmpr, cmprvalu)
+                genr = layr.liftByPropValu(form.name, liftprop, cmprvals)
+
+            async for _, buid, sode in genr:
 
                 sodevalu = sode.get('valu')
                 if sodevalu is None: # pragma: no cover

synapse/lib/node.py

@@ -485,10 +485,6 @@ class Node:
             raise s_exc.IsRuntForm(mesg='Cannot delete tags from runt nodes.',
                                    form=self.form.full, tag=tag)
 
-        curv = self.tags.get(name, s_common.novalu)
-        if curv is s_common.novalu:
-            return ()
-
         pref = name + '.'
 
         todel = [(len(t), t) for t in self.tags.keys() if t.startswith(pref)]
@@ -529,7 +525,8 @@ class Node:
             edits.append((s_layer.EDIT_TAG_DEL, (subtag, None), ()))
 
         edits.extend(self._getTagPropDel(name))
-        edits.append((s_layer.EDIT_TAG_DEL, (name, None), ()))
+        if self.getTag(name, defval=s_common.novalu) is not s_common.novalu:
+            edits.append((s_layer.EDIT_TAG_DEL, (name, None), ()))
 
         return edits
 

synapse/lib/snap.py

@@ -1147,6 +1147,16 @@ class Snap(s_base.Base):
                     node.nodedata.pop(name, None)
                     continue
 
+                if etyp == s_layer.EDIT_EDGE_ADD:
+                    verb, n2iden = parms
+                    n2 = await self.getNodeByBuid(s_common.uhex(n2iden))
+                    callbacks.append((self.view.runEdgeAdd, (node, verb, n2), {}))
+
+                if etyp == s_layer.EDIT_EDGE_DEL:
+                    verb, n2iden = parms
+                    n2 = await self.getNodeByBuid(s_common.uhex(n2iden))
+                    callbacks.append((self.view.runEdgeDel, (node, verb, n2), {}))
+
         [await func(*args, **kwargs) for (func, args, kwargs) in callbacks]
 
         if actualedits:

synapse/lib/storm.py

@@ -45,6 +45,8 @@ Notes:
         * node:add
         * node:del
         * prop:set
+        * edge:add
+        * edge:del
 
 When condition is tag:add or tag:del, you may optionally provide a form name
 to restrict the trigger to fire only on tags added or deleted from nodes of
@@ -56,6 +58,10 @@ Simple one level tag globbing is supported, only at the end after a period,
 that is aka.* matches aka.foo and aka.bar but not aka.foo.bar. aka* is not
 supported.
 
+When the condition is edge:add or edge:del, you may optionally provide a
+form name or a destination form name to only fire on edges added or deleted
+from nodes of those forms.
+
 Examples:
     # Adds a tag to every inet:ipv4 added
     trigger.add node:add --form inet:ipv4 --query {[ +#mytag ]}
@@ -65,6 +71,13 @@ Examples:
 
     # Adds a tag #todo to every inet:ipv4 as it is tagged #aka
     trigger.add tag:add --form inet:ipv4 --tag aka --query {[ +#todo ]}
+
+    # Adds a tag #todo to the N1 node of every refs edge add
+    trigger.add edge:add --verb refs --query {[ +#todo ]}
+
+    # Adds a tag #todo to the N1 node of every seen edge delete, provided that
+    # both nodes are of form file:bytes
+    trigger.add edge:del --verb seen --form file:bytes --n2form file:bytes --query {[ +#todo ]}
 '''
 
 addcrondescr = '''
@@ -307,6 +320,10 @@ reqValidPkgdef = s_config.getJsValidator({
                 'name': {'type': 'string'},
                 'storm': {'type': 'string'},
                 'modconf': {'type': 'object'},
+                'apidefs': {
+                    'type': ['array', 'null'],
+                    'items': {'$ref': '#/definitions/apidef'},
+                },
                 'asroot': {'type': 'boolean'},
                 'asroot:perms': {'type': 'array',
                     'items': {'type': 'array',
@@ -316,6 +333,67 @@ reqValidPkgdef = s_config.getJsValidator({
             'additionalProperties': True,
             'required': ['name', 'storm']
         },
+        'apidef': {
+            'type': 'object',
+            'properties': {
+                'name': {'type': 'string'},
+                'desc': {'type': 'string'},
+                'type': {
+                    'type': 'object',
+                    'properties': {
+                        'type': {
+                            'type': 'string',
+                            'enum': ['function']
+                        },
+                        'args': {
+                            'type': 'array',
+                            'items': {'$ref': '#/definitions/apiarg'},
+                        },
+                        'returns': {
+                            'type': 'object',
+                            'properties': {
+                                'name': {
+                                    'type': 'string',
+                                    'enum': ['yields'],
+                                },
+                                'desc': {'type': 'string'},
+                                'type': {
+                                    'oneOf': [
+                                        {'$ref': '#/definitions/apitype'},
+                                        {'type': 'array', 'items': {'$ref': '#/definitions/apitype'}},
+                                    ],
+                                },
+                            },
+                            'additionalProperties': False,
+                            'required': ['type', 'desc']
+                        },
+                    },
+                    'additionalProperties': False,
+                    'required': ['type', 'returns'],
+                },
+            },
+            'additionalProperties': False,
+            'required': ['name', 'desc', 'type']
+        },
+        'apiarg': {
+            'type': 'object',
+            'properties': {
+                'name': {'type': 'string'},
+                'desc': {'type': 'string'},
+                'type': {
+                    'oneOf': [
+                        {'$ref': '#/definitions/apitype'},
+                        {'type': 'array', 'items': {'$ref': '#/definitions/apitype'}},
+                    ],
+                },
+                'default': {'type': ['boolean', 'integer', 'string', 'null']},
+            },
+            'additionalProperties': False,
+            'required': ['name', 'desc', 'type']
+        },
+        'apitype': {
+            'type': 'string',
+        },
         'command': {
             'type': 'object',
             'properties': {
@@ -999,6 +1077,8 @@ stormcmds = (
             ('--form', {'help': 'Form to fire on.'}),
             ('--tag', {'help': 'Tag to fire on.'}),
             ('--prop', {'help': 'Property to fire on.'}),
+            ('--verb', {'help': 'Edge verb to fire on.'}),
+            ('--n2form', {'help': 'The form of the n2 node to fire on.'}),
             ('--query', {'help': 'Query for the trigger to execute.', 'required': True,
                          'dest': 'storm', }),
             ('--async', {'default': False, 'action': 'store_true',

synapse/lib/stormhttp.py

@@ -274,14 +274,17 @@ class LibHttp(s_stormtypes.Lib):
             return {str(k): str(v) for k, v in item.items()}
         return item
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def urlencode(self, text):
         text = await s_stormtypes.tostr(text)
         return urllib.parse.quote_plus(text)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def urldecode(self, text):
         text = await s_stormtypes.tostr(text)
         return urllib.parse.unquote_plus(text)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def codereason(self, code):
         code = await s_stormtypes.toint(code)
         return s_common.httpcodereason(code)

synapse/lib/stormlib/backup.py

@@ -50,6 +50,7 @@ class BackupLib(s_stormtypes.Lib):
         gatekeys = ((self.runt.user.iden, ('backup', 'run'), None),)
         return await self.dyncall('cortex', todo, gatekeys=gatekeys)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _listBackups(self):
         todo = s_common.todo('getBackups')
         gatekeys = ((self.runt.user.iden, ('backup', 'list'), None),)

synapse/lib/stormlib/basex.py

@@ -35,6 +35,7 @@ class BaseXLib(s_stormtypes.Lib):
             'decode': self.decode,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def encode(self, byts, charset):
         if not isinstance(byts, bytes):
             raise s_exc.BadArg(mesg='$lib.basex.encode() requires a bytes argument.')
@@ -54,6 +55,7 @@ class BaseXLib(s_stormtypes.Lib):
 
         return ''.join(retn[::-1])
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def decode(self, text, charset):
         text = await s_stormtypes.tostr(text)
         charset = await s_stormtypes.tostr(charset)

synapse/lib/stormlib/cell.py

@@ -192,6 +192,7 @@ class CellLib(s_stormtypes.Lib):
 
         return curv
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _hotFixesCheck(self):
         if not self.runt.isAdmin():
             mesg = '$lib.cell.stormFixesCheck() requires admin privs.'
@@ -210,30 +211,35 @@ class CellLib(s_stormtypes.Lib):
 
         return dowork
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _getCellInfo(self):
         if not self.runt.isAdmin():
             mesg = '$lib.cell.getCellInfo() requires admin privs.'
             raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
         return await self.runt.snap.core.getCellInfo()
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _getSystemInfo(self):
         if not self.runt.isAdmin():
             mesg = '$lib.cell.getSystemInfo() requires admin privs.'
             raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
         return await self.runt.snap.core.getSystemInfo()
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _getBackupInfo(self):
         if not self.runt.isAdmin():
             mesg = '$lib.cell.getBackupInfo() requires admin privs.'
             raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
         return await self.runt.snap.core.getBackupInfo()
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _getHealthCheck(self):
         if not self.runt.isAdmin():
             mesg = '$lib.cell.getHealthCheck() requires admin privs.'
             raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
         return await self.runt.snap.core.getHealthCheck()
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _getMirrorUrls(self, name=None):
 
         if not self.runt.isAdmin():
@@ -265,6 +271,7 @@ class CellLib(s_stormtypes.Lib):
 
         return await self.runt.snap.core.trimNexsLog(consumers=consumers, timeout=timeout)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _uptime(self, name=None):
 
         name = await s_stormtypes.tostr(name, noneok=True)

synapse/lib/stormlib/compression.py

@@ -47,6 +47,7 @@ class Bzip2Lib(s_stormtypes.Lib):
             'un': self.un,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def en(self, valu):
         valu = await s_stormtypes.toprim(valu)
         try:
@@ -103,6 +104,7 @@ class GzipLib(s_stormtypes.Lib):
             'un': self.un,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def en(self, valu):
         valu = await s_stormtypes.toprim(valu)
         try:
@@ -159,6 +161,7 @@ class ZlibLib(s_stormtypes.Lib):
             'un': self.un,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def en(self, valu):
         valu = await s_stormtypes.toprim(valu)
         try:

synapse/lib/stormlib/ethereum.py

@@ -24,6 +24,7 @@ class EthereumLib(s_stormtypes.Lib):
             'eip55': self.eip55,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def eip55(self, addr):
         addr = await s_stormtypes.tostr(addr)
         addr = addr.lower()

synapse/lib/stormlib/graph.py

@@ -180,6 +180,7 @@ class GraphLib(s_stormtypes.Lib):
         gdef = await s_stormtypes.toprim(gdef)
         return await self.runt.snap.core.addStormGraph(gdef, user=self.runt.user)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methGraphGet(self, iden=None):
         iden = await s_stormtypes.tostr(iden, noneok=True)
         if iden is None:
@@ -201,6 +202,7 @@ class GraphLib(s_stormtypes.Lib):
 
         await self.runt.snap.core.modStormGraph(iden, info, user=self.runt.user)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methGraphList(self):
         projs = []
         async for proj in self.runt.snap.core.getStormGraphs(user=self.runt.user):

synapse/lib/stormlib/hashes.py

@@ -46,15 +46,19 @@ class LibHashes(s_stormtypes.Lib):
             'sha512': self._sha512,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _md5(self, byts):
         return hashlib.md5(byts, usedforsecurity=False).hexdigest()
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _sha1(self, byts):
         return hashlib.sha1(byts, usedforsecurity=False).hexdigest()
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _sha256(self, byts):
         return hashlib.sha256(byts).hexdigest()
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _sha512(self, byts):
         return hashlib.sha512(byts).hexdigest()
 
@@ -88,6 +92,7 @@ class LibHmac(s_stormtypes.Lib):
             'digest': self._digest,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _digest(self, key, mesg, alg='sha256') -> bytes:
         key = await s_stormtypes.toprim(key)
         if not isinstance(key, bytes):

synapse/lib/stormlib/hex.py

@@ -74,11 +74,13 @@ class HexLib(s_stormtypes.Lib):
             'signext': self.signext,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def encode(self, valu):
         if not isinstance(valu, bytes):
             raise s_exc.BadArg(mesg='$lib.hex.encode() requires a bytes argument.')
         return s_common.ehex(valu)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def decode(self, valu):
         valu = await s_stormtypes.tostr(valu)
         try:
@@ -86,6 +88,7 @@ class HexLib(s_stormtypes.Lib):
         except binascii.Error as e:
             raise s_exc.BadArg(mesg=f'$lib.hex.decode(): {e}')
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def toint(self, valu, signed=False):
         valu = await s_stormtypes.tostr(valu)
         signed = await s_stormtypes.tobool(signed)
@@ -97,6 +100,7 @@ class HexLib(s_stormtypes.Lib):
 
         return int.from_bytes(byts, 'big', signed=signed)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def fromint(self, valu, length, signed=False):
         valu = await s_stormtypes.toint(valu)
         length = await s_stormtypes.toint(length)
@@ -108,6 +112,7 @@ class HexLib(s_stormtypes.Lib):
         except OverflowError as e:
             raise s_exc.BadArg(mesg=f'$lib.hex.fromint(): {e}')
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def trimext(self, valu):
         valu = await s_stormtypes.tostr(valu)
 
@@ -124,6 +129,7 @@ class HexLib(s_stormtypes.Lib):
             break
         return valu
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def signext(self, valu, length):
         valu = await s_stormtypes.tostr(valu)
         length = await s_stormtypes.toint(length)

synapse/lib/stormlib/infosec.py

@@ -494,6 +494,7 @@ class MitreAttackFlowLib(s_stormtypes.Lib):
             'norm': self._norm,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _norm(self, flow):
         flow = await s_stormtypes.toprim(flow)
 
@@ -619,6 +620,7 @@ class CvssLib(s_stormtypes.Lib):
             'calculateFromProps': self.calculateFromProps,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def vectToProps(self, text):
         s_common.deprecated('$lib.infosec.cvss.vectToProps()', '2.137.0', '3.0.0')
         await self.runt.snap.warnonce('$lib.infosec.cvss.vectToProps() is deprecated.')
@@ -690,6 +692,7 @@ class CvssLib(s_stormtypes.Lib):
 
         return rval
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def calculateFromProps(self, props, vers='3.1'):
 
         vers = await s_stormtypes.tostr(vers)
@@ -815,6 +818,7 @@ class CvssLib(s_stormtypes.Lib):
 
         return rval
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def vectToScore(self, vect, vers=None):
         vers = await s_stormtypes.tostr(vers, noneok=True)
 

synapse/lib/stormlib/ipv6.py

@@ -39,6 +39,7 @@ class LibIpv6(s_stormtypes.Lib):
             'expand': self._expand,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _expand(self, valu):
         valu = await s_stormtypes.tostr(valu)
         valu = valu.strip()

synapse/lib/stormlib/iters.py

@@ -47,12 +47,14 @@ class LibIters(s_stormtypes.Lib):
             'zip': self._zip,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def enum(self, genr):
         indx = 0
         async for item in s_stormtypes.toiter(genr):
             yield (indx, item)
             indx += 1
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _zip(self, *args):
 
         async with contextlib.AsyncExitStack() as stack: