synapse 2.180.1__py311-none-any.whl → 2.181.0__py311-none-any.whl

synapse/lib/storm.lark

@@ -97,9 +97,23 @@ YIELD.1: /yield(?=[\s\{])/
 
 // Split out case subqueries to prevent invalid state merging
 casesubquery: "{" query "}" -> baresubquery
-switchcase: "switch" _varvalu "{" ((DEFAULTCASE | DOUBLEQUOTEDSTRING | SINGLEQUOTEDSTRING | formatstring | CASEBARE) ":" casesubquery)* "}"
+_caseentry: DOUBLEQUOTEDSTRING | SINGLEQUOTEDSTRING | CASEBARE
+_mcaseentry: DOUBLEQUOTEDSTRING | SINGLEQUOTEDSTRING | MCASEBARE
+caseentry: (DEFAULTCASE | _caseentry | "(" _mcaseentry ("," _mcaseentry)+ ")") ":" casesubquery
+switchcase: "switch" _varvalu "{" caseentry* "}"
 DEFAULTCASE.2: "*"
-CASEBARE.2: /(?<=[\s{])(?!\*)([^:\s"']+)(?=[\s]*:[\s]*\{)/
+CASEBARE.2: /
+    (?<=[\s{])          # can follow whitespace or the opening curly brace of the switch statement
+    (?!\*)              # should not include the DEFAULTCASE bare asterisk
+    ([^:\s"'()]+)       # can be anything except these characters
+    (?=[\s]*:[\s]*\{)   # must precede a colon and the open brace of the subquery (with any whitespace in between)
+/x
+MCASEBARE.2: /
+    (?<=[\s(,])         # can follow whitespace, open parens, or comma
+    ([^:\s"'(),]+)      # can be anything except these characters
+    (?=\s*(?:,|\)\s*:)) # must precede a comma or a close parens with colon (with any whitespace in between)
+/x
+
 
 yieldvalu: YIELD _argvalu
 

synapse/lib/storm.py

@@ -5505,6 +5505,9 @@ class ScrapeCmd(Cmd):
         # Scrape only the :engine and :text props from the inbound nodes.
         inet:search:query | scrape :text :engine
 
+        # Scrape the primary property from the inbound nodes.
+        it:dev:str | scrape $node.repr()
+
         # Scrape properties inbound nodes and yield newly scraped nodes.
         inet:search:query | scrape --yield
 

synapse/lib/storm_format.py

@@ -52,6 +52,7 @@ TerminalPygMap = {
     'LISTTOKN': p_t.Literal.String,
     'LPAR': p_t.Punctuation,
     'LSQB': p_t.Punctuation,
+    'MCASEBARE': p_t.Literal.String,
     'MODSET': p_t.Operator,
     'NONQUOTEWORD': p_t.Literal,
     'NOT': p_t.Keyword,

synapse/lib/stormhttp.py

@@ -464,12 +464,28 @@ class LibHttp(s_stormtypes.Lib):
                     kwargs['json'] = json
 
                 async with sess.request(meth, url, headers=headers, **kwargs) as resp:
+                    history = []
+                    for hist in resp.history:
+                        hnfo = {
+                            'code': hist.status,
+                            'reason': await self.codereason(hist.status),
+                            'headers': dict(hist.headers),
+                            'url': str(hist.url),
+                            # aiohttp has already closed the connection by this point
+                            # so there is no connection to read a body from.
+                            'body': b'',
+                            'history': [],
+                            'request_headers': dict(hist.request_info.headers)
+                        }
+                        history.append(hnfo)
                     info = {
                         'code': resp.status,
                         'reason': await self.codereason(resp.status),
                         'headers': dict(resp.headers),
                         'url': str(resp.url),
                         'body': await resp.read(),
+                        'history': history,
+                        'request_headers': dict(resp.request_info.headers)
                     }
                     return HttpResp(info)
 
@@ -485,12 +501,14 @@ class LibHttp(s_stormtypes.Lib):
                     reason = f'Exception occurred during request: {err[0]}'
 
                 info = {
+                    'err': err,
                     'code': -1,
                     'reason': reason,
                     'headers': dict(),
                     'url': url,
                     'body': b'',
-                    'err': err,
+                    'history': [],
+                    'request_headers': dict(),
                 }
                 return HttpResp(info)
 
@@ -505,7 +523,13 @@ class HttpResp(s_stormtypes.Prim):
         {'name': 'reason', 'desc': 'The reason phrase for the HTTP status code.', 'type': 'str'},
         {'name': 'body', 'desc': 'The raw HTTP response body as bytes.', 'type': 'bytes', },
         {'name': 'headers', 'type': 'dict', 'desc': 'The HTTP Response headers.'},
+        {'name': 'request_headers', 'type': 'dict', 'desc': 'The HTTP Request headers.'},
+        {'name': 'url', 'type': 'str',
+         'desc': 'The response URL. If the request was redirected, this would be the final URL in the redirection chain. If the status code is -1, then this is the request URL.'},
         {'name': 'err', 'type': 'list', 'desc': 'Tuple of the error type and information if an exception occurred.'},
+        {'name': 'history', 'desc': 'A list of response objects representing the history of the response. This is populated when responses are redirected.',
+         'type': {'type': 'gtor', '_gtorfunc': '_gtorHistory',
+                  'returns': {'type': 'list', 'desc': 'A list of ``inet:http:resp`` objects.', }}},
         {'name': 'json', 'desc': 'Get the JSON deserialized response.',
          'type': {'type': 'function', '_funcname': '_httpRespJson',
                   'args': (
@@ -525,12 +549,18 @@ class HttpResp(s_stormtypes.Prim):
     def __init__(self, valu, path=None):
         super().__init__(valu, path=path)
         self.locls.update(self.getObjLocals())
+        self.locls['url'] = self.valu.get('url')
         self.locls['code'] = self.valu.get('code')
         self.locls['reason'] = self.valu.get('reason')
         self.locls['body'] = self.valu.get('body')
         self.locls['headers'] = self.valu.get('headers')
+        self.locls['request_headers'] = self.valu.get('request_headers')
         self.locls['err'] = self.valu.get('err', ())
 
+        self.gtors.update({
+            'history': self._gtorHistory,
+        })
+
     def getObjLocals(self):
         return {
             'json': self._httpRespJson,
@@ -561,3 +591,6 @@ class HttpResp(s_stormtypes.Prim):
         unpk = s_msgpack.Unpk()
         for _, item in unpk.feed(byts):
             yield item
+
+    async def _gtorHistory(self):
+        return [HttpResp(hnfo) for hnfo in self.valu.get('history')]

synapse/lib/stormlib/auth.py

@@ -877,7 +877,7 @@ class User(s_stormtypes.Prim):
         ''',
          'type': {'type': 'function', '_funcname': '_methUserSetRoles',
                   'args': (
-                      {'name': 'idens', 'type': 'list', 'desc': 'The idens to  of the Role.', },
+                      {'name': 'idens', 'type': 'list', 'desc': 'The idens of the Roles to set on the User.', },
                   ),
                   'returns': {'type': 'null', }}},
         {'name': 'revoke', 'desc': 'Remove a Role from the User',

synapse/lib/stormlib/cortex.py

@@ -1085,7 +1085,7 @@ class CortexHttpApi(s_stormtypes.Lib):
                       {'name': 'path', 'type': 'string',
                        'desc': 'The extended HTTP API path.'},
                       {'name': 'name', 'type': 'string',
-                       'desc': 'Friendly name for the Extended HTTP API', 'default': ''},
+                       'desc': 'Friendly name for the Extended HTTP API.', 'default': ''},
                       {'name': 'desc', 'type': 'string',
                        'desc': 'Description for the Extended HTTP API.', 'default': ''},
                       {'name': 'runas', 'type': 'string',
@@ -1095,6 +1095,8 @@ class CortexHttpApi(s_stormtypes.Lib):
                        'desc': 'Require the API endpoint to be authenticated.', 'default': True},
                       {'name': 'readonly', 'type': 'boolean',
                        'desc': 'Run the Extended HTTP Storm methods in readonly mode.', 'default': False},
+                      {'name': 'iden', 'type': 'str',
+                       'desc': 'An iden for the new Extended HTTP API.', 'default': None},
                   ),
                   'returns': {'type': 'http:api', 'desc': 'A new ``http:api`` object.'}}},
         {'name': 'del', 'desc': 'Delete an Extended HTTP API endpoint.',
@@ -1196,7 +1198,7 @@ class CortexHttpApi(s_stormtypes.Lib):
         apis = [HttpApi(self.runt, adef) for adef in adefs]
         return apis
 
-    async def addHttpApi(self, path, name='', desc='', runas='owner', authenticated=True, readonly=False):
+    async def addHttpApi(self, path, name='', desc='', runas='owner', authenticated=True, readonly=False, iden=None):
         s_stormtypes.confirm(('storm', 'lib', 'cortex', 'httpapi', 'add'))
 
         path = await s_stormtypes.tostr(path)
@@ -1207,6 +1209,7 @@ class CortexHttpApi(s_stormtypes.Lib):
         authenticated = await s_stormtypes.tobool(authenticated)
 
         adef = {
+            'iden': iden,
             'path': path,
             'view': self.runt.snap.view.iden,
             'runas': runas,

synapse/lib/stormlib/ipv6.py

@@ -1,11 +1,11 @@
 import logging
-import ipaddress
-
 
 import synapse.exc as s_exc
+import synapse.common as s_common
 
 import synapse.lib.stormtypes as s_stormtypes
 
+ipaddress = s_common.ipaddress
 logger = logging.getLogger(__name__)
 
 @s_stormtypes.registry.registerLib

synapse/lib/stormlib/model.py

@@ -3,6 +3,7 @@ import synapse.common as s_common
 
 import synapse.lib.node as s_node
 import synapse.lib.cache as s_cache
+import synapse.lib.layer as s_layer
 import synapse.lib.stormtypes as s_stormtypes
 
 import synapse.models.infotech as s_infotech
@@ -497,6 +498,7 @@ class ModelType(s_stormtypes.Prim):
     _storm_locals = (
         {'name': 'name', 'desc': 'The name of the Type.', 'type': 'str', },
         {'name': 'stortype', 'desc': 'The storetype of the Type.', 'type': 'int', },
+        {'name': 'opts', 'desc': 'The options for the Type.', 'type': 'dict', },
         {'name': 'repr', 'desc': 'Get the repr of a value for the Type.',
          'type': {'type': 'function', '_funcname': '_methRepr',
                   'args': (
@@ -516,6 +518,7 @@ class ModelType(s_stormtypes.Prim):
         s_stormtypes.Prim.__init__(self, valu, path=path)
         self.locls.update(self.getObjLocals())
         self.locls.update({'name': valu.name,
+                           'opts': valu.opts,
                            'stortype': valu.stortype,
                            })
 
@@ -756,6 +759,16 @@ class MigrationEditorMixin:
                 if overwrite or not proto.hasTagProp(tagname, propname):
                     await proto.setTagProp(tagname, propname, valu) # use tag perms
 
+    async def copyExtProps(self, src, proto):
+
+        form = src.form
+
+        for name, valu in src.props.items():
+            prop = form.props.get(name)
+            if not prop.isext:
+                continue
+
+            await proto.set(name, valu)
 
 @s_stormtypes.registry.registerLib
 class LibModelMigration(s_stormtypes.Lib, MigrationEditorMixin):
@@ -788,6 +801,13 @@ class LibModelMigration(s_stormtypes.Lib, MigrationEditorMixin):
                        'desc': 'Copy tag property value even if the property exists on the destination node.', },
                   ),
                   'returns': {'type': 'null', }}},
+        {'name': 'copyExtProps', 'desc': 'Copy extended properties from the src node to the dst node.',
+         'type': {'type': 'function', '_funcname': '_methCopyExtProps',
+                  'args': (
+                      {'name': 'src', 'type': 'node', 'desc': 'The node to copy extended props from.', },
+                      {'name': 'dst', 'type': 'node', 'desc': 'The node to copy extended props to.', },
+                  ),
+                  'returns': {'type': 'null', }}},
     )
     _storm_lib_path = ('model', 'migration')
 
@@ -796,6 +816,9 @@ class LibModelMigration(s_stormtypes.Lib, MigrationEditorMixin):
             'copyData': self._methCopyData,
             'copyEdges': self._methCopyEdges,
             'copyTags': self._methCopyTags,
+            'copyExtProps': self._methCopyExtProps,
+            'liftByPropValuNoNorm': self._methLiftByPropValuNoNorm,
+            'setNodePropValuNoNorm': self._methSetNodePropValuNoNorm,
         }
 
     async def _methCopyData(self, src, dst, overwrite=False):
@@ -839,6 +862,79 @@ class LibModelMigration(s_stormtypes.Lib, MigrationEditorMixin):
             proto = editor.loadNode(dst)
             await self.copyTags(src, proto, overwrite=overwrite)
 
+    async def _methCopyExtProps(self, src, dst):
+
+        if not isinstance(src, s_node.Node):
+            raise s_exc.BadArg(mesg='$lib.model.migration.copyExtProps() source argument must be a node.')
+        if not isinstance(dst, s_node.Node):
+            raise s_exc.BadArg(mesg='$lib.model.migration.copyExtProps() dest argument must be a node.')
+
+        snap = self.runt.snap
+
+        async with snap.getEditor() as editor:
+            proto = editor.loadNode(dst)
+            await self.copyExtProps(src, proto)
+
+    async def _methLiftByPropValuNoNorm(self, formname, propname, valu, cmpr='=', reverse=False):
+        '''
+        No storm docs for this on purpose. It is restricted for use during model migrations only.
+        '''
+        formname = await s_stormtypes.tostr(formname)
+        propname = await s_stormtypes.tostr(propname)
+        valu = await s_stormtypes.toprim(valu)
+
+        prop = self.runt.snap.core.model.prop(f'{formname}:{propname}')
+        if prop is None:
+            mesg = f'Could not find prop: {formname}:{propname}'
+            raise s_exc.NoSuchProp(mesg=mesg, formname=formname, propname=propname)
+
+        if not self.runt.snap.core.migration:
+            mesg = '$lib.model.migration.liftByPropValuNoNorm() is restricted to model migrations only.'
+            raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
+
+        stortype = prop.type.stortype
+
+        # Normally we'd call proptype.getStorCmprs() here to get the cmprvals
+        # but getStorCmprs() calls norm() which we're  trying to avoid so build
+        # cmprvals manually here.
+
+        if prop.type.isarray:
+            stortype &= (~s_layer.STOR_FLAG_ARRAY)
+            liftfunc = self.runt.snap.wlyr.liftByPropArray
+        else:
+            liftfunc = self.runt.snap.wlyr.liftByPropValu
+
+        cmprvals = ((cmpr, valu, stortype),)
+
+        layriden = self.runt.snap.wlyr.iden
+        async for _, buid, sode in liftfunc(formname, propname, cmprvals, reverse=reverse):
+            yield await self.runt.snap._joinStorNode(buid, {layriden: sode})
+
+    async def _methSetNodePropValuNoNorm(self, n, propname, valu):
+        '''
+        No storm docs for this on purpose. It is restricted for use during model migrations only.
+        '''
+
+        # NB: I'm sure there are all kinds of edges cases that this function doesn't account for. At the time of it's
+        # creation, this was intended to be used to update array properties with bad it:sec:cpe values in them. It works
+        # for that use case (see model migration 0.2.28). Any additional use of this function should perform heavy
+        # testing.
+
+        if not isinstance(n, s_node.Node):
+            raise s_exc.BadArg(mesg='$lib.model.migration.setNodePropValuNoNorm() argument must be a node.')
+
+        if not self.runt.snap.core.migration:
+            mesg = '$lib.model.migration.setNodePropValuNoNorm() is restricted to model migrations only.'
+            raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
+
+        propname = await s_stormtypes.tostr(propname)
+        valu = await s_stormtypes.toprim(valu)
+
+        async with self.runt.snap.getNodeEditor(n) as proto:
+            await proto.set(propname, valu, norminfo={})
+
+        return n
+
 @s_stormtypes.registry.registerLib
 class LibModelMigrations(s_stormtypes.Lib, MigrationEditorMixin):
     '''
@@ -980,10 +1076,15 @@ class LibModelMigrations(s_stormtypes.Lib, MigrationEditorMixin):
     def getObjLocals(self):
         return {
             'itSecCpe_2_170_0': self._itSecCpe_2_170_0,
+            'itSecCpe_2_170_0_internal': self._itSecCpe_2_170_0_internal,
             'riskHasVulnToVulnerable': self._riskHasVulnToVulnerable,
         }
 
     async def _itSecCpe_2_170_0(self, n, prefer_v22=False, force=False):
+        info = await self._itSecCpe_2_170_0_internal(n, prefer_v22=prefer_v22, force=force, set_nodedata=True)
+        return info.get('status') == 'success'
+
+    async def _itSecCpe_2_170_0_internal(self, n, prefer_v22=False, force=False, set_nodedata=False):
 
         if not isinstance(n, s_node.Node):
             raise s_exc.BadArg(mesg='$lib.model.migration.s.itSecCpe_2_170_0() argument must be a node.')
@@ -1008,13 +1109,12 @@ class LibModelMigrations(s_stormtypes.Lib, MigrationEditorMixin):
             if self.runt.debug:
                 mesg = f'DEBUG: itSecCpe_2_170_0({reprvalu}): Node already migrated.'
                 await self.runt.printf(mesg)
-            return True
+            return nodedata
 
         modl = self.runt.model.type('it:sec:cpe')
 
         valu23 = None
         valu22 = None
-        invalid = ''
 
         # Check the primary property for validity.
         cpe23 = s_infotech.cpe23_regex.match(curv)
@@ -1036,11 +1136,11 @@ class LibModelMigrations(s_stormtypes.Lib, MigrationEditorMixin):
                     mesg = f'DEBUG: itSecCpe_2_170_0({reprvalu}): Node is valid, no migration necessary.'
                     await self.runt.printf(mesg)
 
-                await proto.setData('migration.s.itSecCpe_2_170_0', {
-                    'status': 'success',
-                })
+                nodedata = {'status': 'success'}
+                if set_nodedata:
+                    await proto.setData('migration.s.itSecCpe_2_170_0', nodedata)
 
-                return True
+                return nodedata
 
             if valu23 is None and valu22 is None:
                 reason = 'Unable to migrate due to invalid data. Primary property and :v2_2 are both invalid.'
@@ -1049,12 +1149,14 @@ class LibModelMigrations(s_stormtypes.Lib, MigrationEditorMixin):
                 mesg = f'itSecCpe_2_170_0({reprvalu}): {reason}'
                 await self.runt.warn(mesg)
 
-                await proto.setData('migration.s.itSecCpe_2_170_0', {
+                nodedata = {
                     'status': 'failed',
                     'reason': reason,
-                })
+                }
+                if set_nodedata:
+                    await proto.setData('migration.s.itSecCpe_2_170_0', nodedata)
 
-                return False
+                return nodedata
 
             if prefer_v22:
                 valu = valu22 or valu23
@@ -1065,7 +1167,6 @@ class LibModelMigrations(s_stormtypes.Lib, MigrationEditorMixin):
             norm, info = modl.norm(valu)
             subs = info.get('subs')
 
-            edits = []
             nodedata = {'status': 'success'}
 
             if norm != curv:
@@ -1097,7 +1198,8 @@ class LibModelMigrations(s_stormtypes.Lib, MigrationEditorMixin):
                 # Update the existing property with the re-normalized property value.
                 await proto.set(propname, subscurv, ignore_ro=True)
 
-            await proto.setData('migration.s.itSecCpe_2_170_0', nodedata)
+            if set_nodedata:
+                await proto.setData('migration.s.itSecCpe_2_170_0', nodedata)
 
             if self.runt.debug:
                 if nodedata.get('updated'):
@@ -1107,7 +1209,7 @@ class LibModelMigrations(s_stormtypes.Lib, MigrationEditorMixin):
                     mesg = f'DEBUG: itSecCpe_2_170_0({reprvalu}): No property updates required.'
                     await self.runt.printf(mesg)
 
-            return True
+            return nodedata
 
     async def _riskHasVulnToVulnerable(self, n, nodata=False):
 

synapse/lib/stormlib/project.py

@@ -847,7 +847,7 @@ class LibProjects(s_stormtypes.Lib):
                       {'name': 'name', 'type': 'str', 'desc': 'The name of the Project to get'},
                   ),
                   'returns': {'type': 'proj:project',
-                              'desc': 'The `proj:project `object, if it exists, otherwise null'}}},
+                              'desc': 'The project object, if it exists, otherwise null'}}},
 
         {'name': 'add', 'desc': 'Add a new project',
          'type': {'type': 'function', '_funcname': '_funcProjAdd',

synapse/lib/stormtypes.py

@@ -1337,7 +1337,7 @@ class LibBase(Lib):
                 Check if the runtime is in debug and print a message::
 
                     if $lib.debug {
-                        $lib.print('Doing stuff!")
+                        $lib.print('Doing stuff!')
                     }
 
                 Update the current runtime to enable debugging::
@@ -1996,7 +1996,7 @@ class LibAxon(Lib):
                        'desc': 'Set to False to disable SSL/TLS certificate verification.', 'default': True},
                       {'name': 'timeout', 'type': 'int', 'desc': 'Timeout for the download operation.',
                        'default': None},
-                      {'name': 'proxy', 'type': ['bool', 'null', 'str'],
+                      {'name': 'proxy', 'type': ['boolean', 'null', 'str'],
                        'desc': 'Set to a proxy URL string or $lib.false to disable proxy use.', 'default': None},
                       {'name': 'ssl_opts', 'type': 'dict',
                        'desc': 'Optional SSL/TLS options. See $lib.axon help for additional details.',
@@ -2019,7 +2019,7 @@ class LibAxon(Lib):
                        'desc': 'Set to False to disable SSL/TLS certificate verification.', 'default': True},
                       {'name': 'timeout', 'type': 'int', 'desc': 'Timeout for the download operation.',
                        'default': None},
-                      {'name': 'proxy', 'type': ['bool', 'null', 'str'],
+                      {'name': 'proxy', 'type': ['boolean', 'null', 'str'],
                        'desc': 'Set to a proxy URL string or $lib.false to disable proxy use.', 'default': None},
                       {'name': 'ssl_opts', 'type': 'dict',
                        'desc': 'Optional SSL/TLS options. See $lib.axon help for additional details.',
@@ -4994,7 +4994,7 @@ class List(Prim):
         {'name': 'sort', 'desc': 'Sort the list in place.',
          'type': {'type': 'function', '_funcname': '_methListSort',
                   'args': (
-                      {'name': 'reverse', 'type': 'bool', 'desc': 'Sort the list in reverse order.',
+                      {'name': 'reverse', 'type': 'boolean', 'desc': 'Sort the list in reverse order.',
                        'default': False},
                   ),
                   'returns': {'type': 'null', }}},
@@ -5061,6 +5061,14 @@ class List(Prim):
         {'name': 'unique', 'desc': 'Get a copy of the list containing unique items.',
          'type': {'type': 'function', '_funcname': '_methListUnique',
                   'returns': {'type': 'list'}}},
+        {'name': 'rem', 'desc': 'Remove a specific item from anywhere in the list.',
+         'type': {'type': 'function', '_funcname': '_methListRemove',
+                  'args': (
+                      {'name': 'item', 'type': 'any', 'desc': 'An item in the list.'},
+                      {'name': 'all', 'type': 'boolean', 'default': False,
+                       'desc': 'Remove all instances of item from the list.'},
+                  ),
+                  'returns': {'type': 'boolean', 'desc': 'Boolean indicating if the item was removed from the list.'}}},
     )
     _storm_typename = 'list'
     _ismutable = True
@@ -5082,6 +5090,7 @@ class List(Prim):
             'slice': self._methListSlice,
             'extend': self._methListExtend,
             'unique': self._methListUnique,
+            'rem': self._methListRemove,
         }
 
     @stormfunc(readonly=True)
@@ -5176,7 +5185,6 @@ class List(Prim):
         end = await toint(end)
         return self.valu[start:end]
 
-    @stormfunc(readonly=True)
     async def _methListExtend(self, valu):
         async for item in toiter(valu):
             self.valu.append(item)
@@ -5204,6 +5212,21 @@ class List(Prim):
             ret.append(val)
         return ret
 
+    async def _methListRemove(self, item, all=False):
+        item = await toprim(item)
+        all = await tobool(all)
+
+        if item not in self.valu:
+            return False
+
+        while item in self.valu:
+            self.valu.remove(item)
+
+            if not all:
+                break
+
+        return True
+
     async def stormrepr(self):
         reprs = [await torepr(k) for k in self.valu]
         rval = ', '.join(reprs)
@@ -6061,7 +6084,7 @@ class Node(Prim):
                       {'name': 'glob', 'type': 'str', 'default': None,
                        'desc': 'A tag glob expression. If this is provided, only tags which match the expression '
                                'are returned.'},
-                      {'name': 'leaf', 'type': 'bool', 'default': False,
+                      {'name': 'leaf', 'type': 'boolean', 'default': False,
                        'desc': 'If true, only leaf tags are included in the returned tags.'},
                   ),
                   'returns': {'type': 'list',
@@ -6721,6 +6744,13 @@ class Layer(Prim):
          'type': {'type': 'function', '_funcname': '_methGetFormcount',
                   'returns': {'type': 'dict',
                               'desc': 'Dictionary containing form names and the count of the nodes in the Layer.', }}},
+        {'name': 'getPropValues',
+         'desc': 'Yield unique property values in the layer for the given form or property name.',
+         'type': {'type': 'function', '_funcname': '_methGetPropValues',
+                  'args': (
+                      {'name': 'propname', 'type': 'str', 'desc': 'The property or form name to look up.', },
+                  ),
+                  'returns': {'name': 'yields', 'type': 'any', 'desc': 'Unique property values.', }}},
         {'name': 'getStorNodes', 'desc': '''
             Get buid, sode tuples representing the data stored in the layer.
 
@@ -6921,6 +6951,7 @@ class Layer(Prim):
             'liftByProp': self.liftByProp,
             'getTagCount': self._methGetTagCount,
             'getPropCount': self._methGetPropCount,
+            'getPropValues': self._methGetPropValues,
             'getTagPropCount': self._methGetTagPropCount,
             'getPropArrayCount': self._methGetPropArrayCount,
             'getFormCounts': self._methGetFormcount,
@@ -7190,6 +7221,29 @@ class Layer(Prim):
 
         return layr.getTagPropValuCount(form, tag, prop.name, prop.type.stortype, norm)
 
+    @stormfunc(readonly=True)
+    async def _methGetPropValues(self, propname):
+        propname = await tostr(propname)
+
+        prop = self.runt.snap.core.model.reqProp(propname)
+
+        layriden = self.valu.get('iden')
+        await self.runt.reqUserCanReadLayer(layriden)
+        layr = self.runt.snap.core.getLayer(layriden)
+
+        formname = None
+        propname = None
+
+        if prop.isform:
+            formname = prop.name
+        else:
+            propname = prop.name
+            if not prop.isuniv:
+                formname = prop.form.name
+
+        async for indx, valu in layr.iterPropValues(formname, propname, prop.type.stortype):
+            yield valu
+
     @stormfunc(readonly=True)
     async def _methLayerEdits(self, offs=0, wait=True, size=None, reverse=False):
         offs = await toint(offs)
@@ -7367,7 +7421,7 @@ class LibView(Lib):
         {'name': 'list', 'desc': 'List the Views in the Cortex.',
          'type': {'type': 'function', '_funcname': '_methViewList',
                   'args': (
-                      {'name': 'deporder', 'type': 'bool', 'default': False,
+                      {'name': 'deporder', 'type': 'boolean', 'default': False,
                         'desc': 'Return the lists in bottom-up dependency order.', },
                   ),
                   'returns': {'type': 'list', 'desc': 'List of ``view`` objects.', }}},
@@ -7622,6 +7676,14 @@ class View(Prim):
                   ),
                   'returns': {'type': 'int', 'desc': 'The count of nodes.', }}},
 
+        {'name': 'getPropValues',
+         'desc': 'Yield unique property values in the view for the given form or property name.',
+         'type': {'type': 'function', '_funcname': '_methGetPropValues',
+                  'args': (
+                      {'name': 'propname', 'type': 'str', 'desc': 'The property or form name to look up.', },
+                  ),
+                  'returns': {'name': 'yields', 'type': 'any', 'desc': 'Unique property values.', }}},
+
         {'name': 'detach', 'desc': 'Detach the view from its parent. WARNING: This cannot be reversed.',
          'type': {'type': 'function', '_funcname': 'detach',
                   'args': (),
@@ -7725,6 +7787,7 @@ class View(Prim):
             'getEdgeVerbs': self._methGetEdgeVerbs,
             'getFormCounts': self._methGetFormcount,
             'getPropCount': self._methGetPropCount,
+            'getPropValues': self._methGetPropValues,
             'getTagPropCount': self._methGetTagPropCount,
             'getPropArrayCount': self._methGetPropArrayCount,
 
@@ -7841,6 +7904,17 @@ class View(Prim):
 
         return await view.getPropArrayCount(propname, valu=valu)
 
+    @stormfunc(readonly=True)
+    async def _methGetPropValues(self, propname):
+        propname = await tostr(propname)
+
+        viewiden = self.valu.get('iden')
+        self.runt.confirm(('view', 'read'), gateiden=viewiden)
+        view = self.runt.snap.core.getView(viewiden)
+
+        async for valu in view.iterPropValues(propname):
+            yield valu
+
     @stormfunc(readonly=True)
     async def _methGetEdges(self, verb=None):
         verb = await toprim(verb)

synapse/lib/types.py

@@ -368,6 +368,13 @@ class Type:
         topt.update(opts)
         return self.__class__(self.modl, self.name, self.info, topt)
 
+    def __eq__(self, othr):
+        if self.name != othr.name:
+            return False
+        if self.opts != othr.opts:
+            return False
+        return True
+
 class Bool(Type):
 
     stortype = s_layer.STOR_TYPE_U8

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, 180, 1)
+version = (2, 181, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '1f1f8364fe330b8d92350436a6a10b99c5cc4b69'
+commit = '9241eebaad4a9c7bb007c6c5abb63be4e4ffac44'