synapse 2.172.0__py311-none-any.whl → 2.174.0__py311-none-any.whl

synapse/lib/stormsvc.py

@@ -4,6 +4,7 @@ import logging
 import synapse.telepath as s_telepath
 
 import synapse.lib.base as s_base
+import synapse.lib.hashitem as s_hashitem
 
 logger = logging.getLogger(__name__)
 
@@ -139,32 +140,50 @@ class StormSvcClient(s_base.Base):
         self.core.svcsbysvcname[self.svcname] = self
 
         await self.core.feedBeholder('svc:set', {'name': self.name, 'iden': self.iden, 'svcname': self.svcname, 'version': self.svcvers})
+        # if the old service is the same as the new service, just skip
 
-        try:
-            await self.core._delStormSvcPkgs(self.iden)
-
-        except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-            raise
-
-        except Exception:
-            logger.exception(f'_delStormSvcPkgs failed for service {self.name} ({self.iden})')
+        oldpkgs = self.core.getStormSvcPkgs(self.iden)
+        byname = {}
+        done = set()
+        for pdef in oldpkgs:
+            iden = s_hashitem.hashitem(pdef)
+            byname[pdef.get('name')] = iden
 
         # Register new packages
         for pdef in self.info.get('pkgs', ()):
-
             try:
-                # push the svciden in the package metadata for later reference.
                 pdef['svciden'] = self.iden
                 await self.core._normStormPkg(pdef)
+            except Exception:
+                name = pdef.get('name')
+                logger.exception(f'normStormPkg ({name}) failed for service {self.name} ({self.iden})')
+                continue
+
+            name = pdef.get('name')
+            iden = s_hashitem.hashitem(pdef)
+
+            done.add(name)
+            if name in byname:
+                if byname[name] != iden:
+                    await self.core._delStormPkg(name)  # we're updating an old package, so delete the old and then re-add
+                else:
+                    continue  # pkg unchanged. Can skip.
+
+            try:
+                # push the svciden in the package metadata for later reference.
                 await self.core._addStormPkg(pdef)
 
             except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
                 raise
 
             except Exception:
-                name = pdef.get('name')
                 logger.exception(f'addStormPkg ({name}) failed for service {self.name} ({self.iden})')
 
+        # clean up any packages that no longer exist
+        for name in byname.keys():
+            if name not in done:
+                await self.core._delStormPkg(name)
+
         # Set events and fire as needed
         evts = self.info.get('evts')
         try:

synapse/lib/stormtypes.py

@@ -18,7 +18,6 @@ import calendar
 import functools
 import contextlib
 import collections
-from typing import Any
 
 import synapse.exc as s_exc
 import synapse.common as s_common
@@ -8440,7 +8439,9 @@ class Trigger(Prim):
 
     async def set(self, name, valu):
         trigiden = self.valu.get('iden')
-        viewiden = self.runt.snap.view.iden
+        viewiden = self.valu.get('view')
+
+        view = self.runt.snap.core.reqView(viewiden)
 
         name = await tostr(name)
         if name in ('async', 'enabled', ):
@@ -8449,11 +8450,11 @@ class Trigger(Prim):
             valu = await tostr(valu)
 
         if name == 'user':
-            self.runt.user.confirm(('trigger', 'set', 'user'))
+            self.runt.confirm(('trigger', 'set', 'user'))
         else:
-            self.runt.user.confirm(('trigger', 'set', name), gateiden=viewiden)
+            self.runt.confirm(('trigger', 'set', name), gateiden=viewiden)
 
-        await self.runt.snap.view.setTriggerInfo(trigiden, name, valu)
+        await view.setTriggerInfo(trigiden, name, valu)
 
         self.valu[name] = valu
 
@@ -8825,6 +8826,8 @@ class LibCron(Lib):
          'desc': 'Permits a user to create a cron job.'},
         {'perm': ('cron', 'del'), 'gate': 'cronjob',
          'desc': 'Permits a user to remove a cron job.'},
+        {'perm': ('cron', 'kill'), 'gate': 'cronjob',
+         'desc': 'Controls the ability to terminate a running cron job.'},
         {'perm': ('cron', 'get'), 'gate': 'cronjob',
          'desc': 'Permits a user to list cron jobs.'},
         {'perm': ('cron', 'set'), 'gate': 'cronjob',
@@ -9276,14 +9279,19 @@ class CronJob(Prim):
                       {'name': 'valu', 'type': 'any', 'desc': 'The value to set on the definition.', },
                   ),
                   'returns': {'type': 'cronjob', 'desc': 'The ``cronjob``', }}},
+
+        {'name': 'kill', 'desc': 'If the job is currently running, terminate the task.',
+         'type': {'type': 'function', '_funcname': '_methCronJobKill',
+                  'returns': {'type': 'boolean', 'desc': 'A boolean value which is true if the task was terminated.'}}},
+
         {'name': 'pack', 'desc': 'Get the Cronjob definition.',
          'type': {'type': 'function', '_funcname': '_methCronJobPack',
-                  'returns': {'type': 'dict', 'desc': 'The definition.', }}},
+                  'returns': {'type': 'dict', 'desc': 'The definition.'}}},
         {'name': 'pprint', 'desc': 'Get a dictionary containing user friendly strings for printing the CronJob.',
          'type': {'type': 'function', '_funcname': '_methCronJobPprint',
                   'returns':
                       {'type': 'dict',
-                       'desc': 'A dictionary containing structured data about a cronjob for display purposes.', }}},
+                       'desc': 'A dictionary containing structured data about a cronjob for display purposes.'}}},
     )
     _storm_typename = 'cronjob'
     _ismutable = False
@@ -9300,10 +9308,16 @@ class CronJob(Prim):
     def getObjLocals(self):
         return {
             'set': self._methCronJobSet,
+            'kill': self._methCronJobKill,
             'pack': self._methCronJobPack,
             'pprint': self._methCronJobPprint,
         }
 
+    async def _methCronJobKill(self):
+        iden = self.valu.get('iden')
+        self.runt.confirm(('cron', 'kill'), gateiden=iden)
+        return await self.runt.snap.core.killCronTask(iden)
+
     async def _methCronJobSet(self, name, valu):
         name = await tostr(name)
         valu = await toprim(valu)
@@ -9312,9 +9326,9 @@ class CronJob(Prim):
         if name == 'creator':
             # this permission must be granted cortex wide
             # to prevent abuse...
-            self.runt.user.confirm(('cron', 'set', 'creator'))
+            self.runt.confirm(('cron', 'set', 'creator'))
         else:
-            self.runt.user.confirm(('cron', 'set', name), gateiden=iden)
+            self.runt.confirm(('cron', 'set', name), gateiden=iden)
 
         self.valu = await self.runt.snap.core.editCronJob(iden, name, valu)
 

synapse/lib/trigger.py

@@ -522,10 +522,6 @@ class Trigger:
                 logger.warning(f'Skipping trigger execution because user {self.user.iden} is locked')
             return
 
-        tag = self.tdef.get('tag')
-        cond = self.tdef.get('cond')
-        form = self.tdef.get('form')
-        prop = self.tdef.get('prop')
         storm = self.tdef.get('storm')
 
         query = await self.view.core.getStormQuery(storm)

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, 172, 0)
+version = (2, 174, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '3e33d8a8cbdfd0f4f6f9a31d664578d817d9ccb8'
+commit = 'cc04ec913185e0c1ef5a94958d6eb40eb288f38f'

synapse/lib/view.py

@@ -1518,6 +1518,8 @@ class View(s_nexus.Pusher):  # type: ignore
         elif self.triggers.get(iden) is not None:
             raise s_exc.DupIden(mesg='A trigger with this iden already exists')
 
+        tdef['view'] = self.iden
+
         root = await self.core.auth.getUserByName('root')
 
         tdef.setdefault('created', s_common.now())

synapse/models/crypto.py

@@ -371,31 +371,53 @@ class CryptoModule(s_module.CoreModule):
                 ('crypto:algorithm', {}, ()),
 
                 ('crypto:key', {}, (
+
                     ('algorithm', ('crypto:algorithm', {}), {
                         'ex': 'aes256',
                         'doc': 'The cryptographic algorithm which uses the key material.'}),
+
                     ('mode', ('str', {'lower': True, 'onespace': True}), {
                         'doc': 'The algorithm specific mode in use.'}),
+
                     ('iv', ('hex', {}), {
                         'doc': 'The hex encoded initialization vector.'}),
+
+                    ('iv:text', ('it:dev:str', {}), {
+                        'doc': 'Set only if the :iv property decodes to ASCII.'}),
+
                     ('public', ('hex', {}), {
                         'doc': 'The hex encoded public key material if the algorithm has a public/private key pair.'}),
+
+                    ('public:text', ('it:dev:str', {}), {
+                        'doc': 'Set only if the :public property decodes to ASCII.'}),
+
                     ('public:md5', ('hash:md5', {}), {
                         'doc': 'The MD5 hash of the public key in raw binary form.'}),
+
                     ('public:sha1', ('hash:sha1', {}), {
                         'doc': 'The SHA1 hash of the public key in raw binary form.'}),
+
                     ('public:sha256', ('hash:sha256', {}), {
                         'doc': 'The SHA256 hash of the public key in raw binary form.'}),
+
                     ('private', ('hex', {}), {
                         'doc': 'The hex encoded private key material. All symmetric keys are private.'}),
+
+                    ('private:text', ('it:dev:str', {}), {
+                        'doc': 'Set only if the :private property decodes to ASCII.'}),
+
                     ('private:md5', ('hash:md5', {}), {
                         'doc': 'The MD5 hash of the private key in raw binary form.'}),
+
                     ('private:sha1', ('hash:sha1', {}), {
                         'doc': 'The SHA1 hash of the private key in raw binary form.'}),
+
                     ('private:sha256', ('hash:sha256', {}), {
                         'doc': 'The SHA256 hash of the private key in raw binary form.'}),
+
                     ('seed:passwd', ('inet:passwd', {}), {
                         'doc': 'The seed password used to generate the key material.'}),
+
                     ('seed:algorithm', ('crypto:algorithm', {}), {
                         'ex': 'pbkdf2',
                         'doc': 'The algorithm used to generate the key from the seed password.'})

synapse/models/economic.py

@@ -48,11 +48,11 @@ class EconModule(s_module.CoreModule):
                     'doc': 'An invoice issued requesting payment.'}),
 
                 ('econ:price', ('hugenum', {'norm': False}), {
-                    'doc': 'The amount of money expected, required, or given in payment for something',
+                    'doc': 'The amount of money expected, required, or given in payment for something.',
                     'ex': '2.20'}),
 
                 ('econ:currency', ('str', {'lower': True, 'strip': False}), {
-                    'doc': 'The name of a system of money in general use',
+                    'doc': 'The name of a system of money in general use.',
                     'ex': 'usd'}),
 
                 ('econ:fin:exchange', ('guid', {}), {
@@ -99,6 +99,7 @@ class EconModule(s_module.CoreModule):
 
             'forms': (
 
+                ('econ:currency', {}, ()),
                 ('econ:pay:iin', {}, (
 
                     ('org', ('ou:org', {}), {
@@ -205,6 +206,9 @@ class EconModule(s_module.CoreModule):
                     ('fee', ('econ:price', {}), {
                         'doc': 'The transaction fee paid by the recipient to the payment processor.'}),
 
+                    ('from:cash', ('bool', {}), {
+                        'doc': 'Set to true if the payment input was in cash.'}),
+
                     ('from:account', ('econ:bank:account', {}), {
                         'doc': 'The bank account which made the payment.'}),
 
@@ -220,6 +224,9 @@ class EconModule(s_module.CoreModule):
                     ('from:contact', ('ps:contact', {}), {
                         'doc': 'Contact information for the entity making the payment.'}),
 
+                    ('to:cash', ('bool', {}), {
+                        'doc': 'Set to true if the payment output was in cash.'}),
+
                     ('to:account', ('econ:bank:account', {}), {
                         'doc': 'The bank account which received the payment.'}),
 
@@ -256,6 +263,20 @@ class EconModule(s_module.CoreModule):
                     ('receipt', ('econ:acct:receipt', {}), {
                         'doc': 'The receipt that was issued for the payment.'}),
 
+                    ('place', ('geo:place', {}), {
+                        'doc': 'The place where the payment occurred.'}),
+
+                    ('place:name', ('geo:name', {}), {
+                        'doc': 'The name of the place where the payment occurred.'}),
+
+                    ('place:address', ('geo:address', {}), {
+                        'doc': 'The address of the place where the payment occurred.'}),
+
+                    ('place:loc', ('loc', {}), {
+                        'doc': 'The loc of the place where the payment occurred.'}),
+
+                    ('place:latlong', ('geo:latlong', {}), {
+                        'doc': 'The latlong where the payment occurred.'}),
                 )),
 
                 ('econ:acct:balance', {}, (

synapse/models/entity.py

@@ -0,0 +1,16 @@
+import synapse.lib.module as s_module
+
+class EntityModule(s_module.CoreModule):
+
+    def getModelDefs(self):
+        return (('entity', {
+
+            'types': (
+                ('entity:name', ('str', {'onespace': True, 'lower': True}), {
+                    'doc': 'A name used to refer to an entity.'}),
+            ),
+
+            'forms': (
+                ('entity:name', {}, ()),
+            ),
+        }),)

synapse/models/files.py

@@ -412,7 +412,10 @@ class FileModule(s_module.CoreModule):
                     'doc': 'The GUID of the metadata pulled from a Windows shortcut or LNK file.',
                 }),
             ),
-
+            'edges': (
+                (('file:bytes', 'refs', 'it:dev:str'), {
+                    'doc': 'The source file contains the target string.'}),
+            ),
             'forms': (
 
                 ('file:bytes', {}, (

synapse/models/geopol.py

@@ -88,6 +88,9 @@ class PolModule(s_module.CoreModule):
 
                         ('vitals', ('pol:vitals', {}), {
                             'doc': 'The most recent known vitals for the country.'}),
+
+                        ('currencies', ('array', {'type': 'econ:currency', 'sorted': True, 'uniq': True}), {
+                            'doc': 'The official currencies used in the country.'}),
                     )),
                     ('pol:immigration:status:type:taxonomy', {}, ()),
                     ('pol:immigration:status', {}, (

synapse/models/orgs.py

@@ -731,8 +731,7 @@ class OuModule(s_module.CoreModule):
                     ('contact', ('ps:contact', {}), {
                         'doc': 'The contact info for the person who holds the position.',
                     }),
-                    # TODO migrate to ou:jobtitle
-                    ('title', ('str', {'lower': True, 'onespace': True}), {
+                    ('title', ('ou:jobtitle', {}), {
                         'doc': 'The title of the position.',
                     }),
                     ('reports', ('array', {'type': 'ou:position', 'uniq': True, 'sorted': True}), {
@@ -1024,10 +1023,13 @@ class OuModule(s_module.CoreModule):
                     ('sponsors', ('array', {'type': 'ps:contact', 'uniq': True, 'sorted': True}), {
                         'doc': 'An array of contacts which sponsored the conference.',
                     }),
-                    ('name', ('str', {'lower': True}), {
+                    ('name', ('entity:name', {}), {
                         'doc': 'The full name of the conference.',
-                        'ex': 'decfon 2017',
-                    }),
+                        'ex': 'defcon 2017'}),
+
+                    ('names', ('array', {'type': 'entity:name', 'uniq': True, 'sorted': True}), {
+                        'doc': 'An array of alternate names for the conference.'}),
+
                     ('desc', ('str', {'lower': True}), {
                         'doc': 'A description of the conference.',
                         'ex': 'annual cybersecurity conference',

synapse/models/person.py

@@ -356,8 +356,11 @@ class PsModule(s_module.CoreModule):
                         'doc': 'A description of this contact.',
                     }),
                     ('title', ('ou:jobtitle', {}), {
-                        'doc': 'The job/org title listed for this contact.',
-                    }),
+                        'doc': 'The job/org title listed for this contact.'}),
+
+                    ('titles', ('array', {'type': 'ou:jobtitle', 'sorted': True, 'uniq': True}), {
+                        'doc': 'An array of alternate titles for the contact.'}),
+
                     ('photo', ('file:bytes', {}), {
                         'doc': 'The photo listed for this contact.',
                     }),

synapse/models/planning.py

@@ -28,6 +28,11 @@ class PlanModule(s_module.CoreModule):
                     'doc': 'A link between steps in a procedure.'}),
             ),
 
+            'edges': (
+                (('plan:procedure:step', 'uses', None), {
+                    'doc': 'The step in the procedure makes use of the target node.'}),
+            ),
+
             'forms': (
                 ('plan:system', {}, (
 

synapse/tests/test_cortex.py

@@ -269,6 +269,19 @@ class CortexTest(s_t_utils.SynTest):
                     self.eq(await core00.getJsonObj('foo/bar'), 'zoinks')
                     self.eq(await core01.getJsonObj('foo/bar'), 'zoinks')
 
+        # Test startup sequencing. We must create the child cells prior to
+        # the nexus recover() call from occuring :)
+        with self.getTestDir() as dirn:
+            async with self.getTestCore(dirn=dirn) as core:
+                await core.callStorm('$lib.jsonstor.set((path,), hehe)')
+
+            with self.getAsyncLoggerStream('synapse.lib.nexus') as stream:
+                async with self.getTestCore(dirn=dirn) as core:
+                    q = 'return( $lib.jsonstor.get((path,)) )'
+                    self.eq('hehe', await core.callStorm(q))
+            stream.seek(0)
+            self.notin('Exception while replaying log', stream.read())
+
     async def test_cortex_layer_mirror(self):
 
         # test a layer mirror from a layer

synapse/tests/test_lib_agenda.py

@@ -331,7 +331,17 @@ class AgendaTest(s_t_utils.SynTest):
                 appt = await agenda.get(guid)
                 self.eq(appt.isrunning, True)
                 self.eq(core.view.iden, appt.task.info.get('view'))
-                await appt.task.kill()
+
+                self.true(await core._killCronTask(guid))
+
+                events = [
+                    {'event': 'cron:stop', 'info': {'iden': appt.iden}},
+                ]
+
+                task = core.schedCoro(s_t_utils.waitForBehold(core, events))
+                await asyncio.wait_for(task, timeout=5)
+
+                self.false(await core._killCronTask(guid))
 
                 appt = await agenda.get(guid)
                 self.eq(appt.isrunning, False)
@@ -798,3 +808,121 @@ class AgendaTest(s_t_utils.SynTest):
                 stream.seek(0)
                 data = stream.read()
                 self.isin("_Appt.edits() Invalid attribute received: invalid = 'newp'", data)
+
+    async def test_cron_kill(self):
+        async with self.getTestCore() as core:
+
+            data = []
+            evt = asyncio.Event()
+
+            async def task():
+                async for mesg in core.behold():
+                    data.append(mesg)
+                    if mesg.get('event') == 'cron:stop':
+                        evt.set()
+
+            core.schedCoro(task())
+
+            q = '$q=$lib.queue.gen(test) for $i in $lib.range(60) { $lib.time.sleep(0.1) $q.put($i) }'
+            guid = s_common.guid()
+            cdef = {
+                'creator': core.auth.rootuser.iden, 'iden': guid,
+                'storm': q,
+                'reqs': {'now': True}
+            }
+            await core.addCronJob(cdef)
+
+            q = '$q=$lib.queue.gen(test) for $valu in $q.get((0), wait=(true)) { return ($valu) }'
+            valu = await core.callStorm(q)
+            self.eq(valu, 0)
+
+            opts = {'vars': {'iden': guid}}
+            get_cron = 'return($lib.cron.get($iden).pack())'
+            cdef = await core.callStorm(get_cron, opts=opts)
+            self.true(cdef.get('isrunning'))
+
+            self.true(await core.callStorm('return($lib.cron.get($iden).kill())', opts=opts))
+
+            self.true(await asyncio.wait_for(evt.wait(), timeout=12))
+
+            cdef = await core.callStorm(get_cron, opts=opts)
+            self.false(cdef.get('isrunning'))
+
+    async def test_cron_kill_pool(self):
+
+        async with self.getTestAhaProv() as aha:
+
+            import synapse.cortex as s_cortex
+            import synapse.lib.base as s_base
+
+            async with await s_base.Base.anit() as base:
+
+                with self.getTestDir() as dirn:
+
+                    dirn00 = s_common.genpath(dirn, 'cell00')
+                    dirn01 = s_common.genpath(dirn, 'cell01')
+
+                    core00 = await base.enter_context(self.addSvcToAha(aha, '00.core', s_cortex.Cortex, dirn=dirn00))
+                    provinfo = {'mirror': '00.core'}
+                    core01 = await base.enter_context(self.addSvcToAha(aha, '01.core', s_cortex.Cortex, dirn=dirn01, provinfo=provinfo))
+
+                    self.len(1, await core00.nodes('[inet:asn=0]'))
+                    await core01.sync()
+                    self.len(1, await core01.nodes('inet:asn=0'))
+
+                    msgs = await core00.stormlist('aha.pool.add pool00...')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('Created AHA service pool: pool00.loop.vertex.link', msgs)
+
+                    msgs = await core00.stormlist('aha.pool.svc.add pool00... 01.core...')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('AHA service (01.core...) added to service pool (pool00.loop.vertex.link)', msgs)
+
+                    msgs = await core00.stormlist('cortex.storm.pool.set --connection-timeout 1 --sync-timeout 1 aha://pool00...')
+                    self.stormHasNoWarnErr(msgs)
+                    self.stormIsInPrint('Storm pool configuration set.', msgs)
+
+                    await core00.stormpool.waitready(timeout=12)
+
+                    data = []
+                    evt = asyncio.Event()
+
+                    async def task():
+                        async for mesg in core00.behold():
+                            data.append(mesg)
+                            if mesg.get('event') == 'cron:stop':
+                                evt.set()
+
+                    core00.schedCoro(task())
+
+                    q = '$q=$lib.queue.gen(test) for $i in $lib.range(60) { $lib.time.sleep(0.1) $q.put($i) }'
+                    guid = s_common.guid()
+                    cdef = {
+                        'creator': core00.auth.rootuser.iden, 'iden': guid,
+                        'storm': q,
+                        'reqs': {'NOW': True},
+                        'pool': True,
+                    }
+                    await core00.addCronJob(cdef)
+
+                    q = '$q=$lib.queue.gen(test) for $valu in $q.get((0), wait=(true)) { return ($valu) }'
+                    valu = await core00.callStorm(q, opts={'mirror': False})
+                    self.eq(valu, 0)
+
+                    opts = {'vars': {'iden': guid}, 'mirror': False}
+                    get_cron = 'return($lib.cron.get($iden).pack())'
+                    cdef = await core00.callStorm(get_cron, opts=opts)
+                    self.true(cdef.get('isrunning'))
+
+                    self.true(await core00.callStorm('return($lib.cron.get($iden).kill())', opts=opts))
+
+                    self.true(await asyncio.wait_for(evt.wait(), timeout=12))
+
+                    cdef00 = await core00.callStorm(get_cron, opts=opts)
+                    self.false(cdef00.get('isrunning'))
+
+                    cdef01 = await core01.callStorm(get_cron, opts=opts)
+                    self.false(cdef01.get('isrunning'))
+                    self.eq(cdef01.get('lastresult'), 'cancelled')
+                    self.gt(cdef00['laststarttime'], 0)
+                    self.eq(cdef00['laststarttime'], cdef01['laststarttime'])

synapse/tests/test_lib_ast.py

@@ -356,6 +356,27 @@ class AstTest(s_test.SynTest):
             self.len(1, nodes)
             self.none(nodes[0].get('.seen'))
 
+            # array var filter
+            q = '''
+                [(test:arrayprop=* :strs=(neato, burrito))
+                 (test:arrayprop=* :ints=(1,2,3,4,5))] |
+                 $pvar = "strs"
+                 +:$pvar*[=neato]
+            '''
+            nodes = await core.nodes(q)
+            self.len(1, nodes)
+            self.eq(('neato', 'burrito'), nodes[0].get('strs'))
+
+            q = '$pvar=ints $avar=4 test:arrayprop +:$pvar*[=$avar]'
+            nodes = await core.nodes(q)
+            self.len(1, nodes)
+            self.eq((1, 2, 3, 4, 5), nodes[0].get('ints'))
+
+            q = '$pvar=strs $avar=burr test:arrayprop +:$pvar*[^=$avar]'
+            nodes = await core.nodes(q)
+            self.len(1, nodes)
+            self.eq(('neato', 'burrito'), nodes[0].get('strs'))
+
             # Sad paths
             q = '[test:str=newp -.newp]'
             await self.asyncraises(s_exc.NoSuchProp, core.nodes(q))

synapse/tests/test_lib_grammar.py

@@ -721,6 +721,8 @@ Queries = [
     '$foo=({"bar": null})',
     '$p="names" ps:contact:name=foo [ :$p?+=bar ]',
     '$p="names" ps:contact:name=foo [ :$p?-=bar ]',
+    '$pvar=stuff test:arrayprop +:$pvar*[=neato]',
+    '$pvar=ints test:arrayprop +:$pvar*[=$othervar]',
 ]
 
 # Generated with print_parse_list below
@@ -1346,6 +1348,8 @@ _ParseResults = [
     'Query: [SetVarOper: [Const: foo, DollarExpr: [ExprDict: [Const: bar, Const: None]]]]',
     'Query: [SetVarOper: [Const: p, Const: names], LiftPropBy: [Const: ps:contact:name, Const: =, Const: foo], EditPropSet: [RelProp: [VarValue: [Const: p]], Const: ?+=, Const: bar]]',
     'Query: [SetVarOper: [Const: p, Const: names], LiftPropBy: [Const: ps:contact:name, Const: =, Const: foo], EditPropSet: [RelProp: [VarValue: [Const: p]], Const: ?-=, Const: bar]]',
+    'Query: [SetVarOper: [Const: pvar, Const: stuff], LiftProp: [Const: test:arrayprop], FiltOper: [Const: +, ArrayCond: [RelProp: [VarValue: [Const: pvar]], Const: =, Const: neato]]]',
+    'Query: [SetVarOper: [Const: pvar, Const: ints], LiftProp: [Const: test:arrayprop], FiltOper: [Const: +, ArrayCond: [RelProp: [VarValue: [Const: pvar]], Const: =, VarValue: [Const: othervar]]]]',
 ]
 
 class GrammarTest(s_t_utils.SynTest):