From fa740273bb706c20baf4e33bcfe5a7700c663299 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Wed, 8 Apr 2015 12:54:46 +0200 Subject: [PATCH 01/24] output nodelist.json --- backend.py | 5 +++++ lib/nodelist.py | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 lib/nodelist.py diff --git a/backend.py b/backend.py index 4bf9058..392d931 100755 --- a/backend.py +++ b/backend.py @@ -16,6 +16,7 @@ from lib import graph, nodes from lib.alfred import Alfred from lib.batman import Batman from lib.rrddb import RRD +from lib.nodelist import export_nodelist NODES_VERSION = 1 GRAPH_VERSION = 1 @@ -26,6 +27,7 @@ def main(params): nodes_fn = os.path.join(params['dest_dir'], 'nodes.json') graph_fn = os.path.join(params['dest_dir'], 'graph.json') + nodelist_fn = os.path.join(params['dest_dir'], 'nodelist.json') now = datetime.utcnow().replace(microsecond=0) @@ -128,6 +130,9 @@ def main(params): with open(graph_fn, 'w') as f: json.dump(graph_out, f) + with open(nodelist_fn, 'w') as f: + json.dump(export_nodelist(now, nodedb), f) + # optional rrd graphs (trigger with --rrd) if params['rrd']: script_directory = os.path.dirname(os.path.realpath(__file__)) diff --git a/lib/nodelist.py b/lib/nodelist.py new file mode 100644 index 0000000..15aea63 --- /dev/null +++ b/lib/nodelist.py @@ -0,0 +1,24 @@ +def export_nodelist(now, nodedb): + nodelist = list() + + for node_id, node in nodedb["nodes"].items(): + node_out = dict() + node_out["id"] = node_id + node_out["name"] = node["nodeinfo"]["hostname"] + + if "location" in node["nodeinfo"]: + node_out["position"] = {"lat": node["nodeinfo"]["location"]["latitude"], + "long": node["nodeinfo"]["location"]["longitude"]} + + node_out["status"] = dict() + node_out["status"]["online"] = node["flags"]["online"] + + if "lastseen" in node: + node_out["status"]["lastcontact"] = node["lastseen"] + + if "clients" in node["statistics"]: + node_out["status"]["clients"] = node["statistics"]["clients"] + + nodelist.append(node_out) + + return {"version": "1.0.1", "nodes": nodelist, "updated_at": now.isoformat()} From 9a652c429c465337dfaef3242d28061bc0efbeaa Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sun, 12 Apr 2015 12:07:48 +0200 Subject: [PATCH 02/24] README: use new --vpn syntax --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6cbd238..b0137fc 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Run `backend.py --help` for a quick overview of all available options. For the script's regular execution add the following to the crontab: 
-* * * * * /path/to/ffmap-backend/backend.py -d /path/to/output -a /path/to/aliases.json --vpn ae:7f:58:7d:6c:2a --vpn d2:d0:93:63:f7:da
+* * * * * backend.py -d /path/to/output -a /path/to/aliases.json --vpn ae:7f:58:7d:6c:2a d2:d0:93:63:f7:da
# Data format From 7322a14274984cde34252fd62431f45f664a8352 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Apr 2015 18:57:44 +0200 Subject: [PATCH 03/24] batman: prefix sudo for batctl if not executed as root depends on proper sudo rule, like: mapuser ALL = NOPASSWD: /usr/sbin/batctl --- lib/batman.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/batman.py b/lib/batman.py index 5c48740..17f4db3 100644 --- a/lib/batman.py +++ b/lib/batman.py @@ -1,5 +1,6 @@ import subprocess import json +import os import re @@ -46,8 +47,10 @@ class Batman(object): Parse "batctl -m gwl -n" into an array of dictionaries. """ - output = subprocess.check_output( - ['batctl', '-m', self.mesh_interface, 'gwl', '-n']) + cmd = ['batctl', '-m', self.mesh_interface, 'gwl', '-n'] + if os.geteuid() > 0: + cmd.insert(0, 'sudo') + output = subprocess.check_output(cmd) output_utf8 = output.decode('utf-8') rows = output_utf8.splitlines() @@ -73,8 +76,10 @@ class Batman(object): Parse "batctl -m gw" return: tuple mode, bandwidth, if mode != server then bandwidth is None """ - output = subprocess.check_output( - ['batctl', '-m', self.mesh_interface, 'gw']) + cmd = ['batctl', '-m', self.mesh_interface, 'gw'] + if os.geteuid() > 0: + cmd.insert(0, 'sudo') + output = subprocess.check_output(cmd) chunks = output.decode("utf-8").split() return chunks[0], chunks[3] if 3 in chunks else None From 6f97932ea29c06e03cdda72f8df626005f1f1daa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Apr 2015 19:13:22 +0200 Subject: [PATCH 04/24] README.md: add instructions to run under unprivileged user --- README.md | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b0137fc..a3781ea 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ ffmap-backend gathers information on the batman network by invoking : * alfred-json and * batadv-vis -In order to use alfred-json and batadv-vis make sure the user running this -backend is allowed to access alfred's socket. - The output will be written to a directory (`-d output`). Run `backend.py --help` for a quick overview of all available options. @@ -21,6 +18,32 @@ For the script's regular execution add the following to the crontab: * * * * * backend.py -d /path/to/output -a /path/to/aliases.json --vpn ae:7f:58:7d:6c:2a d2:d0:93:63:f7:da +# Running as unprivileged user + +Some information collected by ffmap-backend requires access to specific system resources. + +Make sure the user you are running this under is part of the group that owns the alfred socket, so +alfred-json can access the alfred daemon. + + # ls -al /var/run/alfred.sock + srw-rw---- 1 root alfred 0 Mar 19 22:00 /var/run/alfred.sock= + # adduser map alfred + Adding user `map' to group `alfred' ... + Adding user map to group alfred + Done. + $ groups + map alfred + +Running batctl requires passwordless sudo access, because it needs to access the debugfs to retrive +the gateway list. + + # echo 'map ALL = NOPASSWD: /usr/sbin/batctl' | tee /etc/sudoers.d/map + map ALL = NOPASSWD: /usr/sbin/batctl + # chmod 0440 /etc/sudoers.d/map + +That should be everything. The script automatically detects if it is run in unprivileged mode and +will prefix `sudo` where necessary. + # Data format ## nodes.json From 3ec0874b774b29e3bdbc10102b8650f6c97a7d91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Apr 2015 19:26:45 +0200 Subject: [PATCH 05/24] Update --aliases (-a) switch to use nargs=+ This breaks calls with multiple --aliases params specified and introduces --aliases FILE1 FILE2 FILE3 [...] instead --- backend.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend.py b/backend.py index 392d931..7cd6630 100755 --- a/backend.py +++ b/backend.py @@ -147,8 +147,7 @@ if __name__ == '__main__': parser.add_argument('-a', '--aliases', help='Read aliases from FILE', - default=[], action='append', - metavar='FILE') + nargs='+', metavar='FILE') parser.add_argument('-m', '--mesh', default=['bat0'], nargs='+', help='Use given batman-adv mesh interface(s) (defaults' From 1ee17c04404e0bbf42536a1f3906b5576edb0545 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Apr 2015 19:38:21 +0200 Subject: [PATCH 06/24] partially revert 3ec0874b774b29e3bdbc10102b8650f6c97a7d91 --- backend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend.py b/backend.py index 7cd6630..685c606 100755 --- a/backend.py +++ b/backend.py @@ -147,7 +147,7 @@ if __name__ == '__main__': parser.add_argument('-a', '--aliases', help='Read aliases from FILE', - nargs='+', metavar='FILE') + nargs='+', default=[], metavar='FILE') parser.add_argument('-m', '--mesh', default=['bat0'], nargs='+', help='Use given batman-adv mesh interface(s) (defaults' From dfcb9a39408620ce8cc7648a0b4e359277de2b00 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Apr 2015 19:50:21 +0200 Subject: [PATCH 07/24] batman: ensure /usr/sbin and /usr/local/sbin are in PATH --- lib/batman.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/batman.py b/lib/batman.py index 17f4db3..ee0a0fe 100644 --- a/lib/batman.py +++ b/lib/batman.py @@ -13,6 +13,14 @@ class Batman(object): self.mesh_interface = mesh_interface self.alfred_sock = alfred_sockpath + # ensure /usr/sbin and /usr/local/sbin are in PATH + env = os.environ + path = set(env['PATH'].split(':')) + path.add('/usr/sbin/') + path.add('/usr/local/sbin') + env['PATH'] = ':'.join(path) + self.environ = env + # compile regular expressions only once on startup self.mac_addr_pattern = re.compile(r'(([a-z0-9]{2}:){5}[a-z0-9]{2})') @@ -38,7 +46,7 @@ class Batman(object): cmd = ['batadv-vis', '-i', self.mesh_interface, '-f', 'json'] if self.alfred_sock: cmd.extend(['-u', self.alfred_sock]) - output = subprocess.check_output(cmd) + output = subprocess.check_output(cmd, env=self.environ) lines = output.splitlines() return self.vis_data_helper(lines) @@ -50,7 +58,7 @@ class Batman(object): cmd = ['batctl', '-m', self.mesh_interface, 'gwl', '-n'] if os.geteuid() > 0: cmd.insert(0, 'sudo') - output = subprocess.check_output(cmd) + output = subprocess.check_output(cmd, env=self.environ) output_utf8 = output.decode('utf-8') rows = output_utf8.splitlines() @@ -79,7 +87,7 @@ class Batman(object): cmd = ['batctl', '-m', self.mesh_interface, 'gw'] if os.geteuid() > 0: cmd.insert(0, 'sudo') - output = subprocess.check_output(cmd) + output = subprocess.check_output(cmd, env=self.environ) chunks = output.decode("utf-8").split() return chunks[0], chunks[3] if 3 in chunks else None From dccfb8c27a042320c35888441bf8f5cddc0cf0b6 Mon Sep 17 00:00:00 2001 From: Felix Oertel Date: Thu, 30 Apr 2015 17:37:19 +0200 Subject: [PATCH 08/24] [DOC] include dependencies --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index a3781ea..c1ac7dd 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,11 @@ For the script's regular execution add the following to the crontab: * * * * * backend.py -d /path/to/output -a /path/to/aliases.json --vpn ae:7f:58:7d:6c:2a d2:d0:93:63:f7:da +# Dependencies + +- Python Package [Networkx](https://networkx.github.io/) +- [alfred-json](https://github.com/tcatm/alfred-json) + # Running as unprivileged user Some information collected by ffmap-backend requires access to specific system resources. From 1835abac7f78f490b5c65fba48e1beaf16e7c5a1 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sun, 3 May 2015 13:11:22 +0200 Subject: [PATCH 09/24] basic nodeinfo validation (location) --- backend.py | 7 +++++-- lib/validate.py | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 lib/validate.py diff --git a/backend.py b/backend.py index 685c606..f638049 100755 --- a/backend.py +++ b/backend.py @@ -17,6 +17,7 @@ from lib.alfred import Alfred from lib.batman import Batman from lib.rrddb import RRD from lib.nodelist import export_nodelist +from lib.validate import validate_nodeinfos NODES_VERSION = 1 GRAPH_VERSION = 1 @@ -76,13 +77,15 @@ def main(params): # integrate alfred nodeinfo for alfred in alfred_instances: - nodes.import_nodeinfo(nodedb['nodes'], alfred.nodeinfo(), + nodeinfo = validate_nodeinfos(alfred.nodeinfo()) + nodes.import_nodeinfo(nodedb['nodes'], nodeinfo, now, assume_online=True) # integrate static aliases data for aliases in params['aliases']: with open(aliases, 'r') as f: - nodes.import_nodeinfo(nodedb['nodes'], json.load(f), + nodeinfo = validate_nodeinfos(json.load(f)) + nodes.import_nodeinfo(nodedb['nodes'], nodeinfo, now, assume_online=False) nodes.reset_statistics(nodedb['nodes']) diff --git a/lib/validate.py b/lib/validate.py new file mode 100644 index 0000000..eb6c11f --- /dev/null +++ b/lib/validate.py @@ -0,0 +1,19 @@ +import json + + +def validate_nodeinfos(nodeinfos): + result = [] + + for nodeinfo in nodeinfos: + if validate_nodeinfo(nodeinfo): + result.append(nodeinfo) + + return result + + +def validate_nodeinfo(nodeinfo): + if 'location' in nodeinfo: + if 'latitude' not in nodeinfo['location'] or 'longitude' not in nodeinfo['location']: + return False + + return True From 1141aa766f245ac70e59ad0c33bef51be93c3125 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sun, 3 May 2015 13:16:26 +0200 Subject: [PATCH 10/24] nodes.py: catch ZeroDivisionError in statistics --- lib/nodes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/nodes.py b/lib/nodes.py index 93d3835..4ff1fdc 100644 --- a/lib/nodes.py +++ b/lib/nodes.py @@ -59,7 +59,7 @@ def import_statistics(nodes, stats): node['statistics'][target] = f(reduce(dict.__getitem__, source, statistics)) - except (KeyError, TypeError): + except (KeyError, TypeError, ZeroDivisionError): pass macs = build_mac_table(nodes) From 3caf00be0765a875af0c78c483a2a07db026655f Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sat, 9 May 2015 21:54:54 +0200 Subject: [PATCH 11/24] extract VPN interfaces from nodeinfo --- backend.py | 13 +++++++++++++ lib/nodes.py | 27 ++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/backend.py b/backend.py index f638049..3ea2f5d 100755 --- a/backend.py +++ b/backend.py @@ -120,6 +120,19 @@ def main(params): if params['vpn']: graph.mark_vpn(batadv_graph, frozenset(params['vpn'])) + def extract_tunnel(nodes): + macs = set() + for id, node in nodes.items(): + try: + for mac in node["nodeinfo"]["network"]["mesh"]["bat0"]["interfaces"]["tunnel"]: + macs.add(mac) + except KeyError: + pass + + return macs + + graph.mark_vpn(batadv_graph, extract_tunnel(nodedb['nodes'])) + batadv_graph = graph.merge_nodes(batadv_graph) batadv_graph = graph.to_undirected(batadv_graph) diff --git a/lib/nodes.py b/lib/nodes.py index 4ff1fdc..d9543a8 100644 --- a/lib/nodes.py +++ b/lib/nodes.py @@ -97,12 +97,29 @@ def import_mesh_ifs_vis_data(nodes, vis_data): for v in mesh_nodes: node = v[0] - try: - mesh_ifs = set(node['nodeinfo']['network']['mesh_interfaces']) - except KeyError: - mesh_ifs = set() + ifs = set() - node['nodeinfo']['network']['mesh_interfaces'] = list(mesh_ifs | v[1]) + try: + ifs = ifs.union(set(node['nodeinfo']['network']['mesh_interfaces'])) + except KeyError: + pass + + try: + ifs = ifs.union(set(node['nodeinfo']['network']['mesh']['bat0']['interfaces']['wireless'])) + except KeyError: + pass + + try: + ifs = ifs.union(set(node['nodeinfo']['network']['mesh']['bat0']['interfaces']['tunnel'])) + except KeyError: + pass + + try: + ifs = ifs.union(set(node['nodeinfo']['network']['mesh']['bat0']['interfaces']['other'])) + except KeyError: + pass + + node['nodeinfo']['network']['mesh_interfaces'] = list(ifs | v[1]) def import_vis_clientcount(nodes, vis_data): From 8fd0b73418b954d0ccbe44f8ad0d02103464efb1 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sat, 9 May 2015 22:04:45 +0200 Subject: [PATCH 12/24] remove dependency on mesh_interfaces --- lib/nodes.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lib/nodes.py b/lib/nodes.py index d9543a8..2d0769d 100644 --- a/lib/nodes.py +++ b/lib/nodes.py @@ -11,6 +11,25 @@ def build_mac_table(nodes): macs[mac] = node_id except KeyError: pass + + try: + for mac in node['nodeinfo']['network']['mesh']['bat0']['interfaces']['wireless']: + macs[mac] = node_id + except KeyError: + pass + + try: + for mac in node['nodeinfo']['network']['mesh']['bat0']['interfaces']['tunnel']: + macs[mac] = node_id + except KeyError: + pass + + try: + for mac in node['nodeinfo']['network']['mesh']['bat0']['interfaces']['other']: + macs[mac] = node_id + except KeyError: + pass + return macs From dafad3df4ca9224e46dac429dc797db14cdc38ac Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sat, 9 May 2015 22:16:44 +0200 Subject: [PATCH 13/24] update aliases.json_sample --- aliases.json_sample | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/aliases.json_sample b/aliases.json_sample index ca1eb6b..db35900 100644 --- a/aliases.json_sample +++ b/aliases.json_sample @@ -7,18 +7,30 @@ "latitude": 53.86 }, "network": { - "mesh_interfaces": [ - "00:25:86:e6:f1:bf" - ] + "mesh": { + "bat0": { + "interfaces": { + "tunnel": [ + "00:25:86:e6:f1:bf" + ] + } + } + } } }, { "node_id": "gw1", "hostname": "burgtor", "network": { - "mesh_interfaces": [ - "52:54:00:f3:62:d9" - ] + "mesh": { + "bat0": { + "interfaces": { + "tunnel": [ + "52:54:00:f3:62:d9" + ] + } + } + } } } ] From 71ced22b0f02c9be53a22647302a0205205beba1 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Fri, 15 May 2015 18:20:49 +0200 Subject: [PATCH 14/24] README.md: Extend dependencies --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c1ac7dd..809f393 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,10 @@ For the script's regular execution add the following to the crontab: # Dependencies -- Python Package [Networkx](https://networkx.github.io/) +- Python 3 +- Python 3 Package [Networkx](https://networkx.github.io/) - [alfred-json](https://github.com/tcatm/alfred-json) +- rrdtool (if run with `--with-rrd`) # Running as unprivileged user From 11ef32178d0b3d4f6cd9ac28123278efedc41c79 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sat, 16 May 2015 09:38:23 +0200 Subject: [PATCH 15/24] Added jq filter to convert new format to old format This makes it easily possible to continue using the legacy ffmap-d3 front end with the new backend while migrating. --- README.md | 15 +++++++++++++++ ffmap-d3.jq | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 ffmap-d3.jq diff --git a/README.md b/README.md index 809f393..c345bb3 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,21 @@ will prefix `sudo` where necessary. - online - gateway +## Old data format + +If you want to still use the old [ffmap-d3](https://github.com/ffnord/ffmap-d3) +front end, you can use the file `ffmap-d3.jq` to convert the new output to the +old one: + +``` +jq -n -f ffmap-d3.jq \ + --argfile nodes nodedb/nodes.json \ + --argfile graph nodedb/graph.json \ + > nodedb/ffmap-d3.json +``` + +Then point your ffmap-d3 instance to the `ffmap-d3.json` file. + # Removing owner information If you'd like to redact information about the node owner from `nodes.json`, diff --git a/ffmap-d3.jq b/ffmap-d3.jq new file mode 100644 index 0000000..ebeece1 --- /dev/null +++ b/ffmap-d3.jq @@ -0,0 +1,52 @@ +{ + "meta": { + "timestamp": $nodes.timestamp + }, + "nodes": ( + $graph.batadv.nodes + | map( + if has("node_id") and .node_id + then ( + $nodes.nodes[.node_id] as $node + | { + "id": .id, + "uptime": $node.statistics.uptime, + "flags": ($node.flags + {"client": false}), + "name": $node.nodeinfo.hostname, + "clientcount": (if $node.statistics.clients >= 0 then $node.statistics.clients else 0 end), + "hardware": $node.nodeinfo.hardware.model, + "firmware": $node.nodeinfo.software.firmware.release, + "geo": (if $node.nodeinfo.location then [$node.nodeinfo.location.latitude, $node.nodeinfo.location.longitude] else null end), + #"lastseen": $node.lastseen, + "network": $node.nodeinfo.network + } + ) + else + { + "flags": {}, + "id": .id, + "geo": null, + "clientcount": 0 + } + end + ) + ), + "links": ( + $graph.batadv.links + | map( + $graph.batadv.nodes[.source].node_id as $source_id + | $graph.batadv.nodes[.target].node_id as $target_id + | select( + $source_id and $target_id and + ($nodes.nodes | (has($source_id) and has($target_id))) + ) + | { + "target": .target, + "source": .source, + "quality": "\(.tq), \(.tq)", + "id": ($source_id + "-" + $target_id), + "type": (if .vpn then "vpn" else null end) + } + ) + ) +} From 64dee31ebb030583b4dd374d39d62e2a53937458 Mon Sep 17 00:00:00 2001 From: stebifan Date: Sun, 7 Jun 2015 23:52:32 +0200 Subject: [PATCH 16/24] Added traffic to Statistics --- lib/nodes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/nodes.py b/lib/nodes.py index 2d0769d..3c0fa2f 100644 --- a/lib/nodes.py +++ b/lib/nodes.py @@ -92,6 +92,7 @@ def import_statistics(nodes, stats): add(node, stats, 'memory_usage', ['memory'], lambda d: 1 - d['free'] / d['total']) add(node, stats, 'rootfs_usage', ['rootfs_usage']) + add(node, stats, 'traffic', ['traffic']) def import_mesh_ifs_vis_data(nodes, vis_data): From b0b6f8e0cd47e57bf220dca09991b049bfb3ff6e Mon Sep 17 00:00:00 2001 From: kantorkel Date: Mon, 30 Nov 2015 19:45:14 +0100 Subject: [PATCH 17/24] status srv01 --- alfred_merge.py | 42 ++++++++++++++++++++++++++++++++++++++++++ backend.py | 7 +++---- lib/nodelist.py | 3 +++ lib/nodes.py | 21 ++++++++++++++++----- 4 files changed, 64 insertions(+), 9 deletions(-) create mode 100755 alfred_merge.py diff --git a/alfred_merge.py b/alfred_merge.py new file mode 100755 index 0000000..aa623b2 --- /dev/null +++ b/alfred_merge.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python3 +import subprocess +import json + +from collections import MutableMapping + +def rec_merge(d1, d2): + ''' + Update two dicts of dicts recursively, + if either mapping has leaves that are non-dicts, + the second's leaf overwrites the first's. + ''' + for k, v in d1.items(): # in Python 2, use .iteritems()! + if k in d2: + # this next check is the only difference! + if all(isinstance(e, MutableMapping) for e in (v, d2[k])): + d2[k] = rec_merge(v, d2[k]) + # we could further check types and merge as appropriate here. + d3 = d1.copy() + d3.update(d2) + return d3 + + +class alfred_merge: + def __init__(self,request_data_type_1 = 158, request_data_type_2 = 159): + self.request_data_type_1 = request_data_type_1 + self.request_data_type_2 = request_data_type_2 + + def aliases(self): + output = subprocess.check_output(["/usr/local/sbin/alfred-json","-z", "-r",str(self.request_data_type_1),"-f","json"]) + alfred_data_1 = json.loads(output.decode("utf-8")) + output = subprocess.check_output(["/usr/local/sbin/alfred-json","-z", "-r",str(self.request_data_type_2),"-f","json"]) + alfred_data_2 = json.loads(output.decode("utf-8")) + + return json.dumps(rec_merge(alfred_data_1, alfred_data_2)) + + +if __name__ == "__main__": + ad = alfred_merge() + al = ad.aliases() + print(al) + diff --git a/backend.py b/backend.py index 3ea2f5d..b2f38b7 100755 --- a/backend.py +++ b/backend.py @@ -84,9 +84,9 @@ def main(params): # integrate static aliases data for aliases in params['aliases']: with open(aliases, 'r') as f: - nodeinfo = validate_nodeinfos(json.load(f)) - nodes.import_nodeinfo(nodedb['nodes'], nodeinfo, - now, assume_online=False) +# nodeinfo = validate_nodeinfos(json.load(f)) + nodes.import_nodeinfo(nodedb['nodes'], json.load(f), + now, assume_online=False, statics=True) nodes.reset_statistics(nodedb['nodes']) for alfred in alfred_instances: @@ -157,7 +157,6 @@ def main(params): rrd.update_database(nodedb['nodes']) rrd.update_images() - if __name__ == '__main__': parser = argparse.ArgumentParser() diff --git a/lib/nodelist.py b/lib/nodelist.py index 15aea63..a931dcf 100644 --- a/lib/nodelist.py +++ b/lib/nodelist.py @@ -13,6 +13,9 @@ def export_nodelist(now, nodedb): node_out["status"] = dict() node_out["status"]["online"] = node["flags"]["online"] + if "firstseen" in node: + node_out["status"]["firstcontact"] = node["firstseen"] + if "lastseen" in node: node_out["status"]["lastcontact"] = node["lastseen"] diff --git a/lib/nodes.py b/lib/nodes.py index 3c0fa2f..f517438 100644 --- a/lib/nodes.py +++ b/lib/nodes.py @@ -56,12 +56,23 @@ def mark_online(node, now): node['flags']['online'] = True -def import_nodeinfo(nodes, nodeinfos, now, assume_online=False): +def overrideFields(dest, src, fields): + for field in fields: + if field in src: + dest[field] = src[field] + else: + dest.pop(field, None) + + +def import_nodeinfo(nodes, nodeinfos, now, assume_online=False, statics=False): for nodeinfo in filter(lambda d: 'node_id' in d, nodeinfos): - node = nodes.setdefault(nodeinfo['node_id'], {'flags': dict()}) - node['nodeinfo'] = nodeinfo - node['flags']['online'] = False - node['flags']['gateway'] = False + node = nodes.setdefault(nodeinfo['node_id'], {'flags': {'online': False, 'gateway': False}}) + + if statics: + node['nodeinfo'] = node.setdefault('nodeinfo', {}) + overrideFields(node['nodeinfo'], nodeinfo, ['hostname', 'location', 'node_id']) + else: + node['nodeinfo'] = nodeinfo if assume_online: mark_online(node, now) From 2043c88c03787cf7e17f7536981beafc2a30d735 Mon Sep 17 00:00:00 2001 From: kantorkel Date: Mon, 30 Nov 2015 20:00:15 +0100 Subject: [PATCH 18/24] fastd2aliases --- generate_aliases.py | 110 ++++++++++++++++++++++++++++++++++++++++++++ mkmap.sh | 6 +++ 2 files changed, 116 insertions(+) create mode 100755 generate_aliases.py create mode 100755 mkmap.sh diff --git a/generate_aliases.py b/generate_aliases.py new file mode 100755 index 0000000..98fe407 --- /dev/null +++ b/generate_aliases.py @@ -0,0 +1,110 @@ +#!/usr/bin/env python2 + +from __future__ import print_function + +import json +import os +import sys + +if len(sys.argv) != 2: + print('usage: ' + sys.argv[0] + ' /path/to/peers') + sys.exit(1) + +peersDir = sys.argv[1] + +def normalizeMac(mac): + mac = mac.lower() + normalized = '' + + n = 0 + + for c in mac: + if c != ':': + if n > 0 and n % 2 == 0: + normalized = normalized + ':' + normalized = normalized + c + n += 1 + + return normalized + +def toAlias(peer): + alias = {} + + if not (peer.has_key('name') and peer.has_key('mac')): + return None + + name = peer['name'] + mac = peer['mac'] + + alias['node_id'] = mac.replace(':', '') + alias['hostname'] = name + + if peer.has_key('geo'): + geo = peer['geo'] + + location = {} + + if geo.has_key('lon'): location['longitude'] = geo['lon'] + if geo.has_key('lat'): location['latitude'] = geo['lat'] + + alias['location'] = location + + #alias['network'] = {} + #alias['network']['mesh_interfaces'] = [mac] + + return alias + +aliases = [] + +for filename in os.listdir(peersDir): + if len(filename) == 0 or filename[0] == '.': + continue + + isGateway = False + + absFilename = peersDir + '/' + filename + if os.path.isfile(absFilename): + peerFile = open(absFilename, 'r') + try: + peerLines = peerFile.readlines() + peer = {} + + for line in peerLines: + parts = line.split() + + if len(parts) > 2: + if parts[1] == 'Knotenname:': + peer['name'] = parts[2] + + elif parts[0] == 'remote': + isGateway = True + + elif parts[1] == 'MAC:': + peer['mac'] = normalizeMac(parts[2]) + + elif parts[1] == 'Koordinaten:' and len(parts) > 3: + try: + peer['geo'] = {'lat': float(parts[2]), 'lon': float(parts[3])} + + except ValueError: + print('Error in %s: Invalid coordinates: %s' % (absFilename, parts[2:4]), file = sys.stderr) + + elif len(parts) == 2 and parts[0] == 'key': + keyParts = parts[1].split('"') + if len(keyParts) > 1: + peer['vpn'] = keyParts[1].lower() + + if isGateway: + continue + + alias = toAlias(peer) + if alias: + aliases.append(alias) + + except Exception as e: + print('Error in %s, ignoring peer: %s' % (absFilename, e), file = sys.stderr) + + finally: + peerFile.close() + +print(json.dumps(aliases)) diff --git a/mkmap.sh b/mkmap.sh new file mode 100755 index 0000000..cf85166 --- /dev/null +++ b/mkmap.sh @@ -0,0 +1,6 @@ +#!/bin/bash +PATH='/opt/ffmap-backend/' +PEERS="/etc/fastd/ffhh-mesh-vpn/peers" + +python2 $PATH/generate_aliases.py $PEERS > $PATH/aliases.json +python3 $PATH/backend.py -d /var/www/meshviewer/data/ -a $PATH/aliases.json --vpn de:ad:be:ff:01:01 From 793486ff65fcdd7ab6b17dc3d5ee36778740126c Mon Sep 17 00:00:00 2001 From: kantorkel Date: Tue, 1 Dec 2015 19:29:57 +0100 Subject: [PATCH 19/24] funktionierendes setup --- alfred_merge.py | 4 +-- gateway.json | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/alfred.py | 2 +- mkmap.sh | 6 ++-- 4 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 gateway.json diff --git a/alfred_merge.py b/alfred_merge.py index aa623b2..ee1143f 100755 --- a/alfred_merge.py +++ b/alfred_merge.py @@ -27,9 +27,9 @@ class alfred_merge: self.request_data_type_2 = request_data_type_2 def aliases(self): - output = subprocess.check_output(["/usr/local/sbin/alfred-json","-z", "-r",str(self.request_data_type_1),"-f","json"]) + output = subprocess.check_output(["/usr/local/bin/alfred-json","-z", "-r",str(self.request_data_type_1),"-f","json"]) alfred_data_1 = json.loads(output.decode("utf-8")) - output = subprocess.check_output(["/usr/local/sbin/alfred-json","-z", "-r",str(self.request_data_type_2),"-f","json"]) + output = subprocess.check_output(["/usr/local/bin/alfred-json","-z", "-r",str(self.request_data_type_2),"-f","json"]) alfred_data_2 = json.loads(output.decode("utf-8")) return json.dumps(rec_merge(alfred_data_1, alfred_data_2)) diff --git a/gateway.json b/gateway.json new file mode 100644 index 0000000..c7b0966 --- /dev/null +++ b/gateway.json @@ -0,0 +1,86 @@ +[ + { + "node_id": "deadbeef0101", + "hostname": "gw01", + "network": { + "mesh": { + "bat0": { + "interfaces": { + "tunnel": [ + "de:ad:be:ff:01:01", + "de:ad:bf:ff:01:01" + ] + } + } + } + } + }, + { + "node_id": "deadbeef0505", + "hostname": "gw02", + "network": { + "mesh": { + "bat0": { + "interfaces": { + "tunnel": [ + "de:ad:be:ff:05:05", + "de:ad:be:ff:05:06", + "de:ad:bf:ff:05:05" + ] + } + } + } + } + }, + { + "node_id": "deadbeef0303", + "hostname": "gw03", + "network": { + "mesh": { + "bat0": { + "interfaces": { + "tunnel": [ + "de:ad:be:ff:03:03", + "de:ad:bf:ff:03:03" + ] + } + } + } + } + }, + { + "node_id": "deadbfff2222", + "hostname": "gw05", + "network": { + "mesh": { + "bat0": { + "interfaces": { + "tunnel": [ + "de:ad:be:ff:22:22", + "de:ad:be:ff:22:23", + "de:ad:bf:ff:22:22" + ] + } + } + } + } + }, + { + "node_id": "deadbeef8888", + "hostname": "gw08", + "network": { + "mesh": { + "bat0": { + "interfaces": { + "tunnel": [ + "de:ad:be:ff:88:88", + "de:ad:be:ff:88:89", + "de:ad:bf:ff:88:88" + ] + } + } + } + } + } +] + diff --git a/lib/alfred.py b/lib/alfred.py index 4353874..531eaea 100644 --- a/lib/alfred.py +++ b/lib/alfred.py @@ -13,7 +13,7 @@ class Alfred(object): raise RuntimeError('alfred: invalid unix socket path given') def _fetch(self, data_type): - cmd = ['alfred-json', + cmd = ['/usr/local/bin/alfred-json', '-z', '-f', 'json', '-r', str(data_type)] diff --git a/mkmap.sh b/mkmap.sh index cf85166..b49f9a5 100755 --- a/mkmap.sh +++ b/mkmap.sh @@ -1,6 +1,6 @@ #!/bin/bash -PATH='/opt/ffmap-backend/' +FFMAPPATH='/opt/ffmap-backend/' PEERS="/etc/fastd/ffhh-mesh-vpn/peers" -python2 $PATH/generate_aliases.py $PEERS > $PATH/aliases.json -python3 $PATH/backend.py -d /var/www/meshviewer/data/ -a $PATH/aliases.json --vpn de:ad:be:ff:01:01 +python2 $FFMAPPATH/generate_aliases.py $PEERS > $FFMAPPATH/aliases.json +python3 $FFMAPPATH/backend.py -d /var/www/meshviewer/ --aliases $FFMAPPATH/aliases.json $FFMAPPATH/gateway.json -m bat0:/var/run/alfred.sock -p 30 --vpn de:ad:be:ff:01:01 --vpn de:ad:be:ff:05:05 --vpn de:ad:be:ff:05:06 --vpn de:ad:be:ff:03:03 --vpn de:ad:be:ff:22:22 --vpn de:ad:be:ff:22:23 --vpn de:ad:be:ff:88:88 --vpn de:ad:be:ff:88:89 --vpn de:ad:bf:ff:88:88 --vpn de:ad:bf:ff:22:22 --vpn de:ad:bf:ff:03:03 --vpn de:ad:bf:ff:05:05 --vpn de:ad:bf:ff:01:01 From 4b5bad262c11b1410a88f82f65dd68f19a7f2e46 Mon Sep 17 00:00:00 2001 From: kantorkel Date: Tue, 1 Dec 2015 21:44:45 +0100 Subject: [PATCH 20/24] =?UTF-8?q?node=5Fnumber.py=20fuer=20meta.hamburg.fr?= =?UTF-8?q?eifunk.net=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_number.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 node_number.py diff --git a/node_number.py b/node_number.py new file mode 100644 index 0000000..b965a01 --- /dev/null +++ b/node_number.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python +#Bibliotheken importieren +import time +import datetime +import json + +#Datei oeffnen +f = open('/var/www/meshviewer/nodelist.json') + +#JSON einlesen +data = json.load(f) + +#Nodes attribut aussortieren +nodes = data['nodes'] + +#Zaehler mit Wert 0 anlegen +num_nodes = 0 + +#Fuer jeden Knoten in nodes +for node in nodes: + #Status Attribut aussortieren + status = node['status'] + + #Wenn der Status online entaehlt, hochzaehlen + if status['online']: + num_nodes += 1 + +#Zeit holen +thetime = datetime.datetime.now().isoformat() + +ffhh = None + +#Freifunk API-Datei einladen und JSON lesen +with open('/var/www/meta/ffhh.json', 'r') as fp: + ffhh = json.load(fp) + +#Attribute Zeitstempel und Knotenanzahl setzen +ffhh['state']['lastchange'] = thetime +ffhh['state']['nodes'] = num_nodes + +#Freifunk API-Datein mit geaenderten werten schreiben +with open('/var/www/meta/ffhh.json', 'w') as fp: + json.dump(ffhh, fp, indent=2, separators=(',', ': ')) From 0c0fa78200e76d009980a03fd3237ecb4611ece9 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Fri, 16 Jun 2017 23:35:42 +0200 Subject: [PATCH 21/24] =?UTF-8?q?S=C3=BCd-Dom=C3=A4ne=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Von nodelist.json auf nodes.json gewechselt - nodes.json für Süd Domäne hinzugefügt - Liest nodes.json's nun aus URLs, da sie auf verschiedenen servern liegen - Durchsucht die nodes.json's nur noch als Strings, statt JSON auszuwerten --- node_number.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/node_number.py b/node_number.py index b965a01..765dc0f 100644 --- a/node_number.py +++ b/node_number.py @@ -3,27 +3,20 @@ import time import datetime import json +import urllib2 #Datei oeffnen -f = open('/var/www/meshviewer/nodelist.json') - -#JSON einlesen -data = json.load(f) - -#Nodes attribut aussortieren -nodes = data['nodes'] +Datei = urllib2.urlopen('https://map.hamburg.freifunk.net/nodes.json') +Datei_Sued = urllib2.urlopen('https://map.hamburg.freifunk.net/hhsued/mv1/nodes.json') #Zaehler mit Wert 0 anlegen num_nodes = 0 -#Fuer jeden Knoten in nodes -for node in nodes: - #Status Attribut aussortieren - status = node['status'] - - #Wenn der Status online entaehlt, hochzaehlen - if status['online']: - num_nodes += 1 +Text = Datei.read() +n = Text.count('"online": true') +Text = Datei_Sued.read() +n_Sued = Text.count('"online":true') +num_nodes = n + n_Sued #Zeit holen thetime = datetime.datetime.now().isoformat() From b343748fe8bc02632caded4039b79030f5f7909a Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Fri, 16 Jun 2017 23:41:11 +0200 Subject: [PATCH 22/24] code vereinfacht --- node_number.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/node_number.py b/node_number.py index 765dc0f..20cd00e 100644 --- a/node_number.py +++ b/node_number.py @@ -9,14 +9,10 @@ import urllib2 Datei = urllib2.urlopen('https://map.hamburg.freifunk.net/nodes.json') Datei_Sued = urllib2.urlopen('https://map.hamburg.freifunk.net/hhsued/mv1/nodes.json') -#Zaehler mit Wert 0 anlegen -num_nodes = 0 - Text = Datei.read() -n = Text.count('"online": true') +Knotenzahl = Text.count('"online": true') Text = Datei_Sued.read() -n_Sued = Text.count('"online":true') -num_nodes = n + n_Sued +Knotenzahl = Knotenzahl + Text.count('"online":true') #Zeit holen thetime = datetime.datetime.now().isoformat() @@ -29,7 +25,7 @@ with open('/var/www/meta/ffhh.json', 'r') as fp: #Attribute Zeitstempel und Knotenanzahl setzen ffhh['state']['lastchange'] = thetime -ffhh['state']['nodes'] = num_nodes +ffhh['state']['nodes'] = Knotenzahl #Freifunk API-Datein mit geaenderten werten schreiben with open('/var/www/meta/ffhh.json', 'w') as fp: From 209271cbf77e1127056abda96379088db339f3e6 Mon Sep 17 00:00:00 2001 From: Alexander Dietrich Date: Mon, 10 Jul 2017 21:48:25 +0200 Subject: [PATCH 23/24] Use tempfiles when updating JSON --- backend.py | 15 ++++++++++++--- mkmap.sh | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/backend.py b/backend.py index b2f38b7..74d3e52 100755 --- a/backend.py +++ b/backend.py @@ -27,8 +27,13 @@ def main(params): os.makedirs(params['dest_dir'], exist_ok=True) nodes_fn = os.path.join(params['dest_dir'], 'nodes.json') + tmp_nodes_fn = os.path.join(params['dest_dir'], 'nodes.json.tmp') + graph_fn = os.path.join(params['dest_dir'], 'graph.json') + tmp_graph_fn = os.path.join(params['dest_dir'], 'graph.json.tmp') + nodelist_fn = os.path.join(params['dest_dir'], 'nodelist.json') + tmp_nodelist_fn = os.path.join(params['dest_dir'], 'nodelist.json.tmp') now = datetime.utcnow().replace(microsecond=0) @@ -137,18 +142,22 @@ def main(params): batadv_graph = graph.to_undirected(batadv_graph) # write processed data to dest dir - with open(nodes_fn, 'w') as f: + with open(tmp_nodes_fn, 'w') as f: json.dump(nodedb, f) graph_out = {'batadv': json_graph.node_link_data(batadv_graph), 'version': GRAPH_VERSION} - with open(graph_fn, 'w') as f: + with open(tmp_graph_fn, 'w') as f: json.dump(graph_out, f) - with open(nodelist_fn, 'w') as f: + with open(tmp_nodelist_fn, 'w') as f: json.dump(export_nodelist(now, nodedb), f) + os.rename(tmp_nodes_fn, nodes_fn) + os.rename(tmp_graph_fn, graph_fn) + os.rename(tmp_nodelist_fn, nodelist_fn) + # optional rrd graphs (trigger with --rrd) if params['rrd']: script_directory = os.path.dirname(os.path.realpath(__file__)) diff --git a/mkmap.sh b/mkmap.sh index b49f9a5..2d9b0f6 100755 --- a/mkmap.sh +++ b/mkmap.sh @@ -3,4 +3,4 @@ FFMAPPATH='/opt/ffmap-backend/' PEERS="/etc/fastd/ffhh-mesh-vpn/peers" python2 $FFMAPPATH/generate_aliases.py $PEERS > $FFMAPPATH/aliases.json -python3 $FFMAPPATH/backend.py -d /var/www/meshviewer/ --aliases $FFMAPPATH/aliases.json $FFMAPPATH/gateway.json -m bat0:/var/run/alfred.sock -p 30 --vpn de:ad:be:ff:01:01 --vpn de:ad:be:ff:05:05 --vpn de:ad:be:ff:05:06 --vpn de:ad:be:ff:03:03 --vpn de:ad:be:ff:22:22 --vpn de:ad:be:ff:22:23 --vpn de:ad:be:ff:88:88 --vpn de:ad:be:ff:88:89 --vpn de:ad:bf:ff:88:88 --vpn de:ad:bf:ff:22:22 --vpn de:ad:bf:ff:03:03 --vpn de:ad:bf:ff:05:05 --vpn de:ad:bf:ff:01:01 +python3 $FFMAPPATH/backend.py -d /var/www/meshviewer/ --aliases $FFMAPPATH/aliases.json $FFMAPPATH/gateway.json -m bat0:/var/run/alfred.sock -p 30 --vpn de:ad:be:ff:01:01 --vpn de:ad:be:ff:05:05 --vpn de:ad:be:ff:05:06 --vpn de:ad:be:ff:03:03 --vpn de:ad:be:ff:22:22 --vpn de:ad:be:ff:22:23 --vpn de:ad:be:ff:88:88 --vpn de:ad:be:ff:88:89 --vpn de:ad:bf:ff:88:88 --vpn de:ad:bf:ff:22:22 --vpn de:ad:bf:ff:03:03 --vpn de:ad:bf:ff:05:05 --vpn de:ad:bf:ff:01:01 --vpn de:ad:be:fc:03:03 --vpn 00:16:3e:53:75:0d --vpn de:ad:be:fc:05:05 --vpn de:ad:be:fc:01:01 --vpn de:ad:be:ef:03:03 --vpn de:ad:be:ef:01:01 --vpn de:ad:be:ef:05:05 From 325f6cd1f4950174a73a83bdca571cff3d47c687 Mon Sep 17 00:00:00 2001 From: Alexander Dietrich Date: Mon, 10 Jul 2017 21:50:14 +0200 Subject: [PATCH 24/24] Support for "bat-ffhh" interface, add generate_aliases_v2.py --- backend.py | 3 +- gateway.json | 89 ++++++-------------------------- generate_aliases_v2.py | 112 +++++++++++++++++++++++++++++++++++++++++ lib/batman.py | 4 -- lib/graph.py | 1 - lib/nodes.py | 15 +++++- mkmap.sh | 3 +- node_number.py | 0 8 files changed, 146 insertions(+), 81 deletions(-) create mode 100755 generate_aliases_v2.py mode change 100644 => 100755 node_number.py diff --git a/backend.py b/backend.py index 74d3e52..8b9d9a6 100755 --- a/backend.py +++ b/backend.py @@ -102,7 +102,6 @@ def main(params): for batman in batman_instances: vd = batman.vis_data() gwl = batman.gateway_list() - mesh_info.append((vd, gwl)) # update nodedb from batman-adv data @@ -131,6 +130,8 @@ def main(params): try: for mac in node["nodeinfo"]["network"]["mesh"]["bat0"]["interfaces"]["tunnel"]: macs.add(mac) + for mac in node["nodeinfo"]["network"]["mesh"]["bat-ffhh"]["interfaces"]["tunnel"]: + macs.add(mac) except KeyError: pass diff --git a/gateway.json b/gateway.json index c7b0966..4a72859 100644 --- a/gateway.json +++ b/gateway.json @@ -1,86 +1,29 @@ [ { - "node_id": "deadbeef0101", - "hostname": "gw01", - "network": { - "mesh": { - "bat0": { - "interfaces": { - "tunnel": [ - "de:ad:be:ff:01:01", - "de:ad:bf:ff:01:01" - ] - } - } - } - } + "node_id": "deadbfff0101", + "hostname": "gw01" }, { "node_id": "deadbeef0505", - "hostname": "gw02", + "hostname": "gw02.hamburg.freifunk.net", "network": { - "mesh": { - "bat0": { - "interfaces": { - "tunnel": [ - "de:ad:be:ff:05:05", - "de:ad:be:ff:05:06", - "de:ad:bf:ff:05:05" - ] - } + "mac": "de:ad:be:ef:05:05", + "mesh": { + "bat0": { + "interfaces": { + "tunnel": [ + "de:ad:be:ff:05:05", + "de:ad:be:fc:05:05", + "de:ad:bf:ff:05:05" + ] + } + } } - } } }, { - "node_id": "deadbeef0303", - "hostname": "gw03", - "network": { - "mesh": { - "bat0": { - "interfaces": { - "tunnel": [ - "de:ad:be:ff:03:03", - "de:ad:bf:ff:03:03" - ] - } - } - } - } - }, - { - "node_id": "deadbfff2222", - "hostname": "gw05", - "network": { - "mesh": { - "bat0": { - "interfaces": { - "tunnel": [ - "de:ad:be:ff:22:22", - "de:ad:be:ff:22:23", - "de:ad:bf:ff:22:22" - ] - } - } - } - } - }, - { - "node_id": "deadbeef8888", - "hostname": "gw08", - "network": { - "mesh": { - "bat0": { - "interfaces": { - "tunnel": [ - "de:ad:be:ff:88:88", - "de:ad:be:ff:88:89", - "de:ad:bf:ff:88:88" - ] - } - } - } - } + "node_id": "00163efb9d8d", + "hostname": "gw03" } ] diff --git a/generate_aliases_v2.py b/generate_aliases_v2.py new file mode 100755 index 0000000..7a04c7c --- /dev/null +++ b/generate_aliases_v2.py @@ -0,0 +1,112 @@ +#!/usr/bin/env python2 + +from __future__ import print_function + +import json +import os +import sys + +if len(sys.argv) != 2: + print('usage: ' + sys.argv[0] + ' /path/to/peers') + sys.exit(1) + +peersDir = sys.argv[1] + +def normalizeMac(mac): + mac = mac.lower() + normalized = '' + + n = 0 + + for c in mac: + if c != ':': + if n > 0 and n % 2 == 0: + normalized = normalized + ':' + normalized = normalized + c + n += 1 + + return normalized + +def toAlias(peer): + alias = {} + + if not (peer.has_key('name') and peer.has_key('mac')): + return None + + name = peer['name'] + mac = peer['mac'] + + alias['node_id'] = mac.replace(':', '') + alias['hostname'] = name + + if peer.has_key('geo'): + geo = peer['geo'] + + location = {} + + if geo.has_key('lon'): location['longitude'] = geo['lon'] + if geo.has_key('lat'): location['latitude'] = geo['lat'] + + alias['location'] = location + + #alias['network'] = {} + #alias['network']['mesh_interfaces'] = [mac] + + return {'nodeinfo':alias} + +aliases = {} + +for filename in os.listdir(peersDir): + if len(filename) == 0 or filename[0] == '.': + continue + + isGateway = False + + absFilename = peersDir + '/' + filename + if os.path.isfile(absFilename): + peerFile = open(absFilename, 'r') + try: + peerLines = peerFile.readlines() + peer = {} + + for line in peerLines: + parts = line.split() + + if len(parts) > 2: + if parts[1] == 'Knotenname:': + peer['name'] = parts[2] + + elif parts[0] == 'remote': + isGateway = True + + elif parts[1] == 'MAC:': + peer['mac'] = normalizeMac(parts[2]) + + elif parts[1] == 'Koordinaten:' and len(parts) > 3: + try: + peer['geo'] = {'lat': float(parts[2]), 'lon': float(parts[3])} + + except ValueError: + print('Error in %s: Invalid coordinates: %s' % (absFilename, parts[2:4]), file = sys.stderr) + + elif len(parts) == 2 and parts[0] == 'key': + keyParts = parts[1].split('"') + if len(keyParts) > 1: + peer['vpn'] = keyParts[1].lower() + + if isGateway: + continue + + alias = toAlias(peer) + if alias: + tmpid = alias['nodeinfo']['node_id'] +# alias['nodeinfo'].pop('node_id') + aliases[tmpid] = alias + + except Exception as e: + print('Error in %s, ignoring peer: %s' % (absFilename, e), file = sys.stderr) + + finally: + peerFile.close() + +print(json.dumps(aliases)) diff --git a/lib/batman.py b/lib/batman.py index ee0a0fe..ee0198b 100644 --- a/lib/batman.py +++ b/lib/batman.py @@ -96,7 +96,3 @@ if __name__ == "__main__": bc = Batman() vd = bc.vis_data() gw = bc.gateway_list() - for x in vd: - print(x) - print(gw) - print(bc.gateway_mode()) diff --git a/lib/graph.py b/lib/graph.py index db1259e..2833e6e 100644 --- a/lib/graph.py +++ b/lib/graph.py @@ -25,7 +25,6 @@ def mark_vpn(graph, vpn_macs): components = map(frozenset, nx.weakly_connected_components(graph)) components = filter(vpn_macs.intersection, components) nodes = reduce(lambda a, b: a | b, components, set()) - for node in nodes: for k, v in graph[node].items(): v['vpn'] = True diff --git a/lib/nodes.py b/lib/nodes.py index f517438..86ce5b9 100644 --- a/lib/nodes.py +++ b/lib/nodes.py @@ -6,6 +6,10 @@ from functools import reduce def build_mac_table(nodes): macs = dict() for node_id, node in nodes.items(): + try: + macs[node['network']['mac']] = node_id + except KeyError: + pass try: for mac in node['nodeinfo']['network']['mesh_interfaces']: macs[mac] = node_id @@ -23,6 +27,11 @@ def build_mac_table(nodes): macs[mac] = node_id except KeyError: pass + try: + for mac in node['nodeinfo']['network']['mesh']['bat-ffhh']['interfaces']['tunnel']: + macs[mac] = node_id + except KeyError: + pass try: for mac in node['nodeinfo']['network']['mesh']['bat0']['interfaces']['other']: @@ -145,6 +154,11 @@ def import_mesh_ifs_vis_data(nodes, vis_data): except KeyError: pass + try: + ifs = ifs.union(set(node['nodeinfo']['network']['mesh']['bat-ffhh']['interfaces']['tunnel'])) + except KeyError: + pass + try: ifs = ifs.union(set(node['nodeinfo']['network']['mesh']['bat0']['interfaces']['other'])) except KeyError: @@ -166,7 +180,6 @@ def import_vis_clientcount(nodes, vis_data): def mark_gateways(nodes, gateways): macs = build_mac_table(nodes) gateways = filter(lambda d: d in macs, gateways) - for node in map(lambda d: nodes[macs[d]], gateways): node['flags']['gateway'] = True diff --git a/mkmap.sh b/mkmap.sh index 2d9b0f6..9423943 100755 --- a/mkmap.sh +++ b/mkmap.sh @@ -3,4 +3,5 @@ FFMAPPATH='/opt/ffmap-backend/' PEERS="/etc/fastd/ffhh-mesh-vpn/peers" python2 $FFMAPPATH/generate_aliases.py $PEERS > $FFMAPPATH/aliases.json -python3 $FFMAPPATH/backend.py -d /var/www/meshviewer/ --aliases $FFMAPPATH/aliases.json $FFMAPPATH/gateway.json -m bat0:/var/run/alfred.sock -p 30 --vpn de:ad:be:ff:01:01 --vpn de:ad:be:ff:05:05 --vpn de:ad:be:ff:05:06 --vpn de:ad:be:ff:03:03 --vpn de:ad:be:ff:22:22 --vpn de:ad:be:ff:22:23 --vpn de:ad:be:ff:88:88 --vpn de:ad:be:ff:88:89 --vpn de:ad:bf:ff:88:88 --vpn de:ad:bf:ff:22:22 --vpn de:ad:bf:ff:03:03 --vpn de:ad:bf:ff:05:05 --vpn de:ad:bf:ff:01:01 --vpn de:ad:be:fc:03:03 --vpn 00:16:3e:53:75:0d --vpn de:ad:be:fc:05:05 --vpn de:ad:be:fc:01:01 --vpn de:ad:be:ef:03:03 --vpn de:ad:be:ef:01:01 --vpn de:ad:be:ef:05:05 +#python3 $FFMAPPATH/backend.py -d /var/www/meshviewer/ --aliases $FFMAPPATH/aliases.json $FFMAPPATH/gateway.json -m bat0:/var/run/alfred.sock -p 30 --vpn de:ad:be:ff:01:01 --vpn de:ad:be:ff:05:05 --vpn de:ad:be:ff:05:06 --vpn de:ad:be:ff:03:03 --vpn de:ad:be:ff:22:22 --vpn de:ad:be:ff:22:23 --vpn de:ad:be:ff:88:88 --vpn de:ad:be:ff:88:89 --vpn de:ad:bf:ff:88:88 --vpn de:ad:bf:ff:22:22 --vpn de:ad:bf:ff:03:03 --vpn de:ad:bf:ff:05:05 --vpn de:ad:bf:ff:01:01 --vpn de:ad:be:fc:03:03 --vpn 00:16:3e:53:75:0d --vpn de:ad:be:fc:05:05 --vpn de:ad:be:fc:01:01 --vpn de:ad:be:ef:03:03 --vpn de:ad:be:ef:01:01 --vpn de:ad:be:ef:05:05 --vpn 00:16:3e:fb:9d:8d --vpn 00:16:3e:fb:9d:9d +python3 $FFMAPPATH/backend.py -d /var/www/meshviewer/ --aliases $FFMAPPATH/aliases.json $FFMAPPATH/gateway.json -m bat0:/var/run/alfred.sock -p 30 --vpn de:ad:be:ff:01:01 de:ad:be:ff:05:05 de:ad:be:ff:05:06 de:ad:be:ff:03:03 de:ad:be:ff:22:22 de:ad:be:ff:22:23 de:ad:be:ff:88:88 de:ad:be:ff:88:89 de:ad:bf:ff:88:88 de:ad:bf:ff:22:22 de:ad:bf:ff:03:03 de:ad:bf:ff:05:05 de:ad:bf:ff:01:01 de:ad:be:fc:03:03 00:16:3e:53:75:0d de:ad:be:fc:05:05 de:ad:be:fc:01:01 de:ad:be:ef:03:03 de:ad:be:ef:01:01 de:ad:be:ef:05:05 00:16:3e:fb:9d:8d 00:16:3e:fb:9d:9d diff --git a/node_number.py b/node_number.py old mode 100644 new mode 100755