fixed json parsing of key nodes for 3+ users

Author: Michael Farb

safeslinger-demo/python/app.yaml

@@ -32,6 +32,10 @@ handlers:
 - url: /cron/cleanup
   script: cleanup.py
 
+- url: /favicon\.ico
+  static_files: static/images/favicon.ico
+  upload: static/images/favicon\.ico
+  
 - url: /.*
   script: main.py
   secure: always

safeslinger-demo/python/assignUser.py

@@ -97,6 +97,7 @@ def post(self):
         else:
             commit = data[4:]
         logging.debug("in commitment '%s'" % commit)
+        logging.debug("in commitment len '%s'" % commit.__sizeof__())
 
         # client version check
         if client < INT_VERCLIENT:

safeslinger-demo/python/syncKeyNodes.py

@@ -99,23 +99,23 @@ def post(self):
 
         expectedsize = 4 + 4
 
-        postKeyNodes = False
-        if size > expectedsize:
-            if self.isJson:
+        postSelf = False
+        if self.isJson:
+            if 'keynode_b64' in data_dict:
                 usridpost = int(data_dict['usridpost'], 10)
-            else:
-                usridpost = (struct.unpack("!i", data[8:12]))[0]
-            logging.debug("in usridpost %i" % usridpost)
-        
-            if self.isJson:
                 key_node = base64.decodestring(data_dict['keynode_b64'])
-            else:
+                postSelf = True
+        else:
+            if size > expectedsize:
+                usridpost = (struct.unpack("!i", data[8:12]))[0]
                 sizeData = (struct.unpack("!i", data[12:16]))[0]
                 logging.debug("in sizeData %i" % sizeData)
                 key_node = (struct.unpack(str(sizeData) + "s", data[16:16 + sizeData]))[0]            
+                postSelf = True
+        if postSelf:
+            logging.debug("in usridpost %i" % usridpost)
             logging.debug("in key_node '%s'" % key_node)
-            postKeyNodes = True
- 
+                   
         # client version check
         if client < INT_VERCLIENT:
             self.resp_simple(0, ('Client version mismatch; %s required.  Download latest client release first.' % STR_VERCLIENT))
@@ -131,7 +131,7 @@ def post(self):
             mem = query.get()
 
             # verify...
-            if postKeyNodes:
+            if postSelf:
                 query = member.Member.all()
                 query.filter('usr_id =', usridpost)
                 num = query.count()