synapse 2.187.0__py311-none-any.whl → 2.188.1__py311-none-any.whl

synapse/tests/test_lib_stormlib_modelext.py

@@ -25,6 +25,13 @@ class StormtypesModelextTest(s_test.SynTest):
 
                 $edgeinfo = ({"doc": "A test edge."})
                 $lib.model.ext.addEdge(inet:user, _copies, *, $edgeinfo)
+
+                $typeopts = ({"lower": true, "onespace": true})
+                $typeinfo = ({"doc": "A test type doc."})
+                $forminfo = ({"doc": "A test type form doc."})
+                $lib.model.ext.addType(_test:type, str, $typeopts, $typeinfo)
+                $lib.model.ext.addForm(_test:typeform, _test:type, ({}), $forminfo)
+                $lib.model.ext.addForm(_test:typearry, array, ({"type": "_test:type"}), $forminfo)
             ''')
 
             nodes = await core.nodes('[ _visi:int=10 :tick=20210101 ._woot=30 +#lol:score=99 ]')
@@ -39,6 +46,18 @@ class StormtypesModelextTest(s_test.SynTest):
             self.eq(nodes[0].ndef, ('test:int', 1234))
             self.eq(nodes[0].get('_tick'), 1609459200000)
 
+            nodes = await core.nodes('[_test:typeform="  FoO BaR  "]')
+            self.len(1, nodes)
+            self.eq(nodes[0].ndef, ('_test:typeform', 'foo bar'))
+
+            with self.raises(s_exc.DupTypeName):
+                q = '$lib.model.ext.addType(_test:type, str, ({}), ({}))'
+                await core.callStorm(q)
+
+            with self.raises(s_exc.DupTypeName):
+                q = '$lib.model.ext.addForm(_test:type, str, ({}), ({}))'
+                await core.callStorm(q)
+
             with self.raises(s_exc.DupPropName):
                 q = '''$lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), ({}))'''
                 await core.callStorm(q)
@@ -69,7 +88,7 @@ class StormtypesModelextTest(s_test.SynTest):
             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('_visi:int=10 test:int=1234 _test:typeform | delnode')
             await core.callStorm('''
                 $lib.model.ext.delTagProp(score, force=(true))
                 $lib.model.ext.delUnivProp(_woot, force=(true))
@@ -79,6 +98,22 @@ class StormtypesModelextTest(s_test.SynTest):
                 $lib.model.ext.delEdge(inet:user, _copies, *)
             ''')
 
+            with self.raises(s_exc.CantDelType) as cm:
+                await core.callStorm('$lib.model.ext.delType(_test:type)')
+            self.isin('still in use by other types', cm.exception.get('mesg'))
+
+            await core.callStorm('$lib.model.ext.delForm(_test:typeform)')
+
+            with self.raises(s_exc.CantDelType) as cm:
+                await core.callStorm('$lib.model.ext.delType(_test:type)')
+            self.isin('still in use by array types', cm.exception.get('mesg'))
+
+            await core.callStorm('$lib.model.ext.delForm(_test:typearry)')
+            await core.callStorm('$lib.model.ext.delType(_test:type)')
+
+            self.none(core.model.type('_test:type'))
+            self.none(core.model.form('_test:typeform'))
+            self.none(core.model.form('_test:typearry'))
             self.none(core.model.form('_visi:int'))
             self.none(core.model.prop('._woot'))
             self.none(core.model.prop('_visi:int:tick'))
@@ -100,6 +135,14 @@ class StormtypesModelextTest(s_test.SynTest):
             q = '''$lib.model.ext.addTagProp(some:_score, (int, ({})), ({}))'''
             self.none(await core.callStorm(q))
 
+            with self.raises(s_exc.BadTypeDef):
+                q = '$lib.model.ext.addType(test:type, str, ({}), ({}))'
+                await core.callStorm(q)
+
+            with self.raises(s_exc.BadTypeDef):
+                q = '$lib.model.ext.delType(test:type)'
+                await core.callStorm(q)
+
             with self.raises(s_exc.BadPropDef):
                 q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
                 $lib.model.ext.addFormProp('test:str', '_test:_my^prop', $l, $d)
@@ -158,6 +201,18 @@ class StormtypesModelextTest(s_test.SynTest):
                     $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
                 ''', opts=opts)
 
+            with self.raises(s_exc.AuthDeny) as cm:
+                await core.callStorm('''
+                    $lib.model.ext.addType(_test:type, str, ({}), ({}))
+                ''', opts=opts)
+            self.isin('permission model.type.add._test:type', cm.exception.get('mesg'))
+
+            with self.raises(s_exc.AuthDeny) as cm:
+                await core.callStorm('''
+                    $lib.model.ext.delType(_test:type)
+                ''', opts=opts)
+            self.isin('permission model.type.del._test:type', cm.exception.get('mesg'))
+
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
                     $propinfo = ({"doc": "A test prop doc."})
@@ -206,6 +261,10 @@ class StormtypesModelextTest(s_test.SynTest):
         # Add props which conflict with what was previously dumped
         async with self.getTestCore() as core:
             await core.callStorm('''
+                $typeopts = ({"lower": true})
+                $typeinfo = ({"doc": "A test type doc."})
+                $lib.model.ext.addType(_test:type, str, $typeopts, $typeinfo)
+
                 $typeinfo = ({})
                 $forminfo = ({"doc": "NEWP"})
                 $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
@@ -226,6 +285,11 @@ class StormtypesModelextTest(s_test.SynTest):
                 $lib.model.ext.addEdge(inet:user, _copies, *, $edgeinfo)
             ''')
 
+            q = '''return ($lib.model.ext.addExtModel($model_defs))'''
+            with self.raises(s_exc.BadTypeDef) as cm:
+                opts = {'vars': {'model_defs': {'types': model_defs['types']}}}
+                await core.callStorm(q, opts)
+
             q = '''return ($lib.model.ext.addExtModel($model_defs))'''
             with self.raises(s_exc.BadFormDef) as cm:
                 opts = {'vars': {'model_defs': {'forms': model_defs['forms']}}}
@@ -255,6 +319,9 @@ class StormtypesModelextTest(s_test.SynTest):
         async with self.getTestCore() as core:
             opts = {'vars': {'model_defs': model_defs}}
             q = '''
+            for ($name, $type, $opts, $info) in $model_defs.types {
+                $lib.model.ext.addType($name, $type, $opts, $info)
+            }
             for ($name, $type, $opts, $info) in $model_defs.forms {
                 $lib.model.ext.addForm($name, $type, $opts, $info)
             }
@@ -473,6 +540,14 @@ class StormtypesModelextTest(s_test.SynTest):
                 '$lib.model.ext.addForm(inet:fqdn, _foo:bar, ({}), ())',
                 'Form type info should be a dict.'
             ),
+            (
+                '$lib.model.ext.addType(_test:type, str, (guid, ()), ())',
+                'Type options should be a dict.'
+            ),
+            (
+                '$lib.model.ext.addType(_test:type, str, ({}), ())',
+                'Type info should be a dict.'
+            ),
             (
                 '$lib.model.ext.addFormProp(inet:fqdn, _foo:bar, ({}), ())',
                 'Form property type definitions should be a tuple.'

synapse/tests/test_lib_stormlib_scrape.py

@@ -105,14 +105,6 @@ class StormScrapeTest(s_test.SynTest):
             self.stormIsInPrint('inet:url=https://giggles.com/mallory.html', msgs)
             self.stormIsInPrint("'match': 'hzzps[:]\\\\giggles.com/mallory.html'", msgs)
 
-            with mock.patch('synapse.lib.scrape.SCRAPE_SPAWN_LENGTH', 0):
-                msgs = await core.stormlist(q, opts={'vars': {'text': text}})
-                self.stormIsInPrint('ps:name=alice', msgs)
-                self.stormIsInPrint('inet:fqdn=foo.bar.com', msgs)
-                self.stormIsInPrint('inet:url=https://1.2.3.4/alice.html', msgs)
-                self.stormIsInPrint('inet:url=https://giggles.com/mallory.html', msgs)
-                self.stormIsInPrint("'match': 'hzzps[:]\\\\giggles.com/mallory.html'", msgs)
-
             cq = '''$ret=$lib.list()
             for ($form, $valu) in $lib.scrape.ndefs($text) {
                 $ret.append(($form, $valu))

synapse/tests/test_lib_stormtypes.py

@@ -2342,7 +2342,7 @@ class StormTypesTest(s_test.SynTest):
                 path = pode[1]['path']
                 self.len(1, path)
                 key = list(path.keys())[0]
-                self.true(key.startswith("Node{(('inet:fqdn', 'vertex.link'), {'iden':"))
+                self.true(key.startswith('vertex.link'))
                 self.eq(('foo', 'bar'), path[key])
 
                 q = '''

synapse/tests/test_lib_trigger.py

@@ -264,6 +264,14 @@ class TrigTest(s_t_utils.SynTest):
                 await view.addTrigger(tdef)
             self.eq(pdef0.get('storm'), (await view.getTrigger(iden)).tdef.get('storm'))
 
+            with self.raises(s_exc.DupIden):
+                tdef = {'cond': 'node:add', 'storm': '[ +#dupiden ]', 'form': 'test:int', 'iden': view.iden}
+                await view.addTrigger(tdef)
+
+            with self.raises(s_exc.NoSuchIden):
+                await view.delTrigger(view.iden)
+            self.nn(core.auth.getAuthGate(view.iden))
+
             # Bad trigger parms
             with self.raises(s_exc.SchemaViolation):
                 await view.addTrigger({'cond': 'nocond', 'storm': 'test:int=4', 'form': 'test:str'})

synapse/tests/test_lib_view.py

@@ -905,3 +905,27 @@ class ViewTest(s_t_utils.SynTest):
 
             with self.raises(s_exc.BadState):
                 await core.callStorm('return($lib.view.get().insertParentFork().iden)')
+
+    async def test_view_children(self):
+
+        async with self.getTestCore() as core:
+
+            view00 = core.getView()
+            view01 = core.getView((await view00.fork())['iden'])
+            view02 = core.getView((await view01.fork())['iden'])
+            view03 = core.getView((await view01.fork())['iden'])
+
+            q = '''
+            $kids = ([])
+            for $child in $lib.view.get($iden).children() { $kids.append($child.iden) }
+            return($kids)
+            '''
+
+            opts = {'vars': {'iden': view00.iden}}
+            self.eq([view01.iden], await core.callStorm(q, opts=opts))
+
+            opts['vars']['iden'] = view01.iden
+            self.eq([view02.iden, view03.iden], await core.callStorm(q, opts=opts))
+
+            opts['vars']['iden'] = view02.iden
+            self.eq([], await core.callStorm(q, opts=opts))

synapse/tests/test_model_base.py

@@ -391,3 +391,14 @@ class BaseTest(s_t_utils.SynTest):
             for node in nodes:
                 form = core.model.form(node.ndef[1])
                 self.true(form.deprecated, msg=form)
+
+    async def test_model_aggregate(self):
+
+        async with self.getTestCore() as core:
+
+            nodes = await core.nodes('[ meta:aggregate=* :count=99 :type=bottles :time=20240202 ]')
+            self.len(1, nodes)
+            self.eq(99, nodes[0].get('count'))
+            self.eq('bottles.', nodes[0].get('type'))
+            self.eq(1706832000000, nodes[0].get('time'))
+            self.len(1, await core.nodes('meta:aggregate -> meta:aggregate:type:taxonomy'))

synapse/tests/test_model_files.py

@@ -638,3 +638,22 @@ class FileTest(s_t_utils.SynTest):
             self.eq(node.get('iconindex'), 1)
 
             self.len(1, await core.nodes('file:mime:lnk -> it:hostname'))
+
+    async def test_model_file_attachment(self):
+
+        async with self.getTestCore() as core:
+
+            nodes = await core.nodes('''
+                [ file:attachment=*
+                    :name=Foo/Bar.exe
+                    :text="foo bar"
+                    :file=*
+                ]
+            ''')
+            self.len(1, nodes)
+            self.nn(nodes[0].get('file'))
+            self.eq('foo bar', nodes[0].get('text'))
+            self.eq('foo/bar.exe', nodes[0].get('name'))
+
+            self.len(1, await core.nodes('file:attachment -> file:bytes'))
+            self.len(1, await core.nodes('file:attachment -> file:path'))

synapse/tests/test_model_inet.py

@@ -455,6 +455,8 @@ class InetModelTest(s_t_utils.SynTest):
                 :src:rdp:hostname=SYNCODER
                 :src:rdp:keyboard:layout=AZERTY
                 :raw=((10), (20))
+                :src:txfiles={[ file:attachment=* :name=foo.exe ]}
+                :dst:txfiles={[ file:attachment=* :name=bar.exe ]}
             )]'''
             nodes = await core.nodes(q, opts={'vars': {'valu': valu, 'p': props}})
             self.len(1, nodes)
@@ -501,6 +503,8 @@ class InetModelTest(s_t_utils.SynTest):
             self.len(2, await core.nodes('inet:flow -> crypto:x509:cert'))
             self.len(1, await core.nodes('inet:flow :src:ssh:key -> crypto:key'))
             self.len(1, await core.nodes('inet:flow :dst:ssh:key -> crypto:key'))
+            self.len(1, await core.nodes('inet:flow :src:txfiles -> file:attachment +:name=foo.exe'))
+            self.len(1, await core.nodes('inet:flow :dst:txfiles -> file:attachment +:name=bar.exe'))
 
     async def test_fqdn(self):
         formname = 'inet:fqdn'
@@ -3374,3 +3378,32 @@ class InetModelTest(s_t_utils.SynTest):
                 :channel -> inet:service:channel
                 +:name="/r/synapse"
             '''))
+
+            nodes = await core.nodes('''
+                [ inet:service:relationship=*
+                    :source={ inet:service:account:user=visi }
+                    :target={ inet:service:account:user=visi }
+                    :type=follows
+                ]
+            ''')
+            self.nn(nodes[0].get('source'))
+            self.nn(nodes[0].get('target'))
+            self.eq('follows.', nodes[0].get('type'))
+            self.len(1, await core.nodes('inet:service:relationship :source -> inet:service:account +:user=visi'))
+            self.len(1, await core.nodes('inet:service:relationship :target -> inet:service:account +:user=visi'))
+
+            nodes = await core.nodes('''
+                [ inet:service:emote=*
+                    :creator={ inet:service:account:user=visi }
+                    :about={[ it:dev:repo=* :name=vertex ]}
+                    :text=":gothparrot:"
+                ]
+            ''')
+            self.nn(nodes[0].get('about'))
+            self.nn(nodes[0].get('creator'))
+            self.eq(':gothparrot:', nodes[0].get('text'))
+            self.len(1, await core.nodes('inet:service:emote :about -> it:dev:repo +:name=vertex'))
+            self.len(1, await core.nodes('inet:service:emote :creator -> inet:service:account +:user=visi'))
+
+            with self.raises(s_exc.BadTypeValu):
+                await core.nodes('[ inet:service:relationship=* :source={[it:dev:str=foo]} ]')

synapse/tests/test_model_orgs.py

@@ -742,6 +742,32 @@ class OuModelTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('ou:enacted :ext:creator -> ps:contact +:name=root'))
             self.len(1, await core.nodes('ou:enacted :ext:assignee -> ps:contact +:name=visi'))
 
+            nodes = await core.nodes('''
+                [ ou:candidate=*
+                    :org={ ou:org:name=vertex | limit 1 }
+                    :contact={ ps:contact:name=visi | limit 1 }
+                    :intro="    Hi there!"
+                    :submitted=20241104
+                    :method=referral.employee
+                    :resume=*
+                    :opening=*
+                    :agent={[ ps:contact=* :name=agent ]}
+                    :recruiter={[ ps:contact=* :name=recruiter ]}
+                    :attachments={[ file:attachment=* :name=questions.pdf ]}
+                ]
+            ''')
+            self.len(1, nodes)
+            self.eq('Hi there!', nodes[0].get('intro'))
+            self.eq(1730678400000, nodes[0].get('submitted'))
+            self.eq('referral.employee.', nodes[0].get('method'))
+            self.len(1, await core.nodes('ou:candidate :org -> ou:org +:name=vertex'))
+            self.len(1, await core.nodes('ou:candidate :agent -> ps:contact +:name=agent'))
+            self.len(1, await core.nodes('ou:candidate :contact -> ps:contact +:name=visi'))
+            self.len(1, await core.nodes('ou:candidate :recruiter -> ps:contact +:name=recruiter'))
+
+            self.len(1, await core.nodes('ou:candidate :method -> ou:candidate:method:taxonomy'))
+            self.len(1, await core.nodes('ou:candidate :attachments -> file:attachment'))
+
     async def test_ou_code_prefixes(self):
         guid0 = s_common.guid()
         guid1 = s_common.guid()
@@ -839,16 +865,21 @@ class OuModelTest(s_t_utils.SynTest):
                 :sic="1234,5678"
                 :isic=C1393
                 :desc="Moldy cheese"
+                :reporter={[ ou:org=* :name=vertex ]}
+                :reporter:name=vertex
             ] '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
+            self.nn(nodes[0].get('reporter'))
             self.eq('foo bar', nodes[0].get('name'))
+            self.eq('vertex', nodes[0].get('reporter:name'))
             self.sorteq(('1234', '5678'), nodes[0].get('sic'))
             self.sorteq(('11111', '22222'), nodes[0].get('naics'))
             self.sorteq(('C1393', ), nodes[0].get('isic'))
             self.len(2, nodes[0].get('subs'))
             self.eq('Moldy cheese', nodes[0].get('desc'))
 
+            self.len(1, await core.nodes('ou:industry :reporter -> ou:org'))
             nodes = await core.nodes('ou:industry:name="foo bar" | tree { :subs -> ou:industry } | uniq')
             self.len(3, nodes)
             self.len(3, await core.nodes('ou:industryname=baz -> ou:industry -> ou:industryname'))
@@ -989,3 +1020,11 @@ class OuModelTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('ou:contribution -> econ:acct:payment'))
             self.len(1, await core.nodes('ou:contribution -> mat:spec'))
             self.len(1, await core.nodes('ou:contribution -> ou:jobtitle +ou:jobtitle=analysts'))
+
+    async def test_ou_technique(self):
+
+        async with self.getTestCore() as core:
+            nodes = await core.nodes('''
+                [ ou:technique=* :name=foo +(uses)> { [ risk:vuln=* :name=bar ] } ]
+            ''')
+            self.len(1, await core.nodes('ou:technique:name=foo -(uses)> risk:vuln:name=bar'))

synapse/tests/test_model_proj.py

@@ -334,7 +334,7 @@ class ProjModelTest(s_test.SynTest):
             self.true(await core.callStorm('return($lib.projects.del($proj))', opts=opts))
             self.false(await core.callStorm('return($lib.projects.del(newp))', opts=opts))
 
-            self.none(core.auth.getAuthGate(proj))
+            self.nn(core.auth.getAuthGate(proj))
 
             self.len(1, await core.nodes('yield $lib.projects.add(proj)'))
             self.len(1, await core.nodes('yield $lib.projects.get(proj).epics.add(epic)'))
@@ -345,6 +345,16 @@ class ProjModelTest(s_test.SynTest):
             name = await core.callStorm('$p=$lib.projects.get(proj) $p.name=newproj return ( $p.name )')
             self.eq(name, 'newproj')
 
+            viewiden = core.getView().iden
+            self.len(1, await core.nodes(f'[ proj:project={viewiden}]'))
+            gate = core.auth.getAuthGate(viewiden)
+            self.eq(gate.type, 'view')
+
+            await core.nodes(f'proj:project={viewiden} | delnode')
+            gate = core.auth.getAuthGate(viewiden)
+            self.nn(gate)
+            self.eq(gate.type, 'view')
+
     async def test_model_proj_attachment(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_model_risk.py

@@ -536,6 +536,31 @@ class RiskModelTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('risk:vuln:name=redtree -> risk:vulnerable :node -> *'))
             self.len(1, await core.nodes('risk:vulnerable -> risk:mitigation'))
 
+            nodes = await core.nodes('''
+                [ risk:outage=*
+                    :name="The Big One"
+                    :period=(2023, 2024)
+                    :type=service.power
+                    :cause=nature.earthquake
+                    :provider={[ ou:org=* :name="desert power" ]}
+                    :provider:name="desert power"
+                    :reporter={ ou:org:name=vertex }
+                    :reporter:name=vertex
+                ]
+            ''')
+            self.len(1, nodes)
+            self.nn(nodes[0].get('reporter'))
+            self.eq('the big one', nodes[0].get('name'))
+            self.eq('vertex', nodes[0].get('reporter:name'))
+            self.eq('desert power', nodes[0].get('provider:name'))
+            self.eq('service.power.', nodes[0].get('type'))
+            self.eq('nature.earthquake.', nodes[0].get('cause'))
+            self.eq((1672531200000, 1704067200000), nodes[0].get('period'))
+
+            self.len(1, await core.nodes('risk:outage -> risk:outage:cause:taxonomy'))
+            self.len(1, await core.nodes('risk:outage :reporter -> ou:org +:name=vertex'))
+            self.len(1, await core.nodes('risk:outage :provider -> ou:org +:name="desert power"'))
+
     async def test_model_risk_mitigation(self):
         async with self.getTestCore() as core:
             nodes = await core.nodes('''[
@@ -618,3 +643,10 @@ class RiskModelTest(s_t_utils.SynTest):
             self.nn(nodes[0].get('version:min'))
             self.nn(nodes[0].get('version:max'))
             self.len(2, await core.nodes('risk:vuln:name=woot -> risk:vuln:soft:range -> it:prod:softver'))
+
+    async def test_model_risk_vuln_technique(self):
+        async with self.getTestCore() as core:
+            nodes = await core.nodes('''
+                [ risk:vuln=* :name=foo <(uses)+ { [ ou:technique=* :name=bar ] } ]
+            ''')
+            self.len(1, await core.nodes('risk:vuln:name=foo <(uses)- ou:technique:name=bar'))

{synapse-2.187.0.dist-info → synapse-2.188.1.dist-info}/METADATA

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