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

synapse/tests/test_lib_stormlib_aha.py

@@ -10,7 +10,7 @@ class AhaLibTest(s_test.SynTest):
 
     async def test_stormlib_aha_basics(self):
 
-        async with self.getTestAhaProv() as aha:
+        async with self.getTestAha() as aha:
 
             with self.getTestDir() as dirn:
 
@@ -36,24 +36,24 @@ class AhaLibTest(s_test.SynTest):
                 self.len(5, svcs)
 
                 svc = await core00.callStorm('return( $lib.aha.get(core...) )')
-                self.eq('core.loop.vertex.link', svc.get('name'))
-                svc = await core00.callStorm('return( $lib.aha.get(core.loop.vertex.link))')
-                self.eq('core.loop.vertex.link', svc.get('name'))
+                self.eq('core.synapse', svc.get('name'))
+                svc = await core00.callStorm('return( $lib.aha.get(core.synapse))')
+                self.eq('core.synapse', svc.get('name'))
                 svc = await core00.callStorm('return( $lib.aha.get(00.cell...))')
-                self.eq('00.cell.loop.vertex.link', svc.get('name'))
+                self.eq('00.cell.synapse', svc.get('name'))
                 svc = await core00.callStorm('return( $lib.aha.get(cell...))')
-                self.eq('cell.loop.vertex.link', svc.get('name'))
+                self.eq('cell.synapse', svc.get('name'))
                 svc = await core00.callStorm('$f=({"mirror": (true)}) return( $lib.aha.get(cell..., filters=$f))')
-                self.eq('01.cell.loop.vertex.link', svc.get('name'))
+                self.eq('01.cell.synapse', svc.get('name'))
 
                 # List the aha services available
                 msgs = await core00.stormlist('aha.svc.list --nexus')
                 self.stormIsInPrint('Nexus', msgs)
