synapse 2.164.0__py311-none-any.whl → 2.166.0__py311-none-any.whl

synapse/tests/test_lib_stormtypes.py

@@ -20,7 +20,6 @@ import synapse.lib.storm as s_storm
 import synapse.lib.hashset as s_hashset
 import synapse.lib.httpapi as s_httpapi
 import synapse.lib.modelrev as s_modelrev
-import synapse.lib.provenance as s_provenance
 import synapse.lib.stormtypes as s_stormtypes
 
 import synapse.tests.utils as s_test
@@ -490,6 +489,12 @@ class StormTypesTest(s_test.SynTest):
             nodes = await core.nodes('test:str=foo $node.difftags((["foo", "baz", ""]), apply=$lib.true)')
             self.sorteq(nodes[0].tags, ['foo', 'baz'])
 
+            nodes = await core.nodes('test:str=foo $node.difftags((["foo-bar", ""]), apply=$lib.true, norm=$lib.true)')
+            self.sorteq(nodes[0].tags, ['foo_bar'])
+
+            nodes = await core.nodes('test:str=foo $node.difftags((["foo-bar", "foo", "baz"]), apply=$lib.true)')
+            self.sorteq(nodes[0].tags, ['foo', 'baz'])
+
             await core.setTagModel("foo", "regex", (None, "[a-zA-Z]{3}"))
             async with await core.snap() as snap:
                 snap.strict = False
@@ -501,7 +506,6 @@ class StormTypesTest(s_test.SynTest):
             'name': 'foo',
             'desc': 'test',
             'version': (0, 0, 1),
