Visi model 20250331 (#4216)

Co-authored-by: Cisphyx <[email protected]>

Author: invisig0th

changes/097fe55fd65056987f782f9f779e3250.yaml

@@ -0,0 +1,5 @@
+---
+desc: Added ``it:network:dns:resolvers`` to track DNS resolvers for a network.
+prs: []
+type: model
+...

changes/2818bb8ad6820cf69d477f8984d1cf8c.yaml

@@ -0,0 +1,5 @@
+---
+desc: Added ``tel:mob:tadig`` and ``tel:mob:carrier:tadig`` to track GSM carrier TADIG codes.
+prs: []
+type: model
+...

synapse/models/inet.py

@@ -108,12 +108,20 @@ def postTypeInit(self):
         s_types.Str.postTypeInit(self)
         self.setNormFunc(str, self._normPyStr)
 
+        self.defport = self.opts.get('defport', None)
+        self.defproto = self.opts.get('defproto', 'tcp')
+
     def _getPort(self, valu):
+
         parts = valu.split(':', 1)
         if len(parts) == 2:
             valu, port = parts
             port = self.modl.type('inet:port').norm(port)[0]
             return valu, port, f':{port}'
+
+        if self.defport:
+            return valu, self.defport, f':{self.defport}'
+
         return valu, None, ''
 
     def _normPyStr(self, valu):
@@ -123,7 +131,7 @@ def _normPyStr(self, valu):
         # no protos use case sensitivity yet...
         valu = valu.lower()
 
-        proto = 'tcp'
+        proto = self.defproto
         parts = valu.split('://', 1)
         if len(parts) == 2:
             proto, valu = parts

synapse/models/infotech.py

@@ -1296,6 +1296,11 @@ def getModelDefs(self):
                     ('net6', ('inet:net6', {}), {
                         'doc': 'The optional contiguous IPv6 address range of this network.'}),
 
+                    ('dns:resolvers', ('array', {'type': 'inet:server',
+                                                 'typeopts': {'defport': 53, 'defproto': 'udp'},
+                                                 'sorted': True, 'uniq': True}), {
+                        'doc': 'An array of DNS servers configured to resolve requests for hosts on the network.'})
+
                 )),
                 ('it:account', {}, (
                     ('user', ('inet:user', {}), {

synapse/models/telco.py

@@ -193,6 +193,11 @@ def getModelDefs(self):
                     'doc': 'A mobile cell site which a phone may connect to.'
                 }),
 
+                # TODO - eventually break out ISO-3 country code into a sub
+                # https://en.wikipedia.org/wiki/TADIG_code
+                ('tel:mob:tadig', ('str', {'regex': '^[A-Z0-9]{5}$', 'strip': True}), {
+                    'doc': 'A Transferred Account Data Interchange Group number issued to a GSM carrier.'}),
+
             ),
 
             'forms': (
@@ -322,6 +327,9 @@ def getModelDefs(self):
                     ('loc', ('loc', {}), {
                         'doc': 'Location the carrier operates from.'
                     }),
+
+                    ('tadig', ('tel:mob:tadig', {}), {
+                        'doc': 'The TADIG code issued to the carrier.'}),
                 )),
                 ('tel:mob:cell', {}, (
                     ('carrier', ('tel:mob:carrier', {}), {'doc': 'Mobile carrier.', 'ro': True, }),
@@ -340,6 +348,8 @@ def getModelDefs(self):
                         'doc': 'The place associated with the latlong property.'}),
                 )),
 
+                ('tel:mob:tadig', {}, ()),
+
                 ('tel:mob:telem', {}, (
 
                     ('time', ('time', {}), {}),

synapse/tests/test_model_infotech.py

@@ -398,6 +398,7 @@ async def test_infotech_basics(self):
                 :net6="fe80::0/64"
                 :org={ gen.ou.org "Vertex Project" }
                 :type=virtual.sdn
+                :dns:resolvers=(1.2.3.4, tcp://1.2.3.4:99)
             ]
             '''
             nodes = await core.nodes(q)
@@ -408,6 +409,7 @@ async def test_infotech_basics(self):
             self.eq(nodes[0].get('net4'), (167837696, 167903231))
             self.eq(nodes[0].get('net6'), ('fe80::', 'fe80::ffff:ffff:ffff:ffff'))
             self.eq(nodes[0].get('type'), 'virtual.sdn.')
+            self.eq(nodes[0].get('dns:resolvers'), ('tcp://1.2.3.4:99', 'udp://1.2.3.4:53'))
 
             nodes = await core.nodes('''[
                 it:sec:stix:indicator=*

synapse/tests/test_model_telco.py

@@ -56,14 +56,17 @@ async def test_telco_simple(self):
             self.eq(node.ndef, ('tel:mob:mcc', '611'))
             self.eq(node.get('loc'), 'gn')
 
-            nodes = await core.nodes('[(tel:mob:carrier=(001, 02) :org=$org :loc=us)]', opts={'vars': {'org': oguid}})
+            nodes = await core.nodes('[(tel:mob:carrier=(001, 02) :org=$org :loc=us :tadig=USAVX )]', opts={'vars': {'org': oguid}})
             self.len(1, nodes)
             node = nodes[0]
             self.eq(node.ndef, ('tel:mob:carrier', ('001', '02')))
             self.eq(node.get('mcc'), '001')
             self.eq(node.get('mnc'), '02')
             self.eq(node.get('org'), oguid)
             self.eq(node.get('loc'), 'us')
+            self.eq(node.get('tadig'), 'USAVX')
+
+            self.len(1, await core.nodes('tel:mob:carrier -> tel:mob:tadig'))
 
             q = '[(tel:mob:cell=((001, 02), 3, 4) :radio="Pirate " :place=$place :loc=us.ca.la :latlong=(0, 0))]'
             nodes = await core.nodes(q, opts={'vars': {'place': place}})