synapse 2.203.0__tar.gz → 2.204.1__tar.gz

{synapse-2.203.0/synapse.egg-info → synapse-2.204.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: synapse
-Version: 2.203.0
+Version: 2.204.1
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0
@@ -64,6 +64,7 @@ Requires-Dist: sphinx<9.0.0,>=8.0.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme<4.0.0,>=3.0.0; extra == "docs"
 Requires-Dist: sphinx-notfound-page<2.0.0,>=1.0.4; extra == "docs"
 Requires-Dist: jinja2<4.0.0,>=3.1.4; extra == "docs"
+Dynamic: license-file
 
 Synapse
 =======

{synapse-2.203.0 → synapse-2.204.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.203.0'
+version = '2.204.1'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]

{synapse-2.203.0 → synapse-2.204.1}/synapse/lib/auth.py

@@ -423,6 +423,9 @@ class Auth(s_nexus.Pusher):
 
         await self.feedBeholder('user:info', mesg, gateiden=gateiden, logged=logged)
 
+        if name == 'locked':
+            await self.fire('user:lock', user=iden, locked=valu)
+
         # since any user info *may* effect auth
         user.clearAuthCache()
 

{synapse-2.203.0 → synapse-2.204.1}/synapse/lib/cell.py

@@ -3143,8 +3143,11 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
             self.sessstor.set(iden, name, valu)
         return info
 
-    @s_nexus.Pusher.onPushAuto('http:sess:del')
     async def delHttpSess(self, iden):
+        await self._push('http:sess:del', iden)
+
+    @s_nexus.Pusher.onPush('http:sess:del')
+    async def _delHttpSess(self, iden):
         await self.sessstor.del_(iden)
         sess = self.sessions.pop(iden, None)
         if sess:
@@ -3412,6 +3415,7 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
 
         # Add callbacks
         self.on('user:del', self._onUserDelEvnt)
+        self.on('user:lock', self._onUserLockEvnt)
 
         authctor = self.conf.get('auth:ctor')
         if authctor is not None:
@@ -5013,6 +5017,22 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
             self.slab.delete(lkey, db=self.usermetadb)
             await asyncio.sleep(0)
 
+    async def _onUserLockEvnt(self, evnt):
+        # Call callback for handling user:lock events
+        useriden = evnt[1].get('user')
+        locked = evnt[1].get('locked')
+
+        if not locked:
+            return
+
+        # Find and delete all HTTP sessions for useriden
+        for iden, sess in list(self.sessions.items()):
+            if sess.info.get('user') == useriden:
+                username = sess.info.get('username', '<unknown>')
+                await self._delHttpSess(iden)
+                logger.info(f'Invalidated HTTP session for locked user {username}',
+                            extra=await self.getLogExtra(target_user=useriden))
+
     def _makeCachedSslCtx(self, opts):
 
         opts = dict(opts)

{synapse-2.203.0 → synapse-2.204.1}/synapse/lib/storm.lark

@@ -404,7 +404,7 @@ embedquery: _EMBEDQUERYSTART query "}"
 _EMBEDQUERYSTART: "${"
 
 // An unquoted storm string constant.  Must start with a word char, ?, /, \, +, *, or - and not contain certain punctuation
-NONQUOTEWORD: /(?!\/\/)[\w\-\+\?\*\/\\][^\s\),=\]}\|]*(?=$|[\s\),\]}\|\=])/
+NONQUOTEWORD: /(?!\/\/)[\w\-\+\?\*\/\\][^\s(),=\]}|$]*(?=$|[\s(),\]}|=$])/
 
 // A white-space *only* delimited string immediate for use in legacy cmdr parser
 CMDRTOKN.-1: /[^="'\s\{}][^\s\{}]*/
@@ -629,7 +629,7 @@ OCTNUMBER.1: /
 
 BOOL.2: /(true|false)(?=$|[\s\),\]}\|\=])/
 NULL.2: /null(?=$|[\s\),\]}\|\=])/
