synapse 2.175.0__py311-none-any.whl → 2.177.0__py311-none-any.whl

synapse/lib/view.py

@@ -79,18 +79,17 @@ class View(s_nexus.Pusher):  # type: ignore
     '''
     snapctor = s_snap.Snap.anit
 
-    async def __anit__(self, core, node):
+    async def __anit__(self, core, vdef):
         '''
         Async init the view.
 
         Args:
             core (Cortex):  The cortex that owns the view.
-            node (HiveNode): The hive node containing the view info.
+            vdef (dict): The dictionary containing the view definition.
         '''
-        self.node = node
-        self.iden = node.name()
+        self.iden = vdef.get('iden')
         self.bidn = s_common.uhex(self.iden)
-        self.info = await node.dict()
+        self.info = vdef
 
         self.core = core
         self.dirn = s_common.gendir(core.dirn, 'views', self.iden)
@@ -101,11 +100,10 @@ class View(s_nexus.Pusher):  # type: ignore
 
         self.trigqueue = self.viewslab.getSeqn('trigqueue')
 
-        trignode = await node.open(('triggers',))
-        self.trigdict = await trignode.dict()
+        self.trigdict = self.core.cortexdata.getSubKeyVal(f'view:{self.iden}:trigger:')
 
         self.triggers = s_trigger.Triggers(self)
-        for _, tdef in self.trigdict.items():
+        for tdef in self.trigdict.values():
             try:
                 await self.triggers.load(tdef)
 
@@ -268,12 +266,14 @@ class View(s_nexus.Pusher):  # type: ignore
             return
 
         self.merging = True
-        await self.info.set('merging', True)
+        self.info['merging'] = True
+        self.core.viewdefs.set(self.iden, self.info)
 
         layr = self.layers[0]
 
         layr.readonly = True
-        await layr.layrinfo.set('readonly', True)
+        layr.layrinfo['readonly'] = True
+        self.core.layerdefs.set(layr.iden, layr.layrinfo)
 
         merge = self.getMergeRequest()
         votes = [vote async for vote in self.getMergeVotes()]
@@ -490,10 +490,11 @@ class View(s_nexus.Pusher):  # type: ignore
         await self._delMergeMeta()
 
         self.parent = None
-        await self.info.pop('parent')
+        if self.info.pop('parent', None) is not None:
+            self.core.viewdefs.set(self.iden, self.info)
 
-        await self.core.feedBeholder('view:set', {'iden': self.iden, 'name': 'parent', 'valu': None},
-                                     gates=[self.iden, self.layers[0].iden])
+            await self.core.feedBeholder('view:set', {'iden': self.iden, 'name': 'parent', 'valu': None},
+                                         gates=[self.iden, self.layers[0].iden])
 
     async def mergeStormIface(self, name, todo):
         '''
@@ -707,15 +708,17 @@ class View(s_nexus.Pusher):  # type: ignore
         # Add all of the bottom view's layers.
         layers.extend(view.layers)
 
-        self.layers = layers
         layridens = [layr.iden for layr in layers]
-        await self.info.set('layers', layridens)
 
-        await self.core.feedBeholder('view:setlayers', {'iden': self.iden, 'layers': layridens}, gates=[self.iden, layridens[0]])
+        self.layers = layers
+        self.info['layers'] = layridens
+        self.core.viewdefs.set(self.iden, self.info)
+
+        await self.core.feedBeholder('view:setlayers', {'iden': self.iden, 'layers': layridens}, gates=[self.iden, self.layers[0].iden])
 
     async def pack(self):
         d = {'iden': self.iden}
-        d.update(self.info.pack())
+        d.update(self.info)
 
         layrinfo = [await lyr.pack() for lyr in self.layers]
         d['layers'] = layrinfo
@@ -855,6 +858,7 @@ class View(s_nexus.Pusher):  # type: ignore
 
     async def _initViewLayers(self):
 
+        self.layers = []
         for iden in self.info.get('layers'):
 
             layr = self.core.layers.get(iden)
@@ -1121,7 +1125,8 @@ class View(s_nexus.Pusher):  # type: ignore
                 raise s_exc.BadArg(mesg=mesg)
 
             self.parent = parent
-            await self.info.set(name, valu)
+            self.info[name] = valu
+            self.core.viewdefs.set(self.iden, self.info)
 
             await self._calcForkLayers()
 
@@ -1137,7 +1142,7 @@ class View(s_nexus.Pusher):  # type: ignore
                 # enforce ( which will need to be done very carefully to prevent
                 # existing non-compliant values from causing issues with existing views )
                 if valu is not None:
-                    vdef = self.info.pack()
+                    vdef = s_msgpack.deepcopy(self.info)
                     vdef['quorum'] = s_msgpack.deepcopy(valu)
                     s_schemas.reqValidView(vdef)
                 else:
