synapse 2.178.0__py311-none-any.whl → 2.179.0__py311-none-any.whl

synapse/lib/stormlib/modelext.py

@@ -1,4 +1,5 @@
 import synapse.exc as s_exc
+import synapse.common as s_common
 import synapse.lib.grammar as s_grammar
 
 import synapse.lib.stormtypes as s_stormtypes
@@ -54,6 +55,8 @@ class LibModelExt(s_stormtypes.Lib):
                   'args': (
                       {'name': 'formname', 'type': 'str', 'desc': 'The form with the extended property.', },
                       {'name': 'propname', 'type': 'str', 'desc': 'The extended property to remove.', },
+                      {'name': 'force', 'type': 'boolean', 'default': False,
+                       'desc': 'Delete the property from all nodes before removing the definition.', },
                   ),
                   'returns': {'type': 'null', }}},
         {'name': 'delUnivProp',
@@ -61,12 +64,16 @@ class LibModelExt(s_stormtypes.Lib):
          'type': {'type': 'function', '_funcname': 'delUnivProp',
                   'args': (
                       {'name': 'propname', 'type': 'str', 'desc': 'Name of the universal property to remove.', },
+                      {'name': 'force', 'type': 'boolean', 'default': False,
+                       'desc': 'Delete the property from all nodes before removing the definition.', },
                   ),
                   'returns': {'type': 'null', }}},
         {'name': 'delTagProp', 'desc': 'Remove an extended tag property definition from the model.',
          'type': {'type': 'function', '_funcname': 'delTagProp',
                   'args': (
                       {'name': 'propname', 'type': 'str', 'desc': 'Name of the tag property to remove.', },
+                      {'name': 'force', 'type': 'boolean', 'default': False,
+                       'desc': 'Delete the tag property from all nodes before removing the definition.', },
                   ),
                   'returns': {'type': 'null', }}},
         {'name': 'getExtModel', 'desc': 'Get all extended model elements.',
@@ -163,20 +170,39 @@ class LibModelExt(s_stormtypes.Lib):
         s_stormtypes.confirm(('model', 'form', 'del', formname))
         await self.runt.snap.core.delForm(formname)
 
-    async def delFormProp(self, formname, propname):
+    async def delFormProp(self, formname, propname, force=False):
         formname = await s_stormtypes.tostr(formname)
         propname = await s_stormtypes.tostr(propname)
+        force = await s_stormtypes.tobool(force)
         s_stormtypes.confirm(('model', 'prop', 'del', formname))
+
+        if force is True:
+            meta = {'user': self.runt.snap.user.iden, 'time': s_common.now()}
+            await self.runt.snap.core._delAllFormProp(formname, propname, meta)
+
         await self.runt.snap.core.delFormProp(formname, propname)
 
-    async def delUnivProp(self, propname):
+    async def delUnivProp(self, propname, force=False):
         propname = await s_stormtypes.tostr(propname)
+        force = await s_stormtypes.tobool(force)
         s_stormtypes.confirm(('model', 'univ', 'del'))
+
+        if force:
+            meta = {'user': self.runt.snap.user.iden, 'time': s_common.now()}
+            await self.runt.snap.core._delAllUnivProp(propname, meta)
+
         await self.runt.snap.core.delUnivProp(propname)
 
-    async def delTagProp(self, propname):
+    async def delTagProp(self, propname, force=False):
         propname = await s_stormtypes.tostr(propname)
+        force = await s_stormtypes.tobool(force)
+
         s_stormtypes.confirm(('model', 'tagprop', 'del'))
+
+        if force:
+            meta = {'user': self.runt.snap.user.iden, 'time': s_common.now()}
+            await self.runt.snap.core._delAllTagProp(propname, meta)
+
         await self.runt.snap.core.delTagProp(propname)
 
     @s_stormtypes.stormfunc(readonly=True)

synapse/lib/stormlib/stix.py

@@ -875,14 +875,19 @@ class LibStixImport(s_stormtypes.Lib):
         bundle = await s_stormtypes.toprim(bundle)
         config = await s_stormtypes.toprim(config)
 
+        if not isinstance(config, dict):
+            mesg = 'STIX ingest config must be a dictionary.'
+            raise s_exc.BadArg(mesg=mesg)
+
         config.setdefault('bundle', {})
         config.setdefault('objects', {})
         config.setdefault('relationships', [])
 
-        rellook = {r['type']: r for r in config.get('relationships', ())}
-
-        nodesbyid = {}
-        relationships = []
+        try:
+            rellook = {r['type']: r for r in config.get('relationships', ())}
+        except Exception as e:
+            mesg = f'Error processing relationships in STIX bundle ingest config: {e}.'
+            raise s_exc.BadArg(mesg=mesg)
 
         bundlenode = None
 
@@ -890,13 +895,41 @@ class LibStixImport(s_stormtypes.Lib):
         if bundleconf is None:
             bundleconf = {}
 
+        if not isinstance(bundleconf, dict):
+            mesg = 'STIX ingest config bundle value must be a dictionary.'
+            raise s_exc.BadArg(mesg=mesg)
+
         bundlestorm = bundleconf.get('storm')
         if bundlestorm:
+            if not isinstance(bundlestorm, str):
+                mesg = 'STIX ingest config storm query must be a string.'
+                raise s_exc.BadArg(mesg=mesg)
+
             bundlenode = await self._callStorm(bundlestorm, {'bundle': bundle})
 
         self.runt.layerConfirm(('node', 'edge', 'add', 'refs'))
 
-        for obj in bundle.get('objects'):
+        try:
+            nodesbyid = await self._ingestObjects(bundle, config, rellook)
+        except Exception as e:
+            mesg = f'Error processing objects in STIX bundle ingest: {e}.'
+            raise s_exc.BadArg(mesg=mesg)
+
+        if bundlenode is not None:
+            for node in nodesbyid.values():
+                await bundlenode.addEdge('refs', node.iden())
+                await asyncio.sleep(0)
+            yield bundlenode
+
+        for node in nodesbyid.values():
+            yield node
+
+    async def _ingestObjects(self, bundle, config, rellook):
+
+        nodesbyid = {}
+        relationships = []
+
+        for obj in bundle.get('objects', ()):
 
             objtype = obj.get('type')
 
@@ -971,7 +1004,7 @@ class LibStixImport(s_stormtypes.Lib):
                 await self.runt.snap.warnonce(f'STIX bundle ingest has no relationship definition for: {reltype}.')
 
         # attempt to resolve object_refs
-        for obj in bundle.get('objects'):
+        for obj in bundle.get('objects', ()):
 
             node = nodesbyid.get(obj.get('id'))
             if node is None:
@@ -984,17 +1017,7 @@ class LibStixImport(s_stormtypes.Lib):
 
                 await node.addEdge('refs', refsnode.iden())
 
-        if bundlenode is not None:
-            for node in nodesbyid.values():
-                await bundlenode.addEdge('refs', node.iden())
-                await asyncio.sleep(0)
-            yield bundlenode
-
-        for node in nodesbyid.values():
-            yield node
-
-        if bundlenode:
-            yield bundlenode
+        return nodesbyid
 
     async def _callStorm(self, text, varz):
 

synapse/lib/stormlib/vault.py

@@ -649,7 +649,7 @@ class Vault(s_stormtypes.Prim):
          'type': {'type': 'function', '_funcname': '_methSetPerm',
                   'args': (
                       {'name': 'iden', 'type': 'str', 'desc': 'The user or role to modify.'},
-                      {'name': 'level', 'type': 'str', 'desc': 'The easyperm level for the iden. $lib.undef to remove an existing permission.'},
+                      {'name': 'level', 'type': 'str', 'desc': 'The easyperm level for the iden. $lib.null to remove an existing permission.'},
                   ),
                   'returns': {'type': 'boolean', 'desc': '$lib.true if the permission was set, $lib.false otherwise.', }}},
 
@@ -744,7 +744,7 @@ class Vault(s_stormtypes.Prim):
         s_stormtypes.confirmEasyPerm(vault, s_cell.PERM_ADMIN, mesg=mesg)
 
         iden = await s_stormtypes.tostr(iden)
-        level = await s_stormtypes.toint(level)
+        level = await s_stormtypes.toint(level, noneok=True)
 
         return await self.runt.snap.core.setVaultPerm(self.valu, iden, level)
 

synapse/lib/stormtypes.py

@@ -5277,7 +5277,7 @@ class Number(Prim):
     def __init__(self, valu, path=None):
         try:
             valu = s_common.hugenum(valu)
-        except decimal.DecimalException as e:
+        except (TypeError, decimal.DecimalException) as e:
             mesg = f'Failed to make number from {valu!r}'
             raise s_exc.BadCast(mesg=mesg) from e
 

synapse/lib/types.py

@@ -1,3 +1,4 @@
+import sys
 import asyncio
 import decimal
 import logging
@@ -78,6 +79,14 @@ class Type:
 
         self.postTypeInit()
 
+        normopts = dict(self.opts)
+        for optn, valu in normopts.items():
+            if isinstance(valu, float):
+                normopts[optn] = str(valu)
+
+        ctor = '.'.join([self.__class__.__module__, self.__class__.__qualname__])
+        self.typehash = sys.intern(s_common.guid((ctor, s_common.flatten(normopts))))
+
     def _storLiftSafe(self, cmpr, valu):
         try:
             return self.storlifts['=']('=', valu)

synapse/lib/version.py

@@ -223,6 +223,6 @@ def reqVersion(valu, reqver,
 ##############################################################################
 # The following are touched during the release process by bumpversion.
 # Do not modify these directly.
-version = (2, 178, 0)
+version = (2, 179, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '56bad29e241893b702ea437d500a0229e8e1956b'
+commit = '1c51c58523e9012655d8d18bfa1ad149e5536c25'