-            'synapse_minversion': [2, 144, 0],
             'synapse_version': '>=2.8.0,<3.0.0',
             'modules': [
                 {
@@ -1323,6 +1327,9 @@ class StormTypesTest(s_test.SynTest):
 
             self.eq('foo bar baz faz', await core.callStorm('return($lib.regex.replace("[ ]{2,}", " ", "foo  bar   baz faz"))'))
 
+            self.eq(r'foo\.bar\.baz', await core.callStorm('return($lib.regex.escape("foo.bar.baz"))'))
+            self.eq(r'foo\ bar\ baz', await core.callStorm('return($lib.regex.escape("foo bar baz"))'))
+
             self.eq(((1, 2, 3)), await core.callStorm('return(("[1, 2, 3]").json())'))
 
             with self.raises(s_exc.BadJsonText):
@@ -4504,7 +4511,6 @@ class StormTypesTest(s_test.SynTest):
 
         MONO_DELT = 1543827303.0
         unixtime = datetime.datetime(year=2018, month=12, day=5, hour=7, minute=0, tzinfo=tz.utc).timestamp()
-        s_provenance.reset()
 
         def timetime():
             return unixtime
@@ -4838,6 +4844,7 @@ class StormTypesTest(s_test.SynTest):
 
                     self.stormIsInPrint('last result:     finished successfully with 0 nodes', mesgs)
                     self.stormIsInPrint('entries:         <None>', mesgs)
+                    self.stormIsInPrint('pool:            false', mesgs)
 
                     # Test 'stat' command
                     mesgs = await core.stormlist('cron.stat xxx')
@@ -4911,7 +4918,7 @@ class StormTypesTest(s_test.SynTest):
                 self.stormIsInErr('data.iden must match pattern', msgs)
 
                 opts = {'vars': {'iden': 'cd263bd133a5dafa1e1c5e9a01d9d486'}}
-                q = "cron.add --iden $iden --day +1 --minute 14 {[test:guid=$lib.guid()]}"
+                q = "cron.add --pool --iden $iden --day +1 --minute 14 {[test:guid=$lib.guid()]}"
                 msgs = await core.stormlist(q, opts=opts)
                 self.stormIsInPrint('Created cron job: cd263bd133a5dafa1e1c5e9a01d9d486', msgs)
 
@@ -6432,6 +6439,9 @@ words\tword\twrd'''
 
             fork00 = await core.callStorm('return($lib.view.get().fork().iden)')
 
+            with self.raises(s_exc.BadState):
+                await core.callStorm('$lib.view.get().setMergeComment("that doesnt exist")', opts={'user': root.iden, 'view': fork00})
+
             msgs = await core.stormlist('[ inet:fqdn=vertex.link ]', opts={'view': fork00})
             self.stormHasNoWarnErr(msgs)
 
@@ -6452,14 +6462,23 @@ words\tword\twrd'''
             self.nn(merge['created'])
             self.eq(merge['comment'], 'woot')
             self.eq(merge['creator'], core.auth.rootuser.iden)
+            self.none(merge.get('updated'))
+
+            merging = 'return($lib.view.get().getMergingViews()) '
+
+            self.eq([fork00], await core.callStorm(merging))
 
             with self.raises(s_exc.AuthDeny):
                 core.getView(fork00).reqValidVoter(root.iden)
 
+            await core.callStorm('$lib.view.get().setMergeComment("mergin some dataaz")', opts={'view': fork00})
+
             merge = await core.callStorm('return($lib.view.get().getMergeRequest())', opts={'view': fork00})
             self.nn(merge['iden'])
             self.nn(merge['created'])
-            self.eq(merge['comment'], 'woot')
+            self.nn(merge['updated'])
+            self.gt(merge['updated'], merge['created'])
+            self.eq(merge['comment'], 'mergin some dataaz')
             self.eq(merge['creator'], core.auth.rootuser.iden)
 
             with self.raises(s_exc.AuthDeny):
@@ -6479,6 +6498,21 @@ words\tword\twrd'''
             self.eq(vote['user'], visi.iden)
             self.eq(vote['comment'], 'fixyourstuff')
 
+            forkview = core.getView(fork00)
+
+            with self.raises(s_exc.BadState):
+                await core.callStorm('$lib.view.get().setMergeVoteComment("wait that doesnt exist")', opts={'view': fork00, 'user': newp.iden})
+
+            with self.raises(s_exc.AuthDeny):
+                await core.callStorm('$lib.view.get().setMergeComment("no wait you cant do that")', opts={'view': fork00, 'user': newp.iden})
+
+            await core.callStorm('$lib.view.get().setMergeVoteComment("no really, fix your stuff")', opts=opts)
+            votes = [vote async for vote in forkview.getMergeVotes()]
+            self.len(1, votes)
+            self.eq(votes[0]['comment'], 'no really, fix your stuff')
+            self.nn(votes[0]['updated'])
+            self.gt(votes[0]['updated'], votes[0]['created'])
+
             opts = {'user': newp.iden, 'view': fork00}
             vote = await core.callStorm('return($lib.view.get().setMergeVote())', opts=opts)
             self.nn(vote['offset'])
@@ -6497,8 +6531,6 @@ words\tword\twrd'''
                 opts = {'user': newp.iden, 'view': fork00, 'vars': {'visi': visi.iden}}
                 await core.callStorm('return($lib.view.get().delMergeVote(useriden=$visi))', opts=opts)
 
-            forkview = core.getView(fork00)
-
             # removing the last veto triggers the merge
             opts = {'user': visi.iden, 'view': fork00}
             await core.callStorm('return($lib.view.get().delMergeVote())', opts=opts)
@@ -6511,8 +6543,13 @@ words\tword\twrd'''
             self.none(core.getView(fork00))
             nodes = await core.nodes('inet:fqdn')
             self.len(2, nodes)
+
+            # previously successful merges
             self.len(1, await core.callStorm('$list = ([]) for $merge in $lib.view.get().getMerges() { $list.append($merge) } fini { return($list) }'))
 
+            # current open merge requests
+            self.eq([], await core.callStorm(merging))
+
             # test out the delMergeRequest logic / cleanup
             forkdef = await core.getView().fork()
 
@@ -6520,6 +6557,7 @@ words\tword\twrd'''
 
             opts = {'view': fork.iden}
             self.nn(await core.callStorm('return($lib.view.get().setMergeRequest())', opts=opts))
+            self.eq([fork.iden], await core.callStorm(merging))
 
             # confirm that you may not re-parent to a view with a merge request
             layr = await core.addLayer()
@@ -6535,6 +6573,8 @@ words\tword\twrd'''
             self.nn(await core.callStorm('return($lib.view.get().delMergeRequest())', opts=opts))
             self.len(0, [vote async for vote in fork.getMergeVotes()])
 
+            self.eq([], await core.callStorm(merging))
+
             # test coverage for beholder progress events...
             forkdef = await core.getView().fork()
             fork = core.getView(forkdef.get('iden'))
@@ -6543,10 +6583,12 @@ words\tword\twrd'''
             await core.stormlist('[ inet:ipv4=1.2.3.0/20 ]', opts=opts)
             await core.callStorm('return($lib.view.get().setMergeRequest())', opts=opts)
 
+            self.eq([fork.iden], await core.callStorm(merging))
+
             nevents = 8
             if s_common.envbool('SYNDEV_NEXUS_REPLAY'):
                 # view:merge:vote:set fires twice
-                nevents = nevents + 1
+                nevents += 1
             waiter = core.waiter(nevents, 'cell:beholder')
 
             opts = {'view': fork.iden, 'user': visi.iden}
@@ -6569,6 +6611,8 @@ words\tword\twrd'''
             self.eq(msgs[-1][1]['info']['merge']['creator'], core.auth.rootuser.iden)
             self.eq(msgs[-1][1]['info']['votes'][0]['user'], visi.iden)
 
+            self.eq([], await core.callStorm(merging))
+
             # test coverage for bad state for merge request
             fork00 = await core.getView().fork()
             fork01 = await core.getView(fork00['iden']).fork()
@@ -6577,8 +6621,11 @@ words\tword\twrd'''
             with self.raises(s_exc.BadState):
                 await core.callStorm('return($lib.view.get().setMergeRequest())', opts=opts)
 
+            self.eq([], await core.callStorm(merging))
+
             await core.delView(fork01['iden'])
             await core.callStorm('return($lib.view.get().setMergeRequest())', opts=opts)
+            self.eq([fork00['iden']], await core.callStorm(merging))
 
             core.getView().layers[0].readonly = True
             with self.raises(s_exc.BadState):
@@ -6597,6 +6644,8 @@ words\tword\twrd'''
             await core.stormlist('[ inet:ipv4=5.5.5.5 ]', opts=opts)
             await core.callStorm('return($lib.view.get().setMergeRequest())', opts=opts)
 
+            self.eq(set([fork.iden, fork00['iden']]), set(await core.callStorm(merging)))
+
             # hamstring the runViewMerge method on the new view
             async def fake():
                 return
@@ -6631,3 +6680,6 @@ words\tword\twrd'''
 
             msgs = await core.stormlist('$lib.view.get().set(quorum, $lib.null)')
             self.stormHasNoWarnErr(msgs)
+
+            with self.raises(s_exc.BadState):
+                await core.callStorm(merging)

synapse/tests/test_lib_trigger.py

@@ -354,6 +354,24 @@ class TrigTest(s_t_utils.SynTest):
             await self.asyncraises(s_exc.NoSuchIden, view.delTrigger('newp'))
             await self.asyncraises(s_exc.NoSuchIden, view.setTriggerInfo('newp', 'enabled', True))
 
+            # mop up some coverage
+            msgs = await core.stormlist('trigger.add tag:del --form inet:ipv4 --tag zoinks --query { [+#bar] }')
+            self.stormHasNoWarnErr(msgs)
+
+            msgs = await core.stormlist('trigger.add tag:del --tag zoinks.* --query { [+#faz] }')
+            self.stormHasNoWarnErr(msgs)
+
+            nodes = await core.nodes('[ inet:ipv4=1.2.3.4 +#zoinks.foo -#zoinks ]')
+
+            self.len(1, nodes)
+            self.nn(nodes[0].getTag('bar'))
+            self.nn(nodes[0].getTag('faz'))
+
+            # coverage for migration mode
+            await core.nodes('[inet:fqdn=vertex.link +#foo]') # for additional migration mode trigger tests below
+            with core.enterMigrationMode():
+                await core.nodes('inet:fqdn=vertex.link [ +#bar -#foo ]')
+
     async def test_trigger_delete(self):
 
         async with self.getTestCore() as core:
@@ -756,7 +774,7 @@ class TrigTest(s_t_utils.SynTest):
             await core.nodes('trigger.add edge:add --verb r* --n2form test:int --query { [ +#n2 ] }')
             await core.nodes('trigger.add edge:add --verb no** --form test:int --n2form test:str --query { [ +#both ] }')
 
-            async with core.enterMigrationMode():
+            with core.enterMigrationMode():
                 nodes = await core.nodes('[test:int=123 +(foo:beep:boop)> { [test:str=neato] }]')
                 self.len(1, nodes)
                 self.notin('foo', nodes[0].tags)
@@ -816,7 +834,7 @@ class TrigTest(s_t_utils.SynTest):
             await core.nodes('trigger.add edge:del --verb r* --n2form test:int --query { [ +#del.two ] }')
             await core.nodes('trigger.add edge:del --verb no** --form test:int --n2form test:str --query { [ +#del.all ] }')
 
-            async with core.enterMigrationMode():
+            with core.enterMigrationMode():
                 nodes = await core.nodes('test:int=123 | [ -(foo:beep:boop)> { test:str=neato } ]')
                 self.len(1, nodes)
                 self.notin('del.none', nodes[0].tags)

synapse/tests/test_lib_types.py

@@ -6,6 +6,7 @@ import synapse.datamodel as s_datamodel
 
 import synapse.lib.time as s_time
 import synapse.lib.const as s_const
+import synapse.lib.stormtypes as s_stormtypes
 
 import synapse.tests.utils as s_t_utils
 from synapse.tests.utils import alist
@@ -39,7 +40,7 @@ class TypesTest(s_t_utils.SynTest):
             with self.raises(s_exc.BadTypeValu):
                 mass.norm('newps')
 
-    def test_velocity(self):
+    async def test_velocity(self):
         model = s_datamodel.Model()
         velo = model.type('velocity')
 
@@ -78,6 +79,12 @@ class TypesTest(s_t_utils.SynTest):
         relv = velo.clone({'relative': True})
         self.eq(-2777, relv.norm('-10k/h')[0])
 
+        self.eq(1, velo.norm('1.23')[0])
+
+        async with self.getTestCore() as core:
+            nodes = await core.nodes('[transport:sea:telem=(foo,) :speed=(1.1 * 2) ]')
+            self.eq(2, nodes[0].get('speed'))
+
     def test_hugenum(self):
 
         model = s_datamodel.Model()
@@ -248,6 +255,9 @@ class TypesTest(s_t_utils.SynTest):
         self.eq(t.norm('0'), (0, {}))
         self.eq(t.norm('1'), (1, {}))
 
+        self.eq(t.norm(s_stormtypes.Number('1')), (1, {}))
+        self.eq(t.norm(s_stormtypes.Number('0')), (0, {}))
+
         for s in ('trUe', 'T', 'y', ' YES', 'On '):
             self.eq(t.norm(s), (1, {}))
 
@@ -486,6 +496,7 @@ class TypesTest(s_t_utils.SynTest):
         self.eq(t.norm(True)[0], 1)
         self.eq(t.norm(False)[0], 0)
         self.eq(t.norm(decimal.Decimal('1.0'))[0], 1)
+        self.eq(t.norm(s_stormtypes.Number('1.0'))[0], 1)
 
         # Test merge
         self.eq(30, t.merge(20, 30))
@@ -572,6 +583,7 @@ class TypesTest(s_t_utils.SynTest):
         self.true(math.isnan(t.norm('NaN')[0]))
         self.eq(t.norm('-0.0')[0], -0.0)
         self.eq(t.norm('42')[0], 42.0)
+        self.eq(t.norm(s_stormtypes.Number('1.23'))[0], 1.23)
         minmax = model.type('float').clone({'min': -10.0, 'max': 100.0, 'maxisvalid': True, 'minisvalid': False})
         self.raises(s_exc.BadTypeValu, minmax.norm, 'NaN')
         self.raises(s_exc.BadTypeValu, minmax.norm, '-inf')
@@ -610,6 +622,8 @@ class TypesTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('[ test:float=42.0 :open=0.001]'))
             self.len(1, await core.nodes('[ test:float=42.0 :open=359.0]'))
 
+            self.eq(5, await core.callStorm('return($lib.cast(int, (5.5)))'))
+
     async def test_ival(self):
         model = s_datamodel.Model()
         ival = model.types.get('ival')
@@ -621,6 +635,7 @@ class TypesTest(s_t_utils.SynTest):
         self.eq((0, 5356800000), ival.norm((0, '1970-03-04'))[0])
         self.eq((1451606400000, 1451606400001), ival.norm('2016')[0])
         self.eq((1451606400000, 1451606400001), ival.norm(1451606400000)[0])
+        self.eq((1451606400000, 1451606400001), ival.norm(s_stormtypes.Number(1451606400000))[0])
         self.eq((1451606400000, 1451606400001), ival.norm('2016')[0])
         self.eq((1451606400000, 1483228800000), ival.norm(('2016', '  2017'))[0])
         self.eq((1451606400000, 1483228800000), ival.norm(('2016-01-01', '  2017'))[0])
@@ -1077,6 +1092,7 @@ class TypesTest(s_t_utils.SynTest):
         self.eq('1234567891.1234567', flt.norm(1234567890.123456790123456790123456789 + 1)[0])
         self.eq('1234567890.1234567', flt.norm(1234567890.123456790123456790123456789 + 0.0000000001)[0])
         self.eq('2.718281828459045', flt.norm(2.718281828459045)[0])
+        self.eq('1.23', flt.norm(s_stormtypes.Number(1.23))[0])
 
     def test_syntag(self):
 

synapse/tests/test_model_economic.py

@@ -111,9 +111,11 @@ class EconTest(s_utils.SynTest):
             text = f'''[
                 econ:acct:payment="*"
 
+                    :to:account=*
                     :to:contact={bycont}
                     :to:coinaddr=(btc, 1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2)
 
+                    :from:account=*
                     :from:contact={fromcont}
                     :from:coinaddr=(btc, 1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2)
 
@@ -132,6 +134,9 @@ class EconTest(s_utils.SynTest):
             self.len(1, await core.nodes('econ:acct:payment -> econ:pay:card'))
             self.len(2, await core.nodes('econ:acct:payment -> ps:contact | uniq'))
 
+            self.len(1, await core.nodes('econ:acct:payment :to:account -> econ:bank:account'))
+            self.len(1, await core.nodes('econ:acct:payment :from:account -> econ:bank:account'))
+
             nodes = await core.nodes('''
                 [ econ:fin:exchange=(us,nasdaq) :name=nasdaq :currency=usd :org=* ]
             ''')
@@ -239,3 +244,112 @@ class EconTest(s_utils.SynTest):
             self.eq(nodes[0].get('price'), '100')
             self.len(1, await core.nodes('econ:receipt:item -> econ:purchase'))
             self.len(1, await core.nodes('econ:receipt:item -> biz:product +:name=bananna'))
+
+            nodes = await core.nodes('''
+                [ econ:bank:account=*
+                    :number=1234
+                    :type=checking
+                    :aba:rtn=123456789
+                    :iban=VV09WootWoot
+                    :issuer={ gen.ou.org "bank of visi" }
+                    :issuer:name="bank of visi"
+                    :contact={[ ps:contact=* :name=visi ]}
+                    :currency=usd
+                    :balance=*
+                ]
+            ''')
+            self.len(1, nodes)
+            self.nn(nodes[0].get('issuer'))
+            self.nn(nodes[0].get('balance'))
+            self.nn(nodes[0].get('contact'))
+            self.eq('1234', nodes[0].get('number'))
+            self.eq('usd', nodes[0].get('currency'))
+            self.eq('checking.', nodes[0].get('type'))
+            self.eq('VV09WootWoot', nodes[0].get('iban'))
+            self.eq('bank of visi', nodes[0].get('issuer:name'))
+            self.len(1, await core.nodes('econ:bank:account -> ou:org'))
+            self.len(1, await core.nodes('econ:bank:account -> ou:name'))
+            self.len(1, await core.nodes('econ:bank:account -> econ:bank:aba:rtn'))
+            self.len(1, await core.nodes('econ:bank:account -> econ:bank:balance'))
+            self.len(1, await core.nodes('econ:bank:account -> ps:contact +:name=visi'))
+            self.len(1, await core.nodes('econ:bank:account -> econ:bank:account:type:taxonomy'))
+
+            nodes = await core.nodes('''[
+                econ:bank:swift:bic=DEUTDEFFXXX
+                    :business={ gen.ou.org "Deutsche Bank" }
+                    :office=*
+            ]''')
+            self.len(1, nodes)
+            self.len(1, await core.nodes('econ:bank:swift:bic -> ou:org +:name="deutsche bank"'))
+            self.len(1, await core.nodes('econ:bank:swift:bic -> ps:contact'))
+
+            nodes = await core.nodes('''[
+                econ:bank:balance=*
+                    :account={econ:bank:account | limit 1}
+                    :time=2024-03-19
+                    :amount=99
+            ]''')
+            self.len(1, nodes)
+            self.nn(nodes[0].get('account'))
+            self.eq(1710806400000, nodes[0].get('time'))
+            self.eq('99', nodes[0].get('amount'))
+
+            nodes = await core.nodes('''[
+                econ:bank:statement=*
+                    :account={econ:bank:account | limit 1}
+                    :period=202403*
+                    :starting:balance=99
+                    :ending:balance=999
+            ]''')
+            self.len(1, nodes)
+            self.nn(nodes[0].get('account'))
+            self.eq('99', nodes[0].get('starting:balance'))
+            self.eq('999', nodes[0].get('ending:balance'))
+            self.eq((1709251200000, 1709251200001), nodes[0].get('period'))
+
+            nodes = await core.nodes('''[
+                econ:bank:aba:rtn=123456789
+                    :bank={ gen.ou.org "deutsche bank" }
+                    :bank:name="deutsche bank"
+            ]''')
+            self.len(1, nodes)
+            self.len(1, await core.nodes('econ:bank:aba:rtn=123456789 -> ou:name'))
+            self.len(1, await core.nodes('econ:bank:aba:rtn=123456789 -> ou:org +:name="deutsche bank"'))
+
+            nodes = await core.nodes('''[
+                econ:acct:receipt=*
+                    :amount=99
+                    :currency=usd
+                    :purchase=*
+                    :issued=2024-03-19
+                    :issuer={ ps:contact:name=visi }
+                    :recipient={ ps:contact:name=visi }
+            ]''')
+            self.len(1, nodes)
+            self.eq('99', nodes[0].get('amount'))
+            self.eq('usd', nodes[0].get('currency'))
+            self.eq(1710806400000, nodes[0].get('issued'))
+            self.len(1, await core.nodes('econ:acct:receipt -> econ:purchase'))
+            self.len(1, await core.nodes('econ:acct:receipt :issuer -> ps:contact'))
+            self.len(1, await core.nodes('econ:acct:receipt :recipient -> ps:contact'))
+
+            nodes = await core.nodes('''[
+                econ:acct:invoice=*
+                    :paid=(false)
+                    :amount=99
+                    :currency=usd
+                    :purchase=*
+                    :due=2024-03-19
+                    :issued=2024-03-19
+                    :issuer={ ps:contact:name=visi }
+                    :recipient={ ps:contact:name=visi }
+            ]''')
+            self.len(1, nodes)
+            self.eq('99', nodes[0].get('amount'))
+            self.eq('usd', nodes[0].get('currency'))
+            self.eq(0, nodes[0].get('paid'))
+            self.eq(1710806400000, nodes[0].get('due'))
+            self.eq(1710806400000, nodes[0].get('issued'))
+            self.len(1, await core.nodes('econ:acct:invoice -> econ:purchase'))
+            self.len(1, await core.nodes('econ:acct:invoice :issuer -> ps:contact'))
+            self.len(1, await core.nodes('econ:acct:invoice :recipient -> ps:contact'))

synapse/tests/test_model_files.py

@@ -474,6 +474,7 @@ class FileTest(s_t_utils.SynTest):
                 self.eq(('foo', 'bar'), n.get('file:data'))
                 self.eq('aaaa', n.get('desc'))
                 self.eq('bbbb', n.get('comment'))
+                self.eq('foo bar', n.get('text'))
                 self.eq(1578236238000, n.get('created'))
                 self.eq('a6b4', n.get('imageid'))
                 self.eq(conguid, n.get('author'))
@@ -494,6 +495,7 @@ class FileTest(s_t_utils.SynTest):
                 :file:data=(foo, bar)
                 :desc=aaaa
                 :comment=bbbb
+                :text="  Foo   Bar   "
                 :created="2020-01-05 14:57:18"
                 :imageid=a6b4
                 :author=$conguid

synapse/tests/test_model_inet.py

@@ -2650,6 +2650,9 @@ class InetModelTest(s_t_utils.SynTest):
     async def test_model_inet_email_message(self):
 
         async with self.getTestCore() as core:
+
+            flow = s_common.guid()
+
             q = '''
             [
             inet:email:message="*"
@@ -2665,18 +2668,20 @@ class InetModelTest(s_t_utils.SynTest):
                 :received:from:ipv4=1.2.3.4
                 :received:from:ipv6="::1"
                 :received:from:fqdn=smtp.vertex.link
+                :flow=$flow
             ]
 
             {[( inet:email:message:link=($node, https://www.vertex.link) :text=Vertex )]}
             {[( inet:email:message:attachment=($node, "*") :name=sploit.exe )]}
             '''
-            nodes = await core.nodes(q)
+            nodes = await core.nodes(q, opts={'vars': {'flow': flow}})
             self.len(1, nodes)
 
             self.eq(nodes[0].get('cc'), ('baz@faz.org', 'foo@bar.com'))
             self.eq(nodes[0].get('received:from:ipv6'), '::1')
             self.eq(nodes[0].get('received:from:ipv4'), 0x01020304)
             self.eq(nodes[0].get('received:from:fqdn'), 'smtp.vertex.link')
+            self.eq(nodes[0].get('flow'), flow)
 
             self.len(1, await core.nodes('inet:email:message:to=woot@woot.com'))
             self.len(1, await core.nodes('inet:email:message:date=2015'))
@@ -2762,3 +2767,70 @@ class InetModelTest(s_t_utils.SynTest):
             self.eq(nodes[0].get('client'), 'tcp://1.2.3.4')
             self.eq(nodes[0].get('client:ipv4'), 0x01020304)
             self.eq(nodes[0].get('client:ipv6'), '::1')
+
+    async def test_model_inet_tls_handshake(self):
+
+        async with self.getTestCore() as core:
+            props = {
+                'ja3': '1' * 32,
+                'ja3s': '2' * 32,
+                'client': 'tcp://1.2.3.4:8888',
+                'server': 'tcp://5.6.7.8:9999'
+            }
+
+            nodes = await core.nodes('''
+                [
+                    inet:tls:handshake=*
+                        :time=now
+                        :flow=*
+                        :server=$server
+                        :server:cert=*
+                        :server:fingerprint:ja3=$ja3s
+                        :client=$client
+                        :client:cert=*
+                        :client:fingerprint:ja3=$ja3
+                ]
+            ''', opts={'vars': props})
+            self.len(1, nodes)
+            self.nn(nodes[0].get('time'))
+            self.nn(nodes[0].get('flow'))
+            self.nn(nodes[0].get('server:cert'))
+            self.nn(nodes[0].get('client:cert'))
+
+            self.eq(props['ja3'], nodes[0].get('client:fingerprint:ja3'))
+            self.eq(props['ja3s'], nodes[0].get('server:fingerprint:ja3'))
+
+            self.eq(props['client'], nodes[0].get('client'))
+            self.eq(props['server'], nodes[0].get('server'))
+
+    async def test_model_inet_ja3(self):
+
+        async with self.getTestCore() as core:
+
+            ja3 = '76e7b0cb0994d60a4b3f360a088fac39'
+            nodes = await core.nodes('[ inet:tls:ja3:sample=(tcp://1.2.3.4, $md5) ]', opts={'vars': {'md5': ja3}})
+            self.len(1, nodes)
+            self.eq(nodes[0].get('client'), 'tcp://1.2.3.4')
+            self.eq(nodes[0].get('ja3'), ja3)
+
+            ja3 = '4769ad08107979c719d86270e706fed5'
+            nodes = await core.nodes('[ inet:tls:ja3s:sample=(tcp://2.2.2.2, $md5) ]', opts={'vars': {'md5': ja3}})
+            self.len(1, nodes)
+            self.eq(nodes[0].get('server'), 'tcp://2.2.2.2')
+            self.eq(nodes[0].get('ja3s'), ja3)
+
+    async def test_model_inet_tls_certs(self):
+
+        async with self.getTestCore() as core:
+
+            server = 'e4f6db65dbaa7a4598f7379f75dcd5f5'
+            client = 'df8d1f7e04f7c4a322e04b0b252e2851'
+            nodes = await core.nodes('[inet:tls:servercert=(tcp://1.2.3.4:1234, $server)]', opts={'vars': {'server': server}})
+            self.len(1, nodes)
+            self.eq(nodes[0].get('server'), 'tcp://1.2.3.4:1234')
+            self.eq(nodes[0].get('cert'), server)
+
+            nodes = await core.nodes('[inet:tls:clientcert=(tcp://5.6.7.8:5678, $client)]', opts={'vars': {'client': client}})
+            self.len(1, nodes)
+            self.eq(nodes[0].get('client'), 'tcp://5.6.7.8:5678')
+            self.eq(nodes[0].get('cert'), client)

synapse/tests/test_model_infotech.py

@@ -95,7 +95,7 @@ class InfotechModelTest(s_t_utils.SynTest):
 
             nodes = await core.nodes('''[
                 it:mitre:attack:technique=T0100
-                    :name=lockpicking
+                    :name="   LockPicking   "
                     :desc=speedhackers
                     :url=https://locksrus.link
                     :tag=cno.mitre.t0100
@@ -146,7 +146,7 @@ class InfotechModelTest(s_t_utils.SynTest):
 
             nodes = await core.nodes('''[
                 it:mitre:attack:mitigation=M0100
-                    :name=patchstuff
+                    :name="   PatchStuff   "
                     :desc=patchyourstuff
                     :url=https://wsus.com
                     :tag=cno.mitre.m0100

synapse/tests/test_model_orgs.py

@@ -459,14 +459,23 @@ class OuModelTest(s_t_utils.SynTest):
             iden = await core.callStorm('ou:id:type return($node.value())')
 
             opts = {'vars': {'type': iden}}
-            nodes = await core.nodes('[ ou:id:number=($type, visi) :status=woot :issued=202002 :expires=2021 ]', opts=opts)
+            nodes = await core.nodes('''
+                [ ou:id:number=($type, visi)
+                    :status=woot
+                    :issued=202002
+                    :expires=2021
+                    :issuer={[ ps:contact=* :name=visi ]}
+                ]
+            ''', opts=opts)
             self.len(1, nodes)
+            self.nn(nodes[0].get('issuer'))
             self.eq(('ou:id:number', (iden, 'visi')), nodes[0].ndef)
             self.eq(iden, nodes[0].get('type'))
             self.eq('visi', nodes[0].get('value'))
             self.eq('woot', nodes[0].get('status'))
             self.eq(1580515200000, nodes[0].get('issued'))
             self.eq(1609459200000, nodes[0].get('expires'))
+            self.len(1, await core.nodes('ou:id:number -> ps:contact +:name=visi'))
 
             opts = {'vars': {'type': iden}}
             nodes = await core.nodes('[ ou:id:update=* :number=($type, visi) :status=revoked :time=202003]', opts=opts)