-                self.stormIsInPrint('00.cell.loop.vertex.link                      true   true   true', msgs)
-                self.stormIsInPrint('01.cell.loop.vertex.link                      false  true   true', msgs)
-                self.stormIsInPrint('cell.loop.vertex.link                         true   true   true', msgs)
-                self.stormIsInPrint('core.loop.vertex.link                         null   true   true', msgs)
-                self.stormIsInPrint('mysvc.loop.vertex.link                        null   true   true', msgs)
+                self.stormIsInPrint('00.cell.synapse                      true   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('01.cell.synapse                      false  true   true', msgs, whitespace=False)
+                self.stormIsInPrint('cell.synapse                         true   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('core.synapse                         null   true   true', msgs, whitespace=False)
+                self.stormIsInPrint('mysvc.synapse                        null   true   true', msgs, whitespace=False)
 
                 msgs = await core00.stormlist('aha.svc.list')
                 self.stormNotInPrint('Nexus', msgs)
@@ -63,24 +63,24 @@ class AhaLibTest(s_test.SynTest):
                 # Omit checking part of that.
                 emsg = '''Resolved cell... to an AHA Service.
 
-Name:       cell.loop.vertex.link
+Name:       cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
 Cell iden:  ********************************
 Leader:     cell
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
-                self.stormIsInPrint('    hostname:   00.cell.loop.vertex.link', msgs)
+                self.stormIsInPrint('    hostname:   00.cell.synapse', msgs)
                 self.stormIsInPrint('    scheme:     ssl', msgs)
                 self.stormIsInPrint('    user:       root', msgs)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus cell...')
                 emsg = '''Resolved cell... to an AHA Service.
 
-Name:       cell.loop.vertex.link
+Name:       cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
@@ -88,14 +88,14 @@ Cell iden:  ********************************
 Leader:     cell
 Nexus:      1
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus 01.cell...')
                 emsg = '''Resolved 01.cell... to an AHA Service.
 
-Name:       01.cell.loop.vertex.link
+Name:       01.cell.synapse
 Online:     true
 Ready:      true
 Run iden:   ********************************
@@ -103,15 +103,15 @@ Cell iden:  ********************************
 Leader:     cell
 Nexus:      1
 Connection information:
-    ca:         loop.vertex.link
+    ca:         synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
                 # Full name works
-                msgs = await core00.stormlist('aha.svc.stat 01.cell.loop.vertex.link')
-                emsg = '''Resolved 01.cell.loop.vertex.link to an AHA Service.
+                msgs = await core00.stormlist('aha.svc.stat 01.cell.synapse')
+                emsg = '''Resolved 01.cell.synapse to an AHA Service.
 
-Name:       01.cell.loop.vertex.link
+Name:       01.cell.synapse
 '''
                 self.stormIsInPrint(emsg, msgs, deguid=True)
 
@@ -128,8 +128,8 @@ Name:       01.cell.loop.vertex.link
                 emsg = '''Resolved pool00... to an AHA Pool.
 
 The pool currently has 1 members.
-AHA Pool:   pool00.loop.vertex.link
-Member:     00.cell.loop.vertex.link'''
+AHA Pool:   pool00.synapse
+Member:     00.cell.synapse'''
                 self.stormIsInPrint(emsg, msgs)
 
                 # Shut down a service
@@ -139,15 +139,15 @@ Member:     00.cell.loop.vertex.link'''
                 self.len(nevents, await waiter.wait(timeout=12))
 
                 msgs = await core00.stormlist('aha.svc.list')
-                self.stormIsInPrint('01.cell.loop.vertex.link                      false  false  false', msgs)
+                self.stormIsInPrint('01.cell.synapse false  false  false', msgs, whitespace=False)
 
                 # Fake a record
                 await aha.addAhaSvc('00.newp', info={'urlinfo': {'scheme': 'tcp', 'host': '0.0.0.0', 'port': '3030'}},
-                                    network='loop.vertex.link')
+                                    network='synapse')
 
                 msgs = await core00.stormlist('aha.svc.list --nexus')
-                emsg = '00.newp.loop.vertex.link                      null   false  null  0.0.0.0         3030  <offline>'
-                self.stormIsInPrint(emsg, msgs)
+                emsg = '00.newp.synapse                      null   false  null  0.0.0.0         3030  <offline>'
+                self.stormIsInPrint(emsg, msgs, whitespace=False)
 
                 self.none(await core00.callStorm('return($lib.aha.del(00.newp...))'))
                 msgs = await core00.stormlist('aha.svc.list')
@@ -160,22 +160,22 @@ Member:     00.cell.loop.vertex.link'''
                                                                  'port': '3030'},
                                                      'online': guid,
                                                      },
-                                    network='loop.vertex.link')
+                                    network='synapse')
                 msgs = await core00.stormlist('aha.svc.list --nexus')
-                emsg = '00.newp.loop.vertex.link                      null   true   null  0.0.0.0         3030  ' \
-                       'Failed to connect to Telepath service: "aha://00.newp.loop.vertex.link/" error:'
-                self.stormIsInPrint(emsg, msgs)
+                emsg = '00.newp.synapse null   true   null  0.0.0.0         3030  ' \
+                       'Failed to connect to Telepath service: "aha://00.newp.synapse/" error:'
+                self.stormIsInPrint(emsg, msgs, whitespace=False)
 
                 msgs = await core00.stormlist('aha.svc.stat --nexus 00.newp...')
                 emsg = '''Resolved 00.newp... to an AHA Service.
 
-Name:       00.newp.loop.vertex.link
+Name:       00.newp.synapse
 Online:     true
 Ready:      null
 Run iden:   $lib.null
 Cell iden:  $lib.null
 Leader:     Service did not register itself with a leader name.
-Nexus:      Failed to connect to Telepath service: "aha://00.newp.loop.vertex.link/" error: [Errno 111] Connect call failed ('0.0.0.0', 3030)
+Nexus:      Failed to connect to Telepath service: "aha://00.newp.synapse/" error: [Errno 111] Connect call failed ('0.0.0.0', 3030)
 Connection information:
     host:       0.0.0.0
     port:       3030
@@ -184,7 +184,7 @@ Connection information:
                 self.stormIsInPrint(emsg, msgs)
 
                 # Delete the fake service with its full service name
-                self.none(await core00.callStorm('return($lib.aha.del(00.newp.loop.vertex.link))'))
+                self.none(await core00.callStorm('return($lib.aha.del(00.newp.synapse))'))
                 self.none(await core00.callStorm('return($lib.aha.get(00.newp...))'))
 
                 # Coverage for sad paths

synapse/tests/test_lib_stormlib_cell.py

@@ -76,18 +76,7 @@ class StormCellTest(s_test.SynTest):
 
     async def test_stormlib_cell_getmirrors(self):
 
-        conf = {
-            'aha:name': 'aha',
-            'aha:network': 'mynet',
-            'provision:listen': 'tcp://127.0.0.1:0',
-        }
-        async with self.getTestCell(s_aha.AhaCell, conf=conf) as aha:
-
-            provaddr, provport = aha.provdmon.addr
-            aha.conf['provision:listen'] = f'tcp://127.0.0.1:{provport}'
-
-            ahahost, ahaport = await aha.dmon.listen('ssl://127.0.0.1:0?hostname=aha.mynet&ca=mynet')
-            aha.conf['aha:urls'] = (f'ssl://127.0.0.1:{ahaport}?hostname=aha.mynet',)
+        async with self.getTestAha() as aha:
 
             provurl = await aha.addAhaSvcProv('00.cortex')
             coreconf = {'aha:provision': provurl}
@@ -116,7 +105,7 @@ class StormCellTest(s_test.SynTest):
                     await core01.nodes('[ inet:ipv4=1.2.3.4 ]')
                     self.len(1, await core00.nodes('inet:ipv4=1.2.3.4'))
 
-                    expurls = ['aha://01.cortex.mynet']
+                    expurls = ['aha://01.cortex.synapse']
 
                     self.eq(expurls, await core00.callStorm('return($lib.cell.getMirrorUrls())'))
                     self.eq(expurls, await core01.callStorm('return($lib.cell.getMirrorUrls())'))
@@ -148,11 +137,11 @@ class StormCellTest(s_test.SynTest):
 
                         await svc01.sync()
 
-                        expurls = ('aha://01.testsvc.mynet',)
+                        expurls = ('aha://01.testsvc.synapse',)
 
                         self.eq(expurls, await core00.callStorm('return($lib.cell.getMirrorUrls(name=testsvc))'))
 
-                    await aha.delAhaSvc('00.testsvc.mynet')
+                    await aha.delAhaSvc('00.testsvc.synapse')
 
                     with self.raises(s_exc.NoSuchName):
                         await core00.callStorm('return($lib.cell.getMirrorUrls(name=testsvc))')

synapse/tests/test_lib_stormlib_imap.py

@@ -1,3 +1,4 @@
+import ssl
 import asyncio
 
 from unittest import mock
@@ -124,8 +125,13 @@ class ImapTest(s_test.SynTest):
 
     async def test_storm_imap(self):
 
-        with mock.patch('aioimaplib.IMAP4.create_client', mock_create_client), \
-            mock.patch('aioimaplib.IMAP4_SSL.create_client', mock_create_client):
+        client_args = []
+        def client_mock(*args, **kwargs):
+            client_args.append((args, kwargs))
+            return mock_create_client(*args, **kwargs)
+
+        with mock.patch('aioimaplib.IMAP4.create_client', client_mock), \
+            mock.patch('aioimaplib.IMAP4_SSL.create_client', client_mock):
 
             async with self.getTestCore() as core:
 
@@ -137,16 +143,20 @@ class ImapTest(s_test.SynTest):
                 '''
                 retn = await core.callStorm(scmd)
                 self.eq((True, ('INBOX',)), retn)
+                ctx = self.nn(client_args[-1][0][5])  # type: ssl.SSLContext
+                self.eq(ctx.verify_mode, ssl.CERT_REQUIRED)
 
                 # search for UIDs
                 scmd = '''
-                    $server = $lib.inet.imap.connect(hello)
+                    $server = $lib.inet.imap.connect(hello, ssl_verify=(false))
                     $server.login("vtx@email.com", "secret")
                     $server.select("INBOX")
                     return($server.search("FROM", "foo@mail.com"))
                 '''
                 retn = await core.callStorm(scmd)
                 self.eq((True, ('8181', '8192', '8194')), retn)
+                ctx = self.nn(client_args[-1][0][5])  # type: ssl.SSLContext
+                self.eq(ctx.verify_mode, ssl.CERT_NONE)
 
                 # search for UIDs with specific charset
                 scmd = '''
@@ -186,6 +196,7 @@ class ImapTest(s_test.SynTest):
                 '''
                 retn = await core.callStorm(scmd)
                 self.eq((True, None), retn)
+                self.none(client_args[-1][0][5])
 
                 # delete
                 scmd = '''

synapse/tests/test_lib_stormlib_modelext.py

@@ -57,12 +57,24 @@ class StormtypesModelextTest(s_test.SynTest):
             model_defs = await core.callStorm('return ( $lib.model.ext.getExtModel() )')
             self.isinstance(model_defs, dict)
 
+            self.len(1, await core.nodes('_visi:int:tick'))
+            await core._delAllFormProp('_visi:int', 'tick', {})
+            self.len(0, await core.nodes('_visi:int:tick'))
+
+            self.len(1, await core.nodes('._woot'))
+            await core._delAllUnivProp('_woot', {})
+            self.len(0, await core.nodes('._woot'))
+
+            self.len(1, await core.nodes('#lol:score'))
+            await core._delAllTagProp('score', {})
+            self.len(0, await core.nodes('#lol:score'))
+
             await core.callStorm('_visi:int=10 test:int=1234 | delnode')
             await core.callStorm('''
-                $lib.model.ext.delTagProp(score)
-                $lib.model.ext.delUnivProp(_woot)
+                $lib.model.ext.delTagProp(score, force=(true))
+                $lib.model.ext.delUnivProp(_woot, force=(true))
                 $lib.model.ext.delFormProp(_visi:int, tick)
-                $lib.model.ext.delFormProp(test:int, _tick)
+                $lib.model.ext.delFormProp(test:int, _tick, force=(true))
                 $lib.model.ext.delForm(_visi:int)
                 $lib.model.ext.delEdge(inet:user, _copies, *)
             ''')
@@ -276,6 +288,46 @@ class StormtypesModelextTest(s_test.SynTest):
 
             self.nn(core.model.edge(('inet:user', '_copies', None)))
 
+        # Property values left behind in layers are cleanly removed
+        async with self.getTestCore() as core:
+            await core.callStorm('''
+                $typeinfo = ({})
+                $docinfo = ({"doc": "NEWP"})
+                $lib.model.ext.addUnivProp(_woot, (int, ({})), $docinfo)
+                $lib.model.ext.addTagProp(score, (int, ({})), $docinfo)
+                $lib.model.ext.addFormProp(test:int, _tick, (time, ({})), $docinfo)
+            ''')
+            fork = await core.callStorm('return ( $lib.view.get().fork().iden ) ')
+            nodes = await core.nodes('[test:int=1234 :_tick=2024 ._woot=1 +#hehe:score=10]')
+            self.len(1, nodes)
+            self.eq(nodes[0].get('._woot'), 1)
+
+            nodes = await core.nodes('test:int=1234 [:_tick=2023 ._woot=2 +#hehe:score=9]',
+                                     opts={'view': fork})
+            self.len(1, nodes)
+            self.eq(nodes[0].get('._woot'), 2)
+
+            self.len(0, await core.nodes('test:int | delnode'))
+
+            with self.raises(s_exc.CantDelUniv):
+                await core.callStorm('$lib.model.ext.delUnivProp(_woot)')
+            with self.raises(s_exc.CantDelProp):
+                await core.callStorm('$lib.model.ext.delFormProp(test:int, _tick)')
+            with self.raises(s_exc.CantDelProp):
+                await core.callStorm('$lib.model.ext.delTagProp(score)')
+
+            await core.callStorm('$lib.model.ext.delUnivProp(_woot, force=(true))')
+            await core.callStorm('$lib.model.ext.delFormProp(test:int, _tick, force=(true))')
+            await core.callStorm('$lib.model.ext.delTagProp(score, force=(true))')
+
+            nodes = await core.nodes('[test:int=1234]')
+            self.len(1, nodes)
+            self.none(nodes[0].get('._woot'))
+            self.none(nodes[0].get('_tick'))
+            nodes = await core.nodes('test:int=1234', opts={'view': fork})
+            self.none(nodes[0].get('._woot'))
+            self.none(nodes[0].get('_tick'))
+
     async def test_lib_stormlib_behold_modelext(self):
         self.skipIfNexusReplay()
         async with self.getTestCore() as core:

synapse/tests/test_lib_stormlib_smtp.py

@@ -1,3 +1,6 @@
+import ssl
+import email.mime.multipart as e_muiltipart
+
 from unittest import mock
 import synapse.tests.utils as s_test
 
@@ -5,7 +8,9 @@ class SmtpTest(s_test.SynTest):
 
     async def test_storm_smtp(self):
 
+        called_args = []
         async def send(*args, **kwargs):
+            called_args.append((args, kwargs))
             return
 
         with mock.patch('aiosmtplib.send', send):
@@ -14,6 +19,9 @@ class SmtpTest(s_test.SynTest):
 
                 retn = await core.callStorm('return($lib.inet.smtp.message().send(127.0.0.1))')
                 self.false(retn[0])
+                self.eq(retn[1].get('err'), 'StormRuntimeError')
+                self.isin('The inet:smtp:message has no HTML or text body.', retn[1].get('errmsg'))
+                self.len(0, called_args)
 
                 retn = await core.callStorm('''
                     $message = $lib.inet.smtp.message()
@@ -31,6 +39,49 @@ class SmtpTest(s_test.SynTest):
                     return($message.send('smtp.gmail.com', port=465, usetls=true))
                 ''')
                 self.eq(retn, (True, {}))
+                mesg = called_args[-1][0][0]  # type: e_muiltipart.MIMEMultipart
+                self.eq(mesg.get_all('subject'), ['woot'])
+                payload = mesg.get_payload()
+                self.len(2, payload)
+                self.eq([pl.get_content_type() for pl in payload],
+                        ['text/plain', 'text/html'])
+                ctx = self.nn(called_args[-1][1].get('tls_context'))  # type: ssl.SSLContext
+                self.eq(ctx.verify_mode, ssl.CERT_REQUIRED)
+                self.eq(called_args[-1][1].get('port'), 465)
+                self.true(called_args[-1][1].get('use_tls'))
+                self.false(called_args[-1][1].get('start_tls'))
+
+                retn = await core.callStorm('''
+                    $message = $lib.inet.smtp.message()
+                    $message.text = "HELLO WORLD"
+                    $message.sender = visi@vertex.link
+                    $message.headers.Subject = woot
+                    $message.recipients.append(visi@vertex.link)
+                    return($message.send('smtp.gmail.com', port=465, starttls=true, ssl_verify=(false)))
+                ''')
+                self.eq(retn, (True, {}))
+                mesg = called_args[-1][0][0]  # type: e_muiltipart.MIMEMultipart
+                payload = mesg.get_payload()
+                self.len(1, payload)
+                self.eq([pl.get_content_type() for pl in payload], ['text/plain'])
+                ctx = self.nn(called_args[-1][1].get('tls_context'))  # type: ssl.SSLContext
+                self.eq(ctx.verify_mode, ssl.CERT_NONE)
+                self.false(called_args[-1][1].get('use_tls'))
+                self.true(called_args[-1][1].get('start_tls'))
+
+                retn = await core.callStorm('''
+                    $message = $lib.inet.smtp.message()
+                    $message.text = "HELLO WORLD"
+                    $message.sender = visi@vertex.link
+                    $message.headers.Subject = woot
+                    $message.recipients.append(visi@vertex.link)
+                    return($message.send('smtp.gmail.com', port=25))
+                ''')
+                self.eq(retn, (True, {}))
+                self.none(called_args[-1][1].get('tls_context'))  # type: ssl.SSLContext
+                self.eq(called_args[-1][1].get('port'), 25)
+                self.false(called_args[-1][1].get('use_tls'))
+                self.false(called_args[-1][1].get('start_tls'))
 
                 isok, info = await core.callStorm('''
                     $message = $lib.inet.smtp.message()

synapse/tests/test_lib_stormlib_stix.py

@@ -410,6 +410,21 @@ class StormLibStixTest(s_test.SynTest):
             self.len(1, [n for n in nodes if n[0][0] == 'it:cmd'])
             self.stormIsInWarn("STIX bundle ingest has no relationship definition for: ('threat-actor', 'gronks', 'threat-actor')", msgs)
 
+            msgs = await core.stormlist('yield $lib.stix.import.ingest(({}), newp)')
+            self.stormIsInErr('config must be a dictionary', msgs)
+
+            msgs = await core.stormlist('yield $lib.stix.import.ingest(({}), ({"relationships": 5}))')
+            self.stormIsInErr('Error processing relationships', msgs)
+
+            msgs = await core.stormlist('yield $lib.stix.import.ingest(({}), ({"bundle": 3}))')
+            self.stormIsInErr('bundle value must be a dictionary', msgs)
+
+            msgs = await core.stormlist('yield $lib.stix.import.ingest(({}), ({"bundle": {"storm": 3}}))')
+            self.stormIsInErr('storm query must be a string', msgs)
+
+            msgs = await core.stormlist('yield $lib.stix.import.ingest(({"objects": 3}), ({}))')
+            self.stormIsInErr('Error processing objects', msgs)
+
     async def test_stix_export_custom(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_stormlib_vault.py

@@ -159,10 +159,13 @@ class StormlibVaultTest(s_test.SynTest):
 
             # Rename vault
             opts = {'vars': {'giden': giden}}
+            self.eq('gvault', await core.callStorm('return($lib.vault.get($giden).name)', opts=opts))
             q = '$lib.vault.get($giden).name = foobar'
             await core.callStorm(q, opts=opts)
             vault = core.getVault(giden)
             self.eq(vault.get('name'), 'foobar')
+            self.nn(await core.callStorm('return($lib.vault.byname(foobar))'))
+            await self.asyncraises(s_exc.NoSuchName, core.callStorm('return($lib.vault.byname(gvault))'))
 
             # Get secrets without EDIT perms
             opts = {'vars': {'giden': giden}, 'user': visi1.iden}
@@ -222,10 +225,17 @@ class StormlibVaultTest(s_test.SynTest):
             q = '$vault = $lib.vault.get($giden) return($vault.setPerm($iden, $lib.auth.easyperm.level.deny))'
             self.true(await core.callStorm(q, opts=opts))
 
-            # List vaults again
             opts = {'user': visi1.iden}
             self.eq(0, await core.callStorm('return($lib.len($lib.vault.list()))', opts=opts))
 
+            # Remove permission on global vault
+            opts = {'vars': {'iden': visi1.iden, 'giden': giden}}
+            q = '$vault = $lib.vault.get($giden) return($vault.setPerm($iden, $lib.null))'
+            self.true(await core.callStorm(q, opts=opts))
+
+            opts = {'user': visi1.iden}
+            self.eq(1, await core.callStorm('return($lib.len($lib.vault.list()))', opts=opts))
+
             # Runtime asroot
 
             await core.addStormPkg({

synapse/tests/test_lib_stormtypes.py

@@ -6388,6 +6388,11 @@ words\tword\twrd'''
             self.eq(1, await core.callStorm('return($lib.math.number(1.23).toint())'))
             self.eq(2, await core.callStorm('return($lib.math.number(1.23).toint(rounding=ROUND_UP))'))
 
+            with self.raises(s_exc.BadCast):
+                    await core.callStorm('return($lib.math.number((null)))')
+            with self.raises(s_exc.BadCast):
+                    await core.callStorm('return($lib.math.number(newp))')
+
             with self.raises(s_exc.StormRuntimeError):
                 await core.callStorm('return($lib.math.number(1.23).toint(rounding=NEWP))')
 

synapse/tests/test_lib_types.py

@@ -1606,3 +1606,12 @@ class TypesTest(s_t_utils.SynTest):
 
             core.getLayer()._testAddPropArrayIndx(buid, 'test:int', '_hehe', ('newp' * 100,))
             self.len(0, await core.nodes('test:int:_hehe*[~=newp]'))
+
+    async def test_types_typehash(self):
+        async with self.getTestCore() as core:
+            self.true(core.model.form('inet:fqdn').type.typehash is core.model.prop('inet:dns:a:fqdn').type.typehash)
+            self.true(core.model.form('it:prod:softname').type.typehash is core.model.prop('it:network:name').type.typehash)
+            self.true(core.model.form('inet:asn').type.typehash is not core.model.prop('inet:proto:port').type.typehash)
+
+            self.true(s_common.isguid(core.model.form('inet:fqdn').type.typehash))
+            self.true(s_common.isguid(core.model.form('inet:fqdn').typehash))

synapse/tests/test_model_dns.py

@@ -108,6 +108,14 @@ class DnsModelTest(s_t_utils.SynTest):
             self.eq(node.get('name:fqdn'), 'vertex.link')
             self.eq(node.get('type'), 255)
 
+            nodes = await core.nodes('[inet:dns:request=* :reply:code=NXDOMAIN]')
+            self.eq(nodes[0].get('reply:code'), 3)
+            self.eq(nodes[0].repr('reply:code'), 'NXDOMAIN')
+
+            nodes = await core.nodes('[inet:dns:request=* :reply:code=1138]')
+            self.eq(nodes[0].get('reply:code'), 1138)
+            self.eq(nodes[0].repr('reply:code'), '1138')
+
             nodes = await core.nodes('[inet:dns:query=("tcp://1.2.3.4", 4.3.2.1.in-addr.arpa, 255)]')
             self.len(1, nodes)
             node = nodes[0]

synapse/tests/test_model_geospace.py

@@ -2,7 +2,6 @@ import synapse.exc as s_exc
 import synapse.common as s_common
 
 import synapse.tests.utils as s_t_utils
-from synapse.tests.utils import alist
 
 import synapse.lib.module as s_module
 
@@ -499,6 +498,7 @@ class GeoTest(s_t_utils.SynTest):
                     :place:name=woot
                     :place={[geo:place=* :name=woot]}
                     :accuracy=10m
+                    :node=(test:int, 1234)
                 ]
             ''')
             self.eq(1655510400000, nodes[0].get('time'))
@@ -507,6 +507,8 @@ class GeoTest(s_t_utils.SynTest):
             self.eq('woot', nodes[0].get('place:name'))
             self.eq(10000, nodes[0].get('accuracy'))
             self.len(1, await core.nodes('geo:telem -> geo:place +:name=woot'))
+            self.eq(('test:int', 1234), nodes[0].get('node'))
+            self.len(1, await core.nodes('test:int=1234'))
 
     async def test_model_geospace_area(self):
 

synapse/tests/test_model_infotech.py

@@ -407,6 +407,35 @@ class InfotechModelTest(s_t_utils.SynTest):
             self.eq(nodes[0].get('net6'), ('fe80::', 'fe80::ffff:ffff:ffff:ffff'))
             self.eq(nodes[0].get('type'), 'virtual.sdn.')
 
+            nodes = await core.nodes('''[
+                it:sec:stix:indicator=*
+                    :id=zoinks
+                    :name=woot
+                    :confidence=90
+                    :revoked=(false)
+                    :description="my neato indicator"
+                    :pattern="some rule text"
+                    :pattern_type=yara
+                    :created=20240815
+                    :updated=20240815
+                    :labels=(hehe, haha)
+                    :valid_from=20240815
+                    :valid_until=20240815
+            ]''')
+            self.len(1, nodes)
+            self.eq('zoinks', nodes[0].get('id'))
+            self.eq('woot', nodes[0].get('name'))
+            self.eq(90, nodes[0].get('confidence'))
+            self.eq(False, nodes[0].get('revoked'))
+            self.eq('my neato indicator', nodes[0].get('description'))
+            self.eq('some rule text', nodes[0].get('pattern'))
+            self.eq('yara', nodes[0].get('pattern_type'))
+            self.eq(('haha', 'hehe'), nodes[0].get('labels'))
+            self.eq(1723680000000, nodes[0].get('created'))
+            self.eq(1723680000000, nodes[0].get('updated'))
+            self.eq(1723680000000, nodes[0].get('valid_from'))
+            self.eq(1723680000000, nodes[0].get('valid_until'))
+
     async def test_infotech_ios(self):
 
         async with self.getTestCore() as core:
@@ -1553,6 +1582,24 @@ class InfotechModelTest(s_t_utils.SynTest):
             self.eq(rule, nodes[0].get('rule'))
             self.eq(0x10000200003, nodes[0].get('version'))
 
+            nodes = await core.nodes('''[
+                (it:app:yara:netmatch=* :node=(inet:fqdn, foo.com))
+                (it:app:yara:netmatch=* :node=(inet:ipv4, 1.2.3.4))
+                (it:app:yara:netmatch=* :node=(inet:ipv6, "::ffff"))
+                (it:app:yara:netmatch=* :node=(inet:url, "http://foo.com"))
+                    :rule=$rule
+                    :version=1.2.3
+            ]''', opts=opts)
+            self.len(4, nodes)
+            for node in nodes:
+                self.nn(node.get('node'))
+                self.nn(node.get('version'))
+
+            self.len(4, await core.nodes('it:app:yara:rule=$rule -> it:app:yara:netmatch', opts=opts))
+
+            with self.raises(s_exc.BadTypeValu):
+                await core.nodes('[it:app:yara:netmatch=* :node=(it:dev:str, foo)]')
+
     async def test_it_app_snort(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_model_syn.py

@@ -340,11 +340,22 @@ class SynModelTest(s_t_utils.SynTest):
             nodes = await core.nodes(f'syn:trigger={iden}')
             self.len(1, nodes)
 
+            indx = await core.getNexsIndx()
+
             # set the trigger doc
             nodes = await core.nodes(f'syn:trigger={iden} [ :doc=hehe ]')
             self.len(1, nodes)
             self.eq('hehe', nodes[0].get('doc'))
 
+            self.eq(await core.getNexsIndx(), indx + 1)
+
+            # set the trigger name
+            nodes = await core.nodes(f'syn:trigger={iden} [ :name=trigname ]')
+            self.len(1, nodes)
+            self.eq('trigname', nodes[0].get('name'))
+
+            self.eq(await core.getNexsIndx(), indx + 2)
+
             # Trigger reloads and make some more triggers to play with
             tdef = {'cond': 'prop:set', 'prop': 'inet:ipv4:asn', 'storm': '[inet:user=1] | testcmd'}
             await core.view.addTrigger(tdef)