From 1835abac7f78f490b5c65fba48e1beaf16e7c5a1 Mon Sep 17 00:00:00 2001
From: Nils Schneider <nils@nilsschneider.net>
Date: Sun, 3 May 2015 13:11:22 +0200
Subject: [PATCH] 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