synapse 2.210.0__tar.gz → 2.212.0__tar.gz

{synapse-2.210.0/synapse.egg-info → synapse-2.212.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse
-Version: 2.210.0
+Version: 2.212.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License-Expression: Apache-2.0

{synapse-2.210.0 → synapse-2.212.0}/pyproject.toml

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

{synapse-2.210.0 → synapse-2.212.0}/synapse/lib/base.py

@@ -1,5 +1,6 @@
 import gc
 import os
+import sys
 import atexit
 import signal
 import asyncio
@@ -82,7 +83,7 @@ class Base:
     '''
     def __init__(self):
         self.anitted = False
-        assert inspect.stack()[1].function == 'anit', 'Objects from Base must be constructed solely via "anit"'
+        assert sys._getframe(1).f_code.co_name == 'anit', 'Objects from Base must be constructed solely via "anit"'
 
     @classmethod
     async def anit(cls, *args, **kwargs):
@@ -129,7 +130,6 @@ class Base:
         self.isfini = False
         self.anitted = True  # For assertion purposes
         self.finievt = asyncio.Event()
-        self.entered = False
 
         # hold a weak ref to other bases we should fini if they
         # are still around when we go down...
@@ -205,7 +205,6 @@ class Base:
 
     async def __aenter__(self):
         assert asyncio.get_running_loop() == self.loop
-        self.entered = True
         return self
 
     async def __aexit__(self, exc, cls, tb):

{synapse-2.210.0 → synapse-2.212.0}/synapse/lib/node.py

@@ -181,7 +181,7 @@ class Node:
 
             if prop.modl.form(prop.type.name) is not None:
                 buid = s_common.buid((prop.type.name, valu))
-            elif prop.type.name == 'ndef':
+            elif prop.type.name == 'ndef' or 'ndef' in prop.type.info.get('bases'):
                 buid = s_common.buid(valu)
             else:
                 return None
@@ -207,8 +207,13 @@ class Node:
 
             embdnode = retn.get(nodepath)
             if embdnode is None:
-                embdnode = retn[nodepath] = {}
-                embdnode['*'] = s_common.ehex(node.buid)
+                iden = node.iden()
+                # TODO deprecate / remove use of * once we can minver optic
+                embdnode = retn[nodepath] = {
+                    '*': iden,
+                    '$iden': iden,
+                    '$form': node.form.name,
+                }
 
             for relp in relprops:
                 embdnode[relp] = node.props.get(relp)

{synapse-2.210.0 → synapse-2.212.0}/synapse/lib/schemas.py

@@ -668,9 +668,18 @@ _reqValidPkgdefSchema = {
             'pattern': s_version.semverstr,
         },
         'build': {
-            'type' 'object'
+            'type': 'object',
             'properties': {
                 'time': {'type': 'number'},
+                'synapse:version': {
+                    'type': 'string',
+                    'pattern': s_version.semverstr
+                },
+                'synapse:commit': {
+                    'type': 'string',
+                    # Note: This pattern allows empty string for dev environments
+                    'pattern': '^[0-9a-fA-F]*$'
+                },
             },
             'required': ['time'],
         },

{synapse-2.210.0 → synapse-2.212.0}/synapse/lib/share.py

@@ -16,9 +16,6 @@ class Share(s_base.Base):
 
         self.iden = s_common.guid()
 
-        self.exited = False
-        self.entered = False
-
         sess = link.get('sess')
 
         async def fini():

{synapse-2.210.0 → synapse-2.212.0}/synapse/lib/snap.py

@@ -303,6 +303,9 @@ class ProtoNode:
             self.tags[tagnode.valu] = valu
             return tagnode
 
+        elif valu == (None, None):
+            return tagnode
+
         valu = s_time.ival(*valu, *curv)
         self.tags[tagnode.valu] = valu
 
@@ -743,19 +746,25 @@ class Snap(s_base.Base):
 
     async def _joinEmbedStor(self, storage, embeds):
         for nodePath, relProps in embeds.items():
+
             await asyncio.sleep(0)
-            iden = relProps.get('*')
+
+            iden = relProps.get('$iden')
             if not iden:
                 continue
 
             stor = await self.view.getStorNodes(s_common.uhex(iden))
             for relProp in relProps.keys():
+
                 await asyncio.sleep(0)
-                if relProp == '*':
+
+                if relProp[0] in ('*', '$'):
                     continue
 
                 for idx, layrstor in enumerate(stor):
+
                     await asyncio.sleep(0)
+
                     props = layrstor.get('props')
                     if not props:
                         continue

{synapse-2.210.0 → synapse-2.212.0}/synapse/lib/stormlib/json.py

@@ -134,7 +134,7 @@ class JsonLib(s_stormtypes.Lib):
 
     @s_stormtypes.stormfunc(readonly=True)
     async def _jsonSchema(self, schema, use_default=True):
-        schema = await s_stormtypes.toprim(schema)
+        schema = await s_stormtypes.toprim(schema, use_list=True)
         use_default = await s_stormtypes.tobool(use_default)
         # We have to ensure that we have a valid schema for making the object.
         try:

{synapse-2.210.0 → synapse-2.212.0}/synapse/lib/stormtypes.py

@@ -6210,9 +6210,9 @@ class NodeData(Prim):
                       {'name': 'valu', 'type': 'prim', 'desc': 'The data to store.', },
                   ),
                   'returns': {'type': 'null', }}},
-        {'name': 'list', 'desc': 'Get a list of the Node data names on the Node.',
+        {'name': 'list', 'desc': 'Get a list of the Node data on the Node as (name, value) tuples.',
          'type': {'type': 'function', '_funcname': '_listNodeData',
-                  'returns': {'type': 'list', 'desc': 'List of the names of values stored on the node.', }}},
+                  'returns': {'type': 'list', 'desc': 'List of (name, value) tuples stored on the node.', }}},
         {'name': 'load',
          'desc': 'Load the Node data onto the Node so that the Node data is packed and returned by the runtime.',
          'type': {'type': 'function', '_funcname': '_loadNodeData',

{synapse-2.210.0 → synapse-2.212.0}/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, 210, 0)
+version = (2, 212, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = 'e43efa9d9c2257ff05fe47988a323e16896fdf50'
+commit = '68ec8184b0e2469fd1ef30cbeb29f5989c60c768'

{synapse-2.210.0 → synapse-2.212.0}/synapse/models/inet.py

@@ -35,6 +35,10 @@ ipv4max = 2 ** 32 - 1
 
 rfc6598 = ipaddress.IPv4Network('100.64.0.0/10')
 
+# defined from https://x.com/4A4133/status/1887269972545839559
+ja4_regex = r'^([tqd])([sd\d]\d)([di])(\d{2})(\d{2})([a-zA-Z0-9]{2})_([0-9a-f]{12})_([0-9a-f]{12})$'
+ja4s_regex = r'^([tq])([sd\d]\d)(\d{2})([a-zA-Z0-9]{2})_([0-9a-f]{4})_([0-9a-f]{12})$'
+
 def getAddrType(ip):
 
     if ip.is_multicast:
@@ -1535,6 +1539,11 @@ class InetModule(s_module.CoreModule):
                     ('inet:service:platform', ('guid', {}), {
                         'doc': 'A network platform which provides services.'}),
 
+                    ('inet:service:app', ('guid', {}), {
+                        'interfaces': ('inet:service:object',),
+                        'template': {'service:base': 'application'},
+                        'doc': 'A platform specific application.'}),
+
                     ('inet:service:instance', ('guid', {}), {
                         'doc': 'An instance of the platform such as Slack or Discord instances.'}),
 
@@ -1626,6 +1635,10 @@ class InetModule(s_module.CoreModule):
                         'template': {'service:base': 'emote'},
                         'doc': 'An emote or reaction by an account.'}),
 
+                    ('inet:service:access:action:taxonomy', ('taxonomy', {}), {
+                        'interfaces': ('meta:taxonomy',),
+                        'doc': 'A hierarchical taxonomy of service actions.'}),
+
                     ('inet:service:access', ('guid', {}), {
                         'interfaces': ('inet:service:action',),
                         'doc': 'Represents a user access request to a service resource.'}),
@@ -1669,6 +1682,18 @@ class InetModule(s_module.CoreModule):
                     ('inet:tls:handshake', ('guid', {}), {
                         'doc': 'An instance of a TLS handshake between a server and client.'}),
 
+                    ('inet:tls:ja4', ('str', {'strip': True, 'regex': ja4_regex}), {
+                        'doc': 'A JA4 TLS client fingerprint.'}),
+
+                    ('inet:tls:ja4s', ('str', {'strip': True, 'regex': ja4s_regex}), {
+                        'doc': 'A JA4S TLS server fingerprint.'}),
+
+                    ('inet:tls:ja4:sample', ('comp', {'fields': (('client', 'inet:client'), ('ja4', 'inet:tls:ja4'))}), {
+                        'doc': 'A JA4 TLS client fingerprint used by a client.'}),
+
+                    ('inet:tls:ja4s:sample', ('comp', {'fields': (('server', 'inet:server'), ('ja4s', 'inet:tls:ja4s'))}), {
+                        'doc': 'A JA4S TLS server fingerprint used by a server.'}),
+
                     ('inet:tls:ja3s:sample', ('comp', {'fields': (('server', 'inet:server'), ('ja3s', 'hash:md5'))}), {
                         'doc': 'A JA3 sample taken from a server.'}),
 
@@ -1774,6 +1799,9 @@ class InetModule(s_module.CoreModule):
                         'interfaces': ('inet:service:base',),
                         'props': (
 
+                            ('app', ('inet:service:app', {}), {
+                                'doc': 'The app which handled the action.'}),
+
                             ('time', ('time', {}), {
                                 'doc': 'The time that the account initiated the action.'}),
 
@@ -1807,6 +1835,9 @@ class InetModule(s_module.CoreModule):
                             ('client:host', ('it:host', {}), {
                                 'doc': 'The client host which initiated the action.'}),
 
+                            ('client:app', ('inet:service:app', {}), {
+                                'doc': 'The client service app which initiated the action.'}),
+
                             ('server', ('inet:server', {}), {
                                 'doc': 'The network address of the server which handled the action.'}),
 
@@ -3550,23 +3581,70 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The server that was sampled to compute the JARM hash.'}),
                     )),
 
+                    ('inet:tls:ja4', {}, ()),
+                    ('inet:tls:ja4s', {}, ()),
+
+                    ('inet:tls:ja4:sample', {}, (
+
+                        ('ja4', ('inet:tls:ja4', {}), {
+                            'ro': True,
+                            'doc': 'The JA4 TLS client fingerprint.'}),
+
+                        ('client', ('inet:client', {}), {
+                            'ro': True,
+                            'doc': 'The client which initiated the TLS handshake with a JA4 fingerprint.'}),
+                    )),
+
+                    ('inet:tls:ja4s:sample', {}, (
+
+                        ('ja4s', ('inet:tls:ja4s', {}), {
+                            'ro': True,
+                            'doc': 'The JA4S TLS server fingerprint.'}),
+
+                        ('server', ('inet:server', {}), {
+                            'ro': True,
+                            'doc': 'The server which responded to the TLS handshake with a JA4S fingerprint.'}),
+                    )),
+
                     ('inet:tls:handshake', {}, (
+
                         ('time', ('time', {}), {
                             'doc': 'The time the handshake was initiated.'}),
+
                         ('flow', ('inet:flow', {}), {
                             'doc': 'The raw inet:flow associated with the handshake.'}),
+
                         ('server', ('inet:server', {}), {
                             'doc': 'The TLS server during the handshake.'}),
+
                         ('server:cert', ('crypto:x509:cert', {}), {
                             'doc': 'The x509 certificate sent by the server during the handshake.'}),
-                        ('server:fingerprint:ja3', ('hash:md5', {}), {
-                            'doc': 'The JA3S finger of the server.'}),
+
+                        ('server:ja3s', ('hash:md5', {}), {
+                            'doc': 'The JA3S fingerprint of the server response.'}),
+
+                        ('server:ja4s', ('inet:tls:ja4s', {}), {
+                            'doc': 'The JA4S fingerprint of the server response.'}),
+
                         ('client', ('inet:client', {}), {
                             'doc': 'The TLS client during the handshake.'}),
+
                         ('client:cert', ('crypto:x509:cert', {}), {
                             'doc': 'The x509 certificate sent by the client during the handshake.'}),
+
+                        ('client:ja3', ('hash:md5', {}), {
+                            'doc': 'The JA3 fingerprint of the client request.'}),
+
+                        ('client:ja4', ('inet:tls:ja4', {}), {
+                            'doc': 'The JA4 fingerprint of the client request.'}),
+
                         ('client:fingerprint:ja3', ('hash:md5', {}), {
-                            'doc': 'The JA3 fingerprint of the client.'}),
+                            'deprecated': True,
+                            'doc': 'Deprecated. Please use :client:ja3.'}),
+
+                        ('server:fingerprint:ja3', ('hash:md5', {}), {
+                            'deprecated': True,
+                            'doc': 'Deprecated. Please use :server:ja3s.'}),
                     )),
 
                     ('inet:tls:ja3s:sample', {}, (
@@ -3608,12 +3686,22 @@ class InetModule(s_module.CoreModule):
 
                         ('url', ('inet:url', {}), {
                             'ex': 'https://twitter.com',
+                            'alts': ('urls',),
                             'doc': 'The primary URL of the platform.'}),
 
+                        ('urls', ('array', {'type': 'inet:url', 'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of alternate URLs for the platform.'}),
+
                         ('name', ('str', {'onespace': True, 'lower': True}), {
                             'ex': 'twitter',
+                            'alts': ('names',),
                             'doc': 'A friendly name for the platform.'}),
 
+                        ('names', ('array', {'type': 'str',
+                                             'typeopts': {'onespace': True, 'lower': True},
+                                             'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of alternate names for the platform.'}),
+
                         ('desc', ('str', {}), {
                             'disp': {'hint': 'text'},
                             'doc': 'A description of the service platform.'}),
@@ -3662,6 +3750,22 @@ class InetModule(s_module.CoreModule):
                             'doc': 'The tenant which contains the instance.'}),
                     )),
 
+                    ('inet:service:app', {}, (
+
+                        ('name', ('str', {'lower': True, 'onespace': True}), {
+                            'alts': ('names',),
+                            'doc': 'The name of the platform specific application.'}),
+
+                        ('names', ('array', {'type': 'str',
+                                             'typeopts': {'onespace': True, 'lower': True},
+                                             'sorted': True, 'uniq': True}), {
+                            'doc': 'An array of alternate names for the application.'}),
+
+                        ('desc', ('str', {}), {
+                            'disp': {'hint': 'text'},
+                            'doc': 'A description of the platform specific application.'}),
+                    )),
+
                     ('inet:service:account', {}, (
 
                         ('user', ('inet:user', {}), {
@@ -3937,6 +4041,9 @@ class InetModule(s_module.CoreModule):
 
                     ('inet:service:access', {}, (
 
+                        ('action', ('inet:service:access:action:taxonomy', {}), {
+                            'doc': 'The platform specific action which this access records.'}),
+
                         ('resource', ('inet:service:resource', {}), {
                             'doc': 'The resource which the account attempted to access.'}),
 

{synapse-2.210.0 → synapse-2.212.0}/synapse/models/orgs.py

@@ -1241,7 +1241,6 @@ class OuModule(s_module.CoreModule):
                  )),
                 ('ou:conference:event', {}, (
                     ('conference', ('ou:conference', {}), {
-                        'ro': True,
                         'doc': 'The conference to which the event is associated.',
                     }),
                     ('organizer', ('ps:contact', {}), {

{synapse-2.210.0 → synapse-2.212.0}/synapse/tests/test_lib_base.py

@@ -86,6 +86,11 @@ class BaseTest(s_t_utils.SynTest):
             await Hehe.anit(-1)
         self.eq(cm.exception.get('mesg'), 'boom')
 
+        if __debug__:
+            with self.raises(AssertionError) as cm:
+                Hehe()
+            self.eq(str(cm.exception), 'Objects from Base must be constructed solely via "anit"')
+
     async def test_coro_fini(self):
 
         event = asyncio.Event()

{synapse-2.210.0 → synapse-2.212.0}/synapse/tests/test_lib_config.py

@@ -164,8 +164,8 @@ class ConfTest(s_test.SynTest):
         # We can ensure that certain vars are loaded
         self.eq('Funky string time!', conf.req('key:string'))
         # And throw if they are not, or if the requested key isn't even schema valid
-        self.raises(s_exc.NeedConfValu, conf.reqConfValu, 'key:bool:nodefval')
-        self.raises(s_exc.BadArg, conf.reqConfValu, 'key:newp')
+        self.raises(s_exc.NeedConfValu, conf.req, 'key:bool:nodefval')
+        self.raises(s_exc.BadArg, conf.req, 'key:newp')
 
         # Since we're an Mutable mapping, we have some dict methods available to us
         self.len(8, conf)  # __len__
@@ -380,6 +380,12 @@ class ConfTest(s_test.SynTest):
         self.eq(item['key:number'], 123)
         self.notin('key:string', item)
 
+        item = validator({'key:multi': 123})
+        self.eq(item['key:multi'], 123)
+
+        item = validator({'key:multi': '123'})
+        self.eq(item['key:multi'], '123')
+
     async def test_config_ref_handler(self):
 
         filename = pathlib.Path(s_data.path(

{synapse-2.210.0 → synapse-2.212.0}/synapse/tests/test_lib_layer.py

@@ -1399,8 +1399,8 @@ class LayerTest(s_t_utils.SynTest):
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('inet:ipv4', 0x01020304))
             self.eq(nodes[0].get('asn'), 33)
-            self.true(nodes[0].getTag('foo.bar'), (None, None))
-            self.true(nodes[0].getTagProp('foo.bar', 'confidence'), 22)
+            self.eq(nodes[0].getTag('foo.bar'), (None, None))
+            self.eq(nodes[0].getTagProp('foo.bar', 'confidence'), 100)
 
             self.eq(10004, await core.count('.created'))
             self.len(2, await core.nodes('syn:tag~=foo'))

{synapse-2.210.0 → synapse-2.212.0}/synapse/tests/test_lib_storm.py

@@ -2251,16 +2251,18 @@ class StormTest(s_t_utils.SynTest):
             nodes = [m[1] for m in msgs if m[0] == 'node']
 
             node = nodes[0]
+            self.eq('inet:asn', node[1]['embeds']['asn']['$form'])
             self.eq('hehe', node[1]['embeds']['asn']['name'])
-            self.eq('796d67b92a6ffe9b88fa19d115b46ab6712d673a06ae602d41de84b1464782f2', node[1]['embeds']['asn']['*'])
+            self.eq('796d67b92a6ffe9b88fa19d115b46ab6712d673a06ae602d41de84b1464782f2', node[1]['embeds']['asn']['$iden'])
 
             opts = {'embeds': {'ou:org': {'hq::email': ('user',)}}}
             msgs = await core.stormlist('[ ou:org=* :country=* :hq=* ] { -> ps:contact [ :email=visi@vertex.link ] }', opts=opts)
             nodes = [m[1] for m in msgs if m[0] == 'node']
             node = nodes[0]
 
+            self.eq('inet:email', node[1]['embeds']['hq::email']['$form'])
             self.eq('visi', node[1]['embeds']['hq::email']['user'])
-            self.eq('2346d7bed4b0fae05e00a413bbf8716c9e08857eb71a1ecf303b8972823f2899', node[1]['embeds']['hq::email']['*'])
+            self.eq('2346d7bed4b0fae05e00a413bbf8716c9e08857eb71a1ecf303b8972823f2899', node[1]['embeds']['hq::email']['$iden'])
 
             fork = await core.callStorm('return($lib.view.get().fork().iden)')
 
@@ -2373,10 +2375,17 @@ class StormTest(s_t_utils.SynTest):
             self.eq(['inet:service:rule', 'risk:vulnerable'], [n[0][0] for n in nodes])
 
             embeds = nodes[0][1]['embeds']
+
+            self.nn(embeds['object']['$iden'])
+            self.eq('risk:vulnerable', embeds['object']['$form'])
             self.eq(1, embeds['object']['mitigated'])
             self.eq(None, embeds['object']['newp'])
+
+            self.nn(embeds['object::node']['$iden'])
+            self.eq('it:prod:hardware', embeds['object::node']['$form'])
             self.eq('foohw', embeds['object::node']['name'])
             self.eq(None, embeds['object::node']['newp'])
+            self.eq('inet:service:account', embeds['grantee']['$form'])
             self.eq('foocon', embeds['grantee']['id'])
             self.eq(None, embeds['grantee']['newp'])
 
@@ -2384,6 +2393,26 @@ class StormTest(s_t_utils.SynTest):
             self.eq('barvuln', embeds['vuln']['name'])
             self.eq('foohw', embeds['node']['name'])
 
+            # embed through `econ:pay:instrument` type that extends from `ndef`
+            await core.nodes('''
+                [ econ:acct:payment=* :from:instrument={ [ econ:pay:card=(testcard,) :name=infime ] } ]
+            ''')
+
+            opts = {
+                'embeds': {
+                    'econ:acct:payment': {
+                        'from:instrument': ['name'],
+                    }
+                }
+            }
+            msgs = await core.stormlist('econ:acct:payment', opts=opts)
+            node = [m[1] for m in msgs if m[0] == 'node'][0]
+            self.eq('econ:acct:payment', node[0][0])
+
+            embeds = node[1]['embeds']
+            self.eq('86caf7a47348d56b2f6bec3e767a9fc7eaaaf5a80d7bbaa235fab763c7dcc560', embeds['from:instrument']['*'])
+            self.eq('infime', embeds['from:instrument']['name'])
+
     async def test_storm_wget(self):
 
         async def _getRespFromSha(core, mesgs):

{synapse-2.210.0 → synapse-2.212.0}/synapse/tests/test_lib_stormhttp.py

@@ -642,9 +642,9 @@ class StormHttpTest(s_test.SynTest):
             self.isin('connect to proxy 127.0.0.1:1', resp['mesg'])
 
             q = '$resp=$lib.inet.http.get("http://vertex.link") return(($resp.code, $resp.err))'
-            code, (errname, _) = await core.callStorm(q)
+            code, (errname, errinfo) = await core.callStorm(q)
             self.eq(code, -1)
-            self.eq('ProxyConnectionError', errname)
+            self.isin("connect to proxy 127.0.0.1:1", errinfo.get('mesg'))
 
             msgs = await core.stormlist('$resp=$lib.inet.http.get("http://vertex.link", proxy=(null)) $lib.print($resp.err)')
             self.stormIsInWarn('HTTP proxy argument to $lib.null is deprecated', msgs)
@@ -669,7 +669,7 @@ class StormHttpTest(s_test.SynTest):
             self.stormIsInErr(errmsg.format(perm='storm.lib.inet.http.proxy'), msgs)
 
             resp = await core.callStorm('return($lib.inet.http.get(http://vertex.link, proxy=socks5://user:pass@127.0.0.1:1))')
-            self.eq('ProxyConnectionError', resp['err'][0])
+            self.isin("connect to proxy 127.0.0.1:1", resp['err'][1].get('mesg'))
 
             # test $lib.axon proxy API
             asvisi = {'user': visi.iden}
@@ -748,13 +748,13 @@ class StormHttpTest(s_test.SynTest):
             opts = {'vars': {'proxy': 'socks5://user:pass@127.0.0.1:1'}, 'user': visi.iden}
 
             resp = await core.callStorm(q1, opts=opts)
-            self.eq('ProxyConnectionError', resp['err'][0])
+            self.isin("connect to proxy 127.0.0.1:1", resp['err'][1].get('mesg'))
 
             resp = await core.callStorm(q2, opts=opts)
-            self.eq('ProxyConnectionError', resp['err'][0])
+            self.isin("connect to proxy 127.0.0.1:1", resp['err'][1].get('mesg'))
 
             resp = await core.callStorm(q3, opts=opts)
-            self.eq('ProxyConnectionError', resp['err'][0])
+            self.isin("connect to proxy 127.0.0.1:1", resp['err'][1].get('mesg'))
 
             opts = {'vars': {'proxy': False}, 'user': visi.iden}
 

{synapse-2.210.0 → synapse-2.212.0}/synapse/tests/test_lib_stormlib_json.py

@@ -46,11 +46,13 @@ class JsonTest(s_test.SynTest):
             q = '''$schemaObj = $lib.json.schema($schema)
             $item=({})
             $item."key:integer"=(4)
+            $item."key:multi"=(4)
             return ( $schemaObj.validate($item) )
             '''
             isok, valu = await core.callStorm(q, opts=opts)
             self.true(isok)
             self.eq(4, valu.get('key:integer'))
+            self.eq(4, valu.get('key:multi'))
             self.eq('Default string!', valu.get('key:string'))
 
             q = '''$schemaObj = $lib.json.schema($schema)
@@ -68,12 +70,13 @@ class JsonTest(s_test.SynTest):
 
             q = '''
             $schemaObj = $lib.json.schema($schema, use_default=$lib.false)
-            $item = ({"key:integer": 4})
+            $item = ({"key:integer": 4, "key:multi": "4"})
             return($schemaObj.validate($item))
             '''
             isok, valu = await core.callStorm(q, opts={'vars': {'schema': s_test.test_schema}})
             self.true(isok)
             self.eq(4, valu.get('key:integer'))
+            self.eq('4', valu.get('key:multi'))
             self.notin('key:string', valu)
 
             # Print a json schema obj

{synapse-2.210.0 → synapse-2.212.0}/synapse/tests/test_lib_stormtypes.py

@@ -1291,35 +1291,33 @@ class StormTypesTest(s_test.SynTest):
             self.len(1, nodes)
             self.eq('visi@vertex.link', nodes[0].ndef[1])
 
-            nodes = await core.nodes('$s = woot [ test:int=$s.startswith(w) ]')
-            self.eq(1, nodes[0].ndef[1])
+            self.true(await core.callStorm('$s = woot return($s.startswith(w))'))
 
-            nodes = await core.nodes('$s = woot [ test:int=$s.endswith(visi) ]')
-            self.eq(0, nodes[0].ndef[1])
+            self.false(await core.callStorm('$s = woot return($s.endswith(visi))'))
 
-            nodes = await core.nodes('$s = woot [ test:str=$s.rjust(10) ]')
-            self.eq('      woot', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = woot return($s.rjust(10))')
+            self.eq('      woot', valu)
 
-            nodes = await core.nodes('$s = woot [ test:str=$s.rjust(10, x) ]')
-            self.eq('xxxxxxwoot', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = woot return($s.rjust(10, x))')
+            self.eq('xxxxxxwoot', valu)
 
-            nodes = await core.nodes('$s = woot [ test:str=$s.ljust(10) ]')
-            self.eq('woot      ', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = woot return($s.ljust(10))')
+            self.eq('woot      ', valu)
 
-            nodes = await core.nodes('$s = woot [ test:str=$s.ljust(10, x) ]')
-            self.eq('wootxxxxxx', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = woot return($s.ljust(10, x))')
+            self.eq('wootxxxxxx', valu)
 
             sobj = s_stormtypes.Str('beepbeep')
             self.len(8, sobj)
 
-            nodes = await core.nodes("$s = (foo, bar, baz) [ test:str=('.').join($s) ]")
-            self.eq('foo.bar.baz', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = (foo, bar, baz) return((".").join($s))')
+            self.eq('foo.bar.baz', valu)
 
-            nodes = await core.nodes('$s = foo-bar-baz [ test:str=$s.replace("-", ".") ]')
-            self.eq('foo.bar.baz', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = foo-bar-baz return($s.replace("-", "."))')
+            self.eq('foo.bar.baz', valu)
 
-            nodes = await core.nodes('$s = foo-bar-baz [ test:str=$s.replace("-", ".", 1) ]')
-            self.eq('foo.bar-baz', nodes[0].ndef[1])
+            valu = await core.callStorm('$s = foo-bar-baz return($s.replace("-", ".", 1))')
+            self.eq('foo.bar-baz', valu)
 
             q = '$foo=" foo " return ( $foo.strip() )'
             self.eq('foo', await core.callStorm(q))