checks person-key consistency as well

diff --git a/bin/spot-aliens.py b/bin/spot-aliens.py
index e05201d..a9c7c2a 100755 (executable)
--- a/bin/spot-aliens.py
+++ b/bin/spot-aliens.py
@@ -2,22 +2,32 @@
 
 all_sites=GetSites({},['peer_id','site_id','login_base','name'])
 all_nodes=GetNodes({},['peer_id','node_id','site_id','hostname'])
 
 all_sites=GetSites({},['peer_id','site_id','login_base','name'])
 all_nodes=GetNodes({},['peer_id','node_id','site_id','hostname'])

-all_persons=GetPersons({},['peer_id','person_id','site_ids','email'])
+all_persons=GetPersons({},['peer_id','person_id','site_ids','key_ids','email'])
+all_keys=GetKeys({},['peer_id','key_id'])

 
 site_hash=dict ( [ (site['site_id'],site) for site in all_sites ] )
 #node_hash=dict ( [ (node['node_id'],node) for node in all_nodes ] )
 #person_hash=dict ( [ (person['person_id'],person) for person in all_persons ] )
 
 site_hash=dict ( [ (site['site_id'],site) for site in all_sites ] )
 #node_hash=dict ( [ (node['node_id'],node) for node in all_nodes ] )
 #person_hash=dict ( [ (person['person_id'],person) for person in all_persons ] )

+key_hash=dict ( [ (key['key_id'],key) for key in all_keys ] )

 
 # nodes are expected to be in the same peer as their owning site
 for node in all_nodes:
     site=site_hash[node['site_id']]
     if node['peer_id'] != site['peer_id']: 
 
 # nodes are expected to be in the same peer as their owning site
 for node in all_nodes:
     site=site_hash[node['site_id']]
     if node['peer_id'] != site['peer_id']: 

-        print "NODE mismatch %r IN SITE %r"%(node,site)
+        print "NODE-SITE mismatch %r IN SITE %r"%(node,site)

 
 # same for persons
 for person in all_persons:
     for site_id in person['site_ids']:
         site=site_hash[site_id]
         if person['peer_id'] != site['peer_id']:
 
 # same for persons
 for person in all_persons:
     for site_id in person['site_ids']:
         site=site_hash[site_id]
         if person['peer_id'] != site['peer_id']:

-            print "PERSON mismatch %r IN SITE %r"%(person,site)
+            print "PERSON-SITE mismatch %r IN SITE %r"%(person,site)
+
+# persons and keys
+for person in all_persons:
+    for key_id in person['key_ids']:
+        key=key_hash[key_id]
+        if person['peer_id'] != key['peer_id']:
+            print "PERSON-KEY mismatch %r & KEY %r"%(person,key)
+