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

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)
 
@@ -594,7 +595,7 @@ class CvssLib(s_stormtypes.Lib):
                                 environmental score, overall score, and normalized vector string.
                                 The normalized vector string will have metrics ordered in
                                 specification order and metrics with undefined values will be
-                                removed. Example:
+                                removed. Example::
 
                                     {
                                         'version': '3.1',
@@ -604,6 +605,7 @@ class CvssLib(s_stormtypes.Lib):
                                         'environmental': 4.3,
                                         'normalized': 'AV:N/AC:H/PR:L/UI:R/S:U/C:L/I:L/A:L'
                                     }
+
                               '''}
         }},
     )
@@ -618,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.')
@@ -689,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)
@@ -814,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

@@ -1,3 +1,9 @@
+import sys
+import asyncio
+import contextlib
+
+import synapse.exc as s_exc
+
 import synapse.lib.stormtypes as s_stormtypes
 
 @s_stormtypes.registry.registerLib
@@ -10,7 +16,7 @@ class LibIters(s_stormtypes.Lib):
     _storm_locals = (
         {
             'name': 'enum', 'desc': 'Yield (<indx>, <item>) tuples from an iterable or generator.',
-             'type': {
+            'type': {
                 'type': 'function', '_funcname': 'enum',
                 'args': (
                     {'type': 'iter', 'name': 'genr', 'desc': 'An iterable or generator.'},
@@ -19,6 +25,17 @@ class LibIters(s_stormtypes.Lib):
                             'desc': 'Yields (<indx>, <item>) tuples.'},
             }
         },
+        {
+            'name': 'zip', 'desc': 'Yield tuples created by iterating multiple iterables in parallel.',
+            'type': {
+                'type': 'function', '_funcname': '_zip',
+                'args': (
+                    {'name': '*args', 'type': 'iter', 'desc': 'Iterables or generators.', },
+                ),
+                'returns': {'name': 'yields', 'type': 'list',
+                            'desc': 'Yields tuples with an item from each iterable or generator.'},
+            }
+        },
     )
 
     def __init__(self, runt, name=()):
@@ -27,10 +44,50 @@ class LibIters(s_stormtypes.Lib):
     def getObjLocals(self):
         return {
             'enum': self.enum,
+            '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:
+            genrs = []
+            for arg in args:
+                agen = contextlib.aclosing(s_stormtypes.toiter(arg))
+                genrs.append(await stack.enter_async_context(agen))
+
+            try:
+                try:
+                    while True:
+                        tasks = []
+                        async with asyncio.TaskGroup() as tg:
+                            for genr in genrs:
+                                tasks.append(tg.create_task(genr.__anext__()))
+
+                        yield [task.result() for task in tasks]
+
+                        await asyncio.sleep(0)
+                        tasks.clear()
+
+                except* StopAsyncIteration:
+                    pass
+
+            except ExceptionGroup as eg:
+                msgs = []
+                for exc in eg.exceptions:
+                    if isinstance(exc, s_exc.SynErr):
+                        msgs.append(f'({exc.errname}: {exc.errinfo.get("mesg")})')
+                    else:
+                        msgs.append(f'({exc.__class__.__name__}: {str(exc)})')
+
+                errs = len(msgs)
+                errm = ', '.join(msgs)
+                mesg = f'$lib.iters.zip() encountered errors in {errs} iterators during iteration: {errm}'
+                raise s_exc.StormRuntimeError(mesg=mesg)

synapse/lib/stormlib/json.py

@@ -62,9 +62,11 @@ class JsonSchema(s_stormtypes.StormType):
             'validate': self._validate,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _schema(self):
         return copy.deepcopy(self.schema)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _validate(self, item):
         item = await s_stormtypes.toprim(item)
 
@@ -112,6 +114,7 @@ class JsonLib(s_stormtypes.Lib):
             'schema': self._jsonSchema,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _jsonSave(self, item):
         try:
             item = await s_stormtypes.toprim(item)
@@ -120,6 +123,7 @@ class JsonLib(s_stormtypes.Lib):
             mesg = f'Argument is not JSON compatible: {item}'
             raise s_exc.MustBeJsonSafe(mesg=mesg)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _jsonLoad(self, text):
         text = await s_stormtypes.tostr(text)
         try:
@@ -128,6 +132,7 @@ class JsonLib(s_stormtypes.Lib):
             mesg = f'Text is not valid JSON: {text}'
             raise s_exc.BadJsonText(mesg=mesg)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _jsonSchema(self, schema, use_default=True):
         schema = await s_stormtypes.toprim(schema)
         use_default = await s_stormtypes.tobool(use_default)

synapse/lib/stormlib/mime.py

@@ -29,6 +29,7 @@ class LibMimeHtml(s_stormtypes.Lib):
             'totext': self.totext,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def totext(self, html):
         html = await s_stormtypes.tostr(html)
         return await s_coro.semafork(htmlToText, html)

synapse/lib/stormlib/model.py

@@ -251,10 +251,12 @@ class LibModelTags(s_stormtypes.Lib):
         self.runt.confirm(('model', 'tag', 'set'))
         return await self.runt.snap.core.delTagModel(tagname)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _getTagModel(self, tagname):
         tagname = await s_stormtypes.tostr(tagname)
         return await self.runt.snap.core.getTagModel(tagname)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _listTagModel(self):
         return await self.runt.snap.core.listTagModel()
 
@@ -325,24 +327,28 @@ class LibModel(s_stormtypes.Lib):
         }
 
     @s_cache.memoizemethod(size=100)
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methType(self, name):
         type_ = self.model.type(name)
         if type_ is not None:
             return ModelType(type_)
 
     @s_cache.memoizemethod(size=100)
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methProp(self, name):
         prop = self.model.prop(name)
         if prop is not None:
             return ModelProp(prop)
 
     @s_cache.memoizemethod(size=100)
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methForm(self, name):
         form = self.model.form(name)
         if form is not None:
             return ModelForm(form)
 
     @s_cache.memoize(size=100)
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methTagProp(self, name):
         tagprop = self.model.getTagProp(name)
         if tagprop is not None:
@@ -387,6 +393,7 @@ class ModelForm(s_stormtypes.Prim):
     def _ctorFormType(self, path=None):
         return ModelType(self.valu.type, path=path)
 
+    @s_stormtypes.stormfunc(readonly=True)
     def _getFormProp(self, name):
         prop = self.valu.prop(name)
         if prop is not None:
@@ -490,15 +497,21 @@ class ModelType(s_stormtypes.Prim):
         s_stormtypes.Prim.__init__(self, valu, path=path)
         self.locls.update(self.getObjLocals())
         self.locls.update({'name': valu.name,
-                           'norm': self._methNorm,
-                           'repr': self._methRepr,
                            'stortype': valu.stortype,
                            })
 
+    def getObjLocals(self):
+        return {
+            'norm': self._methNorm,
+            'repr': self._methRepr,
+        }
+
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methRepr(self, valu):
         nval = self.valu.norm(valu)
         return self.valu.repr(nval[0])
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methNorm(self, valu):
         return self.valu.norm(valu)
 
@@ -544,7 +557,7 @@ class LibModelEdge(s_stormtypes.Lib):
     # Note: The use of extprops in hive paths in this class is an artifact of the
     # original implementation which used extended property language which had a
     # very bad cognitive overload with the cortex extended properties, but we
-    # dont' want to change underlying data. epiphyte 20200703
+    # don't want to change underlying data. epiphyte 20200703
 
     # restrict list of keys which we allow to be set/del through this API.
     validedgekeys = (
@@ -578,9 +591,11 @@ class LibModelEdge(s_stormtypes.Lib):
             raise s_exc.NoSuchProp(mesg=f'The requested key is not valid for light edge metadata.',
                                    name=key)
 
+    @s_stormtypes.stormfunc(readonly=True)
     def _methValidKeys(self):
         return self.validedgekeys
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methEdgeGet(self, verb):
         verb = await s_stormtypes.tostr(verb)
         await self._chkEdgeVerbInView(verb)
@@ -620,6 +635,7 @@ class LibModelEdge(s_stormtypes.Lib):
 
         await self.runt.snap.core.setHiveKey(path, kvdict)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _methEdgeList(self):
         retn = []
         async for verb in self.runt.snap.view.getEdgeVerbs():

synapse/lib/stormlib/modelext.py

@@ -156,6 +156,7 @@ class LibModelExt(s_stormtypes.Lib):
         s_stormtypes.confirm(('model', 'tagprop', 'del'))
         await self.runt.snap.core.delTagProp(propname)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def getExtModel(self):
         return await self.runt.snap.core.getExtModel()
 

synapse/lib/stormlib/notifications.py

@@ -65,6 +65,7 @@ class NotifyLib(s_stormtypes.Lib):
             # 'bytype':
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def get(self, indx):
         indx = await s_stormtypes.toint(indx)
         mesg = await self.runt.snap.core.getUserNotif(indx)
@@ -81,6 +82,7 @@ class NotifyLib(s_stormtypes.Lib):
             raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
         await self.runt.snap.core.delUserNotif(indx)
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def list(self, size=None):
         size = await s_stormtypes.toint(size, noneok=True)
         async for mesg in self.runt.snap.core.iterUserNotifs(self.runt.user.iden, size=size):

synapse/lib/stormlib/pack.py

@@ -34,6 +34,7 @@ class LibPack(s_stormtypes.Lib):
             'un': self.un,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def en(self, fmt, items):
         fmt = await s_stormtypes.tostr(fmt)
         items = await s_stormtypes.toprim(items)
@@ -47,6 +48,7 @@ class LibPack(s_stormtypes.Lib):
         except struct.error as e:
             raise s_exc.BadArg(mesg=str(e))
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def un(self, fmt, byts, offs=0):
 
         fmt = await s_stormtypes.tostr(fmt)

synapse/lib/stormlib/random.py

@@ -26,6 +26,7 @@ class LibRandom(s_stormtypes.Lib):
             'int': self._int,
         }
 
+    @s_stormtypes.stormfunc(readonly=True)
     async def _int(self, maxval, minval=0):
         maxval = await s_stormtypes.toint(maxval)
         minval = await s_stormtypes.toint(minval)

synapse/lib/stormlib/smtp.py

@@ -130,19 +130,15 @@ class SmtpMessage(s_stormtypes.StormType):
             'sender': self._setSenderEmail,
         })
 
-    @s_stormtypes.stormfunc(readonly=True)
     async def _setSenderEmail(self, valu):
-        # TODO handle inet:email and ps:contact Nodes
         self.sender = await s_stormtypes.tostr(valu)
 
     async def _getSenderEmail(self):
         return self.sender
 
-    @s_stormtypes.stormfunc(readonly=True)
     async def _setEmailText(self, text):
         self.bodytext = await s_stormtypes.tostr(text)
 
-    @s_stormtypes.stormfunc(readonly=True)
     async def _setEmailHtml(self, html):
         self.bodyhtml = await s_stormtypes.tostr(html)
 
@@ -152,9 +148,6 @@ class SmtpMessage(s_stormtypes.StormType):
     async def _getEmailHtml(self):
         return self.bodyhtml
 
-    # TODO
-    # async def attach(self, sha256, name, mime):
-
     async def send(self, host, port=25, user=None, passwd=None, usetls=False, starttls=False, timeout=60):
 
         self.runt.confirm(('storm', 'inet', 'smtp', 'send'))