@@ -1148,14 +1153,24 @@ class View(s_nexus.Pusher):  # type: ignore
                             await view._delMergeRequest()
 
             if valu is None:
-                await self.info.pop(name)
+                self.info.pop(name, None)
             else:
-                await self.info.set(name, valu)
+                self.info[name] = valu
+
+            self.core.viewdefs.set(self.iden, self.info)
 
         await self.core.feedBeholder('view:set', {'iden': self.iden, 'name': name, 'valu': valu},
                                      gates=[self.iden, self.layers[0].iden])
         return valu
 
+    async def _setLayerIdens(self, idens):
+        # this may only be called from within a nexus handler...
+        self.info['layers'] = idens
+        self.core.viewdefs.set(self.iden, self.info)
+        await self._initViewLayers()
+        await self.core.feedBeholder('view:set', {'iden': self.iden, 'name': 'layers', 'valu': idens},
+                                     gates=[self.iden, self.layers[0].iden])
+
     async def addLayer(self, layriden, indx=None):
         if any(layriden == layr.iden for layr in self.layers):
             raise s_exc.DupIden(mesg='May not have the same layer in a view twice')
@@ -1184,7 +1199,9 @@ class View(s_nexus.Pusher):  # type: ignore
         else:
             self.layers.insert(indx, layr)
 
-        await self.info.set('layers', [lyr.iden for lyr in self.layers])
+        self.info['layers'] = [lyr.iden for lyr in self.layers]
+        self.core.viewdefs.set(self.iden, self.info)
+
         await self.core.feedBeholder('view:addlayer', {'iden': self.iden, 'layer': layriden, 'indx': indx}, gates=[self.iden, layriden])
         self.core._calcViewsByLayer()
 
@@ -1212,7 +1229,9 @@ class View(s_nexus.Pusher):  # type: ignore
         self.invalid = None
         self.layers = layrs
 
-        await self.info.set('layers', layers)
+        self.info['layers'] = layers
+        self.core.viewdefs.set(self.iden, self.info)
+
         await self.core.feedBeholder('view:setlayers', {'iden': self.iden, 'layers': layers}, gates=[self.iden, layers[0]])
 
         await self._calcChildViews()
@@ -1242,7 +1261,8 @@ class View(s_nexus.Pusher):  # type: ignore
 
                 # convert layers to a list of idens...
                 lids = [layr.iden for layr in layers]
-                await child.info.set('layers', lids)
+                child.info['layers'] = lids
+                self.core.viewdefs.set(child.iden, child.info)
 
                 await self.core.feedBeholder('view:setlayers', {'iden': child.iden, 'layers': lids}, gates=[child.iden, lids[0]])
 
@@ -1300,8 +1320,9 @@ class View(s_nexus.Pusher):  # type: ignore
         await self.core._addView(vdef)
 
         forkiden = vdef.get('iden')
+        self.info['parent'] = forkiden
         self.parent = self.core.reqView(forkiden)
-        await self.info.set('parent', forkiden)
+        self.core.viewdefs.set(self.iden, self.info)
 
         mesg = {'iden': self.iden, 'name': 'parent', 'valu': forkiden}
         await self.core.feedBeholder('view:set', mesg, gates=[self.iden, self.layers[0].iden])
@@ -1386,6 +1407,12 @@ class View(s_nexus.Pusher):  # type: ignore
             async for nodeedits in fromlayr.iterLayerNodeEdits():
                 await self.parent.storNodeEdits([nodeedits], meta)
 
+    async def swapLayer(self):
+        oldlayr = self.layers[0]
+        newlayr = await self.core._twinLayer(oldlayr)
+        await self.core.swapLayer(oldlayr.iden, newlayr.iden)
+        await self.core.delLayer(oldlayr.iden)
+
     async def wipeLayer(self, useriden=None):
         '''
         Delete the data in the write layer by generating del nodeedits.
@@ -1549,7 +1576,7 @@ class View(s_nexus.Pusher):  # type: ignore
 
         trig = await self.triggers.load(tdef)
 
-        await self.trigdict.set(trig.iden, tdef)
+        self.trigdict.set(trig.iden, tdef)
         await self.core.auth.addAuthGate(trig.iden, 'trigger')
         await user.setAdmin(True, gateiden=tdef.get('iden'), logged=False)
 
@@ -1581,7 +1608,7 @@ class View(s_nexus.Pusher):  # type: ignore
             return
 
         await self.core.feedBeholder('trigger:del', {'iden': trig.iden, 'view': trig.view.iden}, gates=[trig.iden])
-        await self.trigdict.pop(trig.iden)
+        self.trigdict.pop(trig.iden)
         await self.core.auth.delAuthGate(trig.iden)
 
     @s_nexus.Pusher.onPushAuto('trigger:set')
@@ -1607,7 +1634,7 @@ class View(s_nexus.Pusher):  # type: ignore
         Note: this does not delete any layer storage.
         '''
         await self.fini()
-        await self.node.pop()
+        await self.trigdict.truncate()
         await self._wipeViewMeta()
         shutil.rmtree(self.dirn, ignore_errors=True)
 

synapse/models/base.py

@@ -59,6 +59,10 @@ class BaseModule(s_module.CoreModule):
                 ('meta:ruleset', ('guid', {}), {
                     'doc': 'A set of rules linked with -(has)> edges.'}),
 
+                ('meta:rule:type:taxonomy', ('taxonomy', {}), {
+                    'interfaces': ('meta:taxonomy',),
+                    'doc': 'A taxonomy for meta:rule types.'}),
+
                 ('meta:rule', ('guid', {}), {
                     'doc': 'A generic rule linked to matches with -(matches)> edges.'}),
 
@@ -257,9 +261,12 @@ class BaseModule(s_module.CoreModule):
                         'doc': 'The time the ruleset was most recently modified.'}),
                 )),
 
+                ('meta:rule:type:taxonomy', {}, ()),
                 ('meta:rule', {}, (
                     ('name', ('str', {'lower': True, 'onespace': True}), {
                         'doc': 'A name for the rule.'}),
+                    ('type', ('meta:rule:type:taxonomy', {}), {
+                        'doc': 'The rule type.'}),
                     ('desc', ('str', {}), {
                         'disp': {'hint': 'text'},
                         'doc': 'A description of the rule.'}),

synapse/models/biz.py

@@ -89,6 +89,10 @@ class BizModule(s_module.CoreModule):
                     ('requirements', ('array', {'type': 'ou:goal', 'uniq': True, 'sorted': True}), {}),
                 )),
                 ('biz:deal', {}, (
+                    ('id', ('str', {'strip': True}), {
+                        'doc': 'An identifier for the deal.',
+                    }),
+
                     ('title', ('str', {}), {
                         'doc': 'A title for the deal.',
                     }),

synapse/models/files.py

@@ -715,13 +715,15 @@ class FileModule(s_module.CoreModule):
                     ('entry:extended', ('file:path', {}), {
                         'doc': 'The extended file path contained within the extended FileEntry structure of the LNK file.'}),
                     ('entry:localized', ('file:path', {}), {
-                        'doc': 'The localized file path contained within the extended FileEntry structure of the LNK file.'}),
+                        'doc': 'The localized file path reconstructed from references within the extended FileEntry structure of the LNK file.'}),
                     ('entry:icon', ('file:path', {}), {
                         'doc': 'The icon file path contained within the StringData structure of the LNK file.'}),
                     ('environment:path', ('file:path', {}), {
                         'doc': 'The target file path contained within the EnvironmentVariableDataBlock structure of the LNK file.'}),
                     ('environment:icon', ('file:path', {}), {
                         'doc': 'The icon file path contained within the IconEnvironmentDataBlock structure of the LNK file.'}),
+                    ('iconindex', ('int', {}), {
+                        'doc': 'A resource index for an icon within an icon location.'}),
                     ('working', ('file:path', {}), {
                         'doc': 'The working directory used when activating the link target.'}),
                     ('relative', ('str', {'strip': True}), {
@@ -741,6 +743,11 @@ class FileModule(s_module.CoreModule):
                         'doc': 'The access time of the target file according to the LNK header.'}),
                     ('target:written', ('time', {}), {
                         'doc': 'The write time of the target file according to the LNK header.'}),
+
+                    ('driveserial', ('int', {}), {
+                        'doc': 'The drive serial number of the volume the link target is stored on.'}),
+                    ('machineid', ('it:hostname', {}), {
+                        'doc': 'The NetBIOS name of the machine where the link target was last located.'}),
                 )),
             ),
 

synapse/models/inet.py

@@ -1519,6 +1519,7 @@ class InetModule(s_module.CoreModule):
                         'doc': 'An object status enumeration.'}),
 
                     ('inet:service:account', ('guid', {}), {
+                        'interfaces': ('inet:service:object',),
                         'doc': 'An account within a service platform. Accounts may be instance specific.'}),
 
                     ('inet:service:permission:type:taxonomy', ('taxonomy', {}), {
@@ -1557,6 +1558,10 @@ class InetModule(s_module.CoreModule):
                         'interfaces': ('inet:service:object',),
                         'doc': 'A channel used to distribute messages.'}),
 
+                    ('inet:service:thread', ('guid', {}), {
+                        'interfaces': ('inet:service:object',),
+                        'doc': 'A message thread.'}),
+
                     ('inet:service:channel:member', ('guid', {}), {
                         'interfaces': ('inet:service:object',),
                         'doc': 'Represents a service account being a member of a channel.'}),
@@ -1571,6 +1576,10 @@ class InetModule(s_module.CoreModule):
                     ('inet:service:message:attachment', ('guid', {}), {
                         'doc': 'A file attachment included within a message.'}),
 
+                    ('inet:service:message:type:taxonomy', ('taxonomy', {}), {
+                        'interfaces': ('meta:taxonomy',),
+                        'doc': 'A message type taxonomy.'}),
+
                     ('inet:service:access', ('guid', {}), {
                         'interfaces': ('inet:service:action',),
                         'doc': 'Represents a user access request to a service resource.'}),
@@ -3640,6 +3649,7 @@ class InetModule(s_module.CoreModule):
                         # TODO ndef based auth proto details
                     )),
 
+                    ('inet:service:message:type:taxonomy', {}, ()),
                     ('inet:service:message', {}, (
 
                         ('account', ('inet:service:account', {}), {
@@ -3657,9 +3667,15 @@ class InetModule(s_module.CoreModule):
                         ('channel', ('inet:service:channel', {}), {
                             'doc': 'The channel that the message was sent to.'}),
 
+                        ('thread', ('inet:service:thread', {}), {
+                            'doc': 'The thread which contains the message.'}),
+
                         ('public', ('bool', {}), {
                             'doc': 'Set to true if the message is publicly visible.'}),
 
+                        ('title', ('str', {'lower': True, 'onespace': True}), {
+                            'doc': 'The message title.'}),
+
                         ('text', ('str', {}), {
                             'disp': {'hint': 'text'},
                             'doc': 'The text body of the message.'}),
@@ -3693,6 +3709,9 @@ class InetModule(s_module.CoreModule):
 
                         ('file', ('file:bytes', {}), {
                             'doc': 'The raw file that the message was extracted from.'}),
+
+                        ('type', ('inet:service:message:type:taxonomy', {}), {
+                            'doc': 'The type of message.'}),
                     )),
 
                     ('inet:service:message:link', {}, (
@@ -3725,6 +3744,18 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The time period where the channel was available.'}),
                     )),
 
+                    ('inet:service:thread', {}, (
+
+                        ('title', ('str', {'lower': True, 'onespace': True}), {
+                            'doc': 'The title of the thread.'}),
+
+                        ('channel', ('inet:service:channel', {}), {
+                            'doc': 'The channel that contains the thread.'}),
+
+                        ('message', ('inet:service:message', {}), {
+                            'doc': 'The message which initiated the thread.'}),
+                    )),
+
                     ('inet:service:channel:member', {}, (
 
                         ('channel', ('inet:service:channel', {}), {

synapse/tests/test_axon.py

@@ -941,13 +941,13 @@ bar baz",vv
         conf = {'http:proxy': 'socks5://user:pass@127.0.0.1:1'}
         async with self.getTestAxon(conf=conf) as axon:
             async with axon.getLocalProxy() as proxy:
-                resp = await proxy.wget('http://vertex.link')
+                resp = await proxy.wget('http://vertex.link/')
                 self.false(resp.get('ok'))
                 self.isin('connect to proxy 127.0.0.1:1', resp.get('mesg', ''))
 
             resp = await proxy.wget('vertex.link')
             self.false(resp.get('ok'))
-            self.isin('InvalidURL: vertex.link', resp.get('mesg', ''))
+            self.isin('InvalidUrlClientError: vertex.link', resp.get('mesg', ''))
 
     async def test_axon_wput(self):
 
@@ -1027,11 +1027,11 @@ bar baz",vv
 
             resp = await proxy.wput(sha256, 'vertex.link')
             self.false(resp.get('ok'))
-            self.isin('InvalidURL: vertex.link', resp.get('mesg', ''))
+            self.isin('InvalidUrlClientError: vertex.link', resp.get('mesg', ''))
 
             resp = await proxy.postfiles(fields, 'vertex.link')
             self.false(resp.get('ok'))
-            self.isin('InvalidURL: vertex.link', resp.get('reason'))
+            self.isin('InvalidUrlClientError: vertex.link', resp.get('reason'))
 
             # Bypass the Axon proxy configuration from Storm
             url = axon.getLocalUrl()
@@ -1131,6 +1131,9 @@ bar baz",vv
             bytslist = [b async for b in axon.get(sha256, 2, size=6)]
             self.eq(b'dfqwer', b''.join(bytslist))
 
+            metrics = await axon.metrics()
+            self.eq(metrics, {'size:bytes': 12, 'file:count': 1})
+
     async def test_axon_mirror(self):
 
         async with self.getTestAhaProv() as aha: