add neonetwork.json

.github/workflows/roa.yml

@@ -32,6 +32,7 @@ jobs:
         python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf
         python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf
         python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json
+        python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json
 
     - name: Upload files
       env:

.github/workflows/test-your-pr.yml

@@ -33,3 +33,4 @@ jobs:
         python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf
         python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf
         python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json
+        python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json

asn/AS4242421037

@@ -1,3 +1,3 @@
 NAME="LibreHouse"
-OWNER="Out Vi"
+OWNER="LibreHouse"
 DESC=""

scripts/roa.py

@@ -5,47 +5,90 @@ from pathlib import Path
 from ipaddress import IPv4Network, IPv6Network
 from itertools import combinations
 
-def keyVal(line):
-    l = line.split('=')
-    assert l[0].strip()
-    if len(l) == 1:
-        l.append('')
-    repl_quotes = lambda t: t.replace('"', '').replace('\'', '')
-    return [l[0].strip(), '='.join([repl_quotes(i).strip() for i in l[1:]])]
 
-cwd = Path()
+class BashParser:
-assert not [d for d in ("asn", "route", "route6", "node") if not (cwd / d).is_dir()]
+    def __init__(self):
-
+        self.__pa = None # are we parsing bash array?
-def str2asn(s_asn):
+    def parseline(self, line):
-    s_asn = s_asn.lower()
+        repl_quotes = lambda t: t.replace('"', '').replace('\'', '')
-    if s_asn.startswith('as'):
+        line = line.strip()
-        s_asn = s_asn[2:]
+        if '=(' in line:
-    return int(s_asn)
+            self.__pa = (repl_quotes(line).split('=(')[0], list())
-
+            return None
-def get_asns():
+        if self.__pa:
-    asns = list()
+            if line:
-    for f in (cwd / "asn").iterdir():
+                if line.endswith(')'):
-        try:
+                    if line[:-1]:
-            if not f.is_file():
+                        self.__pa[1].append(repl_quotes(line[:-1]))
-                continue
+                    ret = self.__pa
-            assert f.name.lower().startswith('as')
+                    self.__pa = None
-            asns.append(int(f.name[2:]))
+                    return ret
-        except Exception:
+                else:
-            print("[!] Error while processing file", f)
+                    self.__pa[1].append(repl_quotes(line))
-            raise
+            return None
-    return asns
+        else:
-ASNS = get_asns()
+            if not line or line.startswith('#'):
+                return None
+            l = line.split('=')
+            assert len(l) >= 2
+            return [l[0], '='.join([repl_quotes(i) for i in l[1:]])]
+bp = BashParser()
 
 def shell2dict(shellscript):
     fc = dict()
     for line in shellscript.split('\n'):
-        l = line.strip()
+        r = bp.parseline(line)
-        if not l or l.startswith('#'):
+        if r:
-            continue
+            key, val = r
-        key, val = keyVal(l)
+            fc[key.lower()] = val
-        fc[key.lower()] = val.lower()
     return fc
 
+cwd = Path()
+assert not [d for d in ("asn", "route", "route6", "node", "people") if not (cwd / d).is_dir()]
+
+def str2asn(s_asn):
+    s_asn = s_asn.strip().lower()
+    if s_asn.startswith('as'):
+        s_asn = s_asn[2:]
+    return int(s_asn)
+
+
+def neoneo_get_people():
+    people = dict()
+    for f in (cwd / "people").iterdir():
+        try:
+            if not f.is_file():
+                continue
+            fc = shell2dict(f.read_text())
+            present_keys = ('name', 'desc', 'contact', 'babel')
+            assert f.name
+            people[f.name] = {k: fc.get(k) for k in present_keys}
+            for v in people[f.name].values():
+                assert v is not None
+        except Exception:
+            print("[!] Error while processing file", f)
+            raise
+    return people
+PEOPLE = neoneo_get_people()
+
+def neonet_get_asns():
+    asns = dict()
+    for f in (cwd / "asn").iterdir():
+        try:
+            if not f.is_file():
+                continue
+            fc = shell2dict(f.read_text())
+            present_keys = ('name', 'owner', 'desc')
+            asns[str2asn(f.name)] = {k: fc.get(k) for k in present_keys}
+            assert fc.get('owner') in PEOPLE
+            for v in asns[str2asn(f.name)].values():
+                assert v is not None
+        except Exception:
+            print("[!] Error while processing file", f)
+            raise
+    return asns
+ASNS = neonet_get_asns()
+
 def node2asn():
     node_table = dict()
     for f in (cwd / "node").iterdir():
@@ -54,14 +97,14 @@ def node2asn():
                 continue
             fc = shell2dict(f.read_text())
             asn = str2asn(fc.get('asn'))
-            node_table[f.name.lower()] = asn
+            node_table[f.name] = asn
         except Exception:
             print("[!] Error while processing file", f)
             raise
     return node_table
 NODE_TABLE = node2asn()
 
-def route2roa(dirname, is_ipv6=False):
+def neonet_route2roa(dirname, is_ipv6=False):
     roa_entries = list()
     for f in (cwd / dirname).iterdir():
         try:
@@ -71,13 +114,13 @@ def route2roa(dirname, is_ipv6=False):
             nettype = IPv6Network if is_ipv6 else IPv4Network
             get_supernet = lambda s_net: None if not s_net else nettype(s_net, strict=True)
             roa_entries_key = ("asn", "prefix", "supernet")
-            if fc.get('type') in ('lo', 'subnet'):
+            if fc.get('type').lower() in ('lo', 'subnet'):
                 asn = str2asn(fc.get('as'))
                 assert asn in ASNS
                 route = f.name.replace(',', '/')
                 supernet = get_supernet(fc.get('supernet'))
                 roa_entries.append(dict(zip(roa_entries_key, [asn, nettype(route, strict=True), supernet])))
-            elif fc.get('type').startswith('tun'):
+            elif fc.get('type').lower().startswith('tun'):
                 assert NODE_TABLE[fc.get('downstream')] # extra check for downstream
                 asn = NODE_TABLE[fc.get('upstream')]
                 assert asn in ASNS
@@ -85,7 +128,7 @@ def route2roa(dirname, is_ipv6=False):
                 supernet = get_supernet(fc.get('supernet'))
                 roa_entries.append(dict(zip(roa_entries_key, [asn, nettype(route, strict=True), supernet])))
             else:
-                assert fc.get('type') in ('ptp',)
+                assert fc.get('type').lower() in ('ptp',)
         except Exception:
             print("[!] Error while processing file", f)
             raise
@@ -111,18 +154,19 @@ if __name__ == "__main__":
     parser.add_argument('-o', '--output', default='', help='write output to file')
     parser.add_argument('-4', '--ipv4', action='store_true', help='print ipv4 only')
     parser.add_argument('-6', '--ipv6', action='store_true', help='print ipv6 only')
+    parser.add_argument('-e', '--export', action='store_true', help='export registry to json')
     args = parser.parse_args()
     if args.max < 0 or args.max6 < 0 or args.max > IPv4Network(0).max_prefixlen or args.max6 > IPv6Network(0).max_prefixlen:
         parser.error('check your max prefix length')
 
     roa4 = roa6 = list()
     if args.ipv4:
-        roa4 = route2roa('route')
+        roa4 = neonet_route2roa('route')
     elif args.ipv6:
-        roa6 = route2roa('route6', True)
+        roa6 = neonet_route2roa('route6', True)
     else:
-        roa4 = route2roa('route')
+        roa4 = neonet_route2roa('route')
-        roa6 = route2roa('route6', True)
+        roa6 = neonet_route2roa('route6', True)
 
     roa4 = [r for r in roa4 if r['prefix'].prefixlen <= args.max or r['prefix'].prefixlen == IPv4Network(0).max_prefixlen]
     roa6 = [r for r in roa6 if r['prefix'].prefixlen <= args.max6]
@@ -140,7 +184,25 @@ if __name__ == "__main__":
 
     output = ""
     VALID_KEYS = ('asn', 'prefix', 'maxLength')
-    if args.json:
+    if args.export:
+        import json, time
+        current = int(time.time())
+        # people has [asns], asn has [route]
+        d_output = {"metadata": {"generated": current, "valid": current+14*86400}, "people": dict()}
+        for asn, asi in ASNS.items():
+            as_route4 = list()
+            as_route6 = list()
+            for r in roa4:
+                if r['asn'] == asn:
+                    as_route4.append({k:v for k, v in r.items() if k in VALID_KEYS})
+            for r in roa6:
+                if r['asn'] == asn:
+                    as_route6.append({k:v for k, v in r.items() if k in VALID_KEYS})
+            owner = asi['owner']
+            peopledict = d_output['people'].setdefault(owner, {"info": PEOPLE[owner], "asns": list()})
+            peopledict['asns'].append({"asn": asn, "routes": {'ipv4': as_route4, 'ipv6': as_route6}})
+        output = json.dumps(d_output, indent=2)
+    elif args.json:
         import json, time
         current = int(time.time())
         d_output = {"metadata": {"counts": len(roa4)+len(roa6), "generated": current, "valid": current+14*86400}, "roas": list()}