-NOTOP.2: /not(?=$|[\s\),\]}\|\=])/
+NOTOP.2: /not(?=[\s($])/
 OR.2: "or"
 AND.2: "and"
 

{synapse-2.203.0 → synapse-2.204.1}/synapse/lib/storm.py

@@ -5004,9 +5004,12 @@ class ParallelCmd(Cmd):
 
             yield item
 
-    async def pipeline(self, runt, query, inq, outq):
+    async def pipeline(self, runt, query, inq, outq, runtvars):
+
+        opts = {'vars': runtvars}
+
         try:
-            async with runt.getSubRuntime(query) as subr:
+            async with runt.getCmdRuntime(query, opts=opts) as subr:
                 async for item in subr.execute(genr=self.nextitem(inq)):
                     await outq.put(item)
 
@@ -5037,11 +5040,13 @@ class ParallelCmd(Cmd):
             inq = asyncio.Queue(maxsize=size)
             outq = asyncio.Queue(maxsize=size)
 
+            runtvars = self.runt.getScopeVars()
+
             tsks = 0
             try:
                 while tsks < size:
                     await inq.put(await genr.__anext__())
-                    base.schedCoro(self.pipeline(runt, query, inq, outq))
+                    base.schedCoro(self.pipeline(runt, query, inq, outq, runtvars))
                     tsks += 1
             except StopAsyncIteration:
                 [await inq.put(None) for i in range(tsks)]
@@ -5062,7 +5067,7 @@ class ParallelCmd(Cmd):
             elif tsks == 0:
                 tsks = size
                 for i in range(size):
-                    base.schedCoro(self.pipeline(runt, query, inq, outq))
+                    base.schedCoro(self.pipeline(runt, query, inq, outq, runtvars))
                 [await inq.put(None) for i in range(tsks)]
 
             exited = 0

{synapse-2.203.0 → synapse-2.204.1}/synapse/lib/urlhelp.py

@@ -1,8 +1,9 @@
 import urllib.parse
 
-import regex
 import synapse.exc as s_exc
 
+import synapse.lib.cache as s_cache
+
 def chopurl(url):
     '''
     A sane "stand alone" url parser.
@@ -70,8 +71,7 @@ def chopurl(url):
     ret['path'] = pathrem
     return ret
 
-_url_re = regex.compile(r'^(?P<front>.+?://.+?:)[^/]+?(?=@)')
-
+@s_cache.memoize(size=1024)
 def sanitizeUrl(url):
     '''
     Returns a URL with the password (if present) replaced with ``****``
@@ -85,4 +85,28 @@ def sanitizeUrl(url):
     Note: this depends on this being a reasonably-well formatted URI that starts with a scheme (e.g. http) and '//:'
     Failure of this condition yields the original string.
     '''
-    return _url_re.sub(r'\g<front>****', url)
+    try:
+        info = chopurl(url)
+    except Exception as e:
+        return url
+    else:
+        if info.get('passwd'):
+            # Rebuild the URL from info
+            valu = f"{info.get('scheme')}://{info.get('user')}:****@"
+            host = info.get('host')
+            port = info.get('port')
+            if ':' in host and port:
+                valu = f"{valu}[{host}]:{port}"
+            elif port:
+                valu = f"{valu}{host}:{port}"
+            else:
+                valu = f"{valu}{host}"
+            if path := info.get('path'):
+                valu = f"{valu}{path}"
+            if query := info.get('query'):
+                parts = []
+                for k, v in query.items():
+                    parts.append(f'{k}={v}')
+                valu = f"{valu}?{'&'.join(parts)}"
+            return valu
+        return url

{synapse-2.203.0 → synapse-2.204.1}/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, 203, 0)
+version = (2, 204, 1)
 verstring = '.'.join([str(x) for x in version])
-commit = '809ecdca2e2b05f1cd111bb23c237127b2b9c177'
+commit = '8698255e2c915ecb1b175a0d2aaf3b8274f51fe0'

{synapse-2.203.0 → synapse-2.204.1}/synapse/models/person.py

@@ -446,8 +446,11 @@ class PsModule(s_module.CoreModule):
                         'doc': 'The fax number for this contact.',
                     }),
                     ('phone:work', ('tel:phone', {}), {
-                        'doc': 'The work phone number for this contact.',
-                    }),
+                        'doc': 'The work phone number for this contact.'}),
+
+                    ('id', ('str', {'strip': True}), {
+                        'doc': 'A type or source specific unique ID for the contact.'}),
+
                     ('id:number', ('ou:id:number', {}), {
                         'alts': ('id:numbers',),
                         'doc': 'An ID number issued by an org and associated with this contact.',

{synapse-2.203.0 → synapse-2.204.1}/synapse/tests/test_lib_grammar.py

@@ -748,6 +748,10 @@ Queries = [
     '[test:str=foo :bar?--={[it:dev:str=foo]}]',
     '$foo=(notime,)',
     '$foo=(nulltime,)',
+    '$foo=(not$x)',
+    '$foo=(not $x)',
+    '$foo=(not($x))',
+    '$foo=(not ($x))',
 ]
 
 # Generated with print_parse_list below
@@ -1398,6 +1402,10 @@ _ParseResults = [
     'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditPropSetMulti: [RelProp: [Const: bar], Const: ?--=, SubQuery: [Query: [EditNodeAdd: [FormName: [Const: it:dev:str], Const: =, Const: foo]]]]]',
     'Query: [SetVarOper: [Const: foo, List: [Const: notime]]]',
     'Query: [SetVarOper: [Const: foo, List: [Const: nulltime]]]',
+    'Query: [SetVarOper: [Const: foo, DollarExpr: [UnaryExprNode: [Const: not, VarValue: [Const: x]]]]]',
+    'Query: [SetVarOper: [Const: foo, DollarExpr: [UnaryExprNode: [Const: not, VarValue: [Const: x]]]]]',
+    'Query: [SetVarOper: [Const: foo, DollarExpr: [UnaryExprNode: [Const: not, DollarExpr: [VarValue: [Const: x]]]]]]',
+    'Query: [SetVarOper: [Const: foo, DollarExpr: [UnaryExprNode: [Const: not, DollarExpr: [VarValue: [Const: x]]]]]]',
 ]
 
 class GrammarTest(s_t_utils.SynTest):
@@ -1710,6 +1718,20 @@ class GrammarTest(s_t_utils.SynTest):
         self.eq((2, 3), info['lines'])
         self.eq((22, 31), info['columns'])
 
+        query = '$x=$lib.guid(foo$bar)'
+        parser = s_parser.Parser(query)
+        with self.raises(s_exc.BadSyntax) as cm:
+            _ = parser.query()
+        errinfo = cm.exception.errinfo
+        self.true(errinfo.get('mesg').startswith("Unexpected token '$' at line 1, column 17"))
+
+        query = '$x=$lib.guid(foo(bar)'
+        parser = s_parser.Parser(query)
+        with self.raises(s_exc.BadSyntax) as cm:
+            _ = parser.query()
+        errinfo = cm.exception.errinfo
+        self.true(errinfo.get('mesg').startswith("Unexpected token '(' at line 1, column 17"))
+
     async def test_quotes(self):
 
         # Test vectors

{synapse-2.203.0 → synapse-2.204.1}/synapse/tests/test_lib_httpapi.py

@@ -1976,3 +1976,46 @@ class HttpApiTest(s_tests.SynTest):
 
                 # No change with the bad data
                 self.eq(cell_sess.info, result.get('info'))
+
+    async def test_http_locked_admin(self):
+        async with self.getTestCore() as core:
+
+            visi = await core.auth.addUser('visi')
+            await visi.setAdmin(True)
+            await visi.setPasswd('secret123')
+
+            host, port = await core.addHttpsPort(0, host='127.0.0.1')
+            root = f'https://localhost:{port}'
+
+            async with self.getHttpSess() as sess:
+                resp = await sess.post(f'{root}/api/v1/login', json={'user': 'visi', 'passwd': 'secret123'})
+                self.eq(resp.status, 200)
+
+                resp = await sess.get(f'{root}/api/v1/auth/users')
+                self.eq(resp.status, 200)
+
+                data = {'query': '[ inet:ipv4=1.2.3.4 ]', 'opts': {'user': visi.iden}}
+                async with sess.get(f'{root}/api/v1/storm/call', json=data) as resp:
+                    item = await resp.json()
+                    self.eq('ok', item.get('status'))
+
+                with self.getAsyncLoggerStream('synapse.lib.cell',
+                                               'Invalidated HTTP session for locked user visi') as stream:
+                    await core.setUserLocked(visi.iden, True)
+                    self.true(await stream.wait(timeout=2))
+
+                resp = await sess.get(f'{root}/api/v1/auth/users')
+                self.eq(resp.status, 401)
+
+                data = {'query': '[ inet:ipv4=5.6.7.8 ]', 'opts': {'user': visi.iden}}
+                async with sess.get(f'{root}/api/v1/storm/call', json=data) as resp:
+                    item = await resp.json()
+                    self.eq('err', item.get('status'))
+                    self.eq('NotAuthenticated', item.get('code'))
+
+                resp = await sess.post(f'{root}/api/v1/login', json={'user': 'visi', 'passwd': 'secret123'})
+                self.eq(resp.status, 200)
+                retn = await resp.json()
+                self.eq(retn.get('status'), 'err')
+                self.eq(retn.get('code'), 'AuthDeny')
+                self.isin('User is locked.', retn.get('mesg'))

{synapse-2.203.0 → synapse-2.204.1}/synapse/tests/test_lib_storm.py

@@ -3657,9 +3657,9 @@ class StormTest(s_t_utils.SynTest):
             orig = s_storm.ParallelCmd.pipeline
             tsks = {'cnt': 0}
 
-            async def pipecnt(self, runt, query, inq, outq):
+            async def pipecnt(self, runt, query, inq, outq, runtprims):
                 tsks['cnt'] += 1
-                await orig(self, runt, query, inq, outq)
+                await orig(self, runt, query, inq, outq, runtprims)
 
             with mock.patch('synapse.lib.storm.ParallelCmd.pipeline', pipecnt):
 
@@ -3689,6 +3689,42 @@ class StormTest(s_t_utils.SynTest):
                 self.len(4, nodes)
                 self.eq(4, tsks['cnt'])
 
+            self.len(20, await core.nodes('for $i in $lib.range(20) {[ test:str=$i ]}'))
+            q = '''
+            test:str
+            parallel --size 4 {
+                if (not $lib.vars.get(vals)) {
+                    $vals = ()
+                }
+                $vals.append($node.repr())
+                fini { $lib.fire(resu, vals=$vals) }
+            }
+            | spin
+            '''
+            vals = []
+            msgs = await core.stormlist(q)
+            for m in msgs:
+                if m[0] == 'storm:fire':
+                    vals.extend(m[1]['data']['vals'])
+
+            self.len(20, vals)
+
+            q = '''
+            $vals = ()
+            test:str
+            parallel --size 4 { $vals.append($node.repr()) }
+            fini { return($vals) }
+            '''
+            self.len(20, await core.callStorm(q))
+
+            q = '''
+            function test(n) { $lib.fire(foo, valu=$n.repr()) return() }
+            test:str
+            parallel --size 4 { $test($node) }
+            '''
+            msgs = await core.stormlist(q)
+            self.len(20, [m for m in msgs if m[0] == 'storm:fire' and m[1]['type'] == 'foo'])
+
     async def test_storm_yieldvalu(self):
 
         async with self.getTestCore() as core:

{synapse-2.203.0 → synapse-2.204.1}/synapse/tests/test_lib_urlhelp.py

@@ -90,9 +90,16 @@ class UrlTest(s_t_utils.SynTest):
             ('rando:this:is:valid:URI', None),
             ('rando:this:is@valid:URI', None),
             ('foo://user:password@host.com', 'foo://user:****@host.com'),
+            ('foo://user:password@[::1]:1234', 'foo://user:****@[::1]:1234'),
+            ('foo://user:password@::1/test', 'foo://user:****@::1/test'),
             ('foo://user:password@host.com:999', 'foo://user:****@host.com:999'),
             ('foo://user:@host.com', None),
             ('ssl://feeds00.v.link:43/*/feed/6a1f?cere=root@.vex.link', None),
+            ('ssl://user@00.aha.dev.synapse:27492?certname=user@dev.synapse', None),
+            ('ssl://user@00.aha.dev.synapse:27492/path?certname=user@dev.synapse', None),
+            ('aha://user:passwd@something.cool:274/path?arg=wow', 'aha://user:****@something.cool:274/path?arg=wow'),
+            ('aha://user:passwd@something.cool:274/path?arg=wow&wee=diggity',
+             'aha://user:****@something.cool:274/path?arg=wow&wee=diggity'),
         ]
 
         for in_, out in data:

{synapse-2.203.0 → synapse-2.204.1}/synapse/tests/test_model_person.py

@@ -154,6 +154,7 @@ class PsModelTest(s_t_utils.SynTest):
             }
             opts = {'vars': {'valu': con0, 'p': props}}
             q = '''[(ps:contact=$valu
+                    :id=" 9999Aa"
                     :bio="I am ironman."
                     :org=$p.org :asof=$p.asof :person=$p.person
                     :place=$p.place :place:name=$p."place:name" :name=$p.name
@@ -183,6 +184,7 @@ class PsModelTest(s_t_utils.SynTest):
             self.eq(node.get('place'), place)
             self.eq(node.get('place:name'), 'the shire')
             self.eq(node.get('name'), 'tony stark')
+            self.eq(node.get('id'), '9999Aa')
             self.eq(node.get('bio'), 'I am ironman.')
             self.eq(node.get('title'), 'ceo')
             self.eq(node.get('titles'), ('haha', 'hehe'))

{synapse-2.203.0 → synapse-2.204.1/synapse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: synapse
-Version: 2.203.0
+Version: 2.204.1
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License: Apache License 2.0
@@ -64,6 +64,7 @@ Requires-Dist: sphinx<9.0.0,>=8.0.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme<4.0.0,>=3.0.0; extra == "docs"
 Requires-Dist: sphinx-notfound-page<2.0.0,>=1.0.4; extra == "docs"
 Requires-Dist: jinja2<4.0.0,>=3.1.4; extra == "docs"
+Dynamic: license-file
 
 Synapse
 =======