hmac auth seems to not work in some cases. switching to session auth.

diff --git a/source/BootAPI.py b/source/BootAPI.py
index 9565128..183838c 100644 (file)
--- a/source/BootAPI.py
+++ b/source/BootAPI.py
@@ -32,24 +32,28 @@ def create_auth_structure( vars, call_params ):
     auth['AuthMethod']= 'hmac'
 
     try:
-        network= vars['NETWORK_SETTINGS']
-        
-        auth['node_id']= vars['NODE_ID']
-        auth['node_ip']= network['ip']
-        node_key= vars['NODE_KEY']
+        auth['node_id'] = vars['NODE_ID']
+        auth['node_ip'] = vars['NETWORK_SETTINGS']['ip']
     except KeyError, e:
         return None
 
-    params= serialize_params(call_params)
-    params.sort()
-    msg= "[" + "".join(params) + "]"
-    node_hmac= hmac.new(node_key,msg.encode('utf-8'),sha).hexdigest()
+    #params= serialize_params(call_params)
+    #params.sort()
+    #msg= "[" + "".join(params) + "]"
+    #node_hmac= hmac.new(vars['NODE_KEY'], msg.encode('utf-8'), sha).hexdigest()
+    node_hmac= hmac.new(vars['NODE_KEY'], "[]".encode('utf-8'), sha).hexdigest()
     auth['value']= node_hmac
-
+    try:
+        auth_session = {}
+        auth_session['session'] = vars['API_SERVER_INST'].GetSession(auth)
+        auth_session['AuthMethod'] = 'session'
+        auth = auth_session
+    except Exception, e:
+        print e
+        pass
     return auth
 
 
-
 def serialize_params( call_params ):
     """
     convert a list of parameters into a format that will be used in the

diff --git a/source/debug_files/debug_root_ssh_key b/source/debug_files/debug_root_ssh_key
index 0f4105e..e0e68d1 100644 (file)
--- a/source/debug_files/debug_root_ssh_key
+++ b/source/debug_files/debug_root_ssh_key
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAs3jl1PRq97O4WKngafKUe4LTkQrKqgaHUj6sUKfC9KT40ek19jlzU2YWnuoaxEpSLks+Z0KPnSAIyZW5fnFYasIh9mrLSbY06d2Mor5919sCv9fIm/6QHq6gBiFjs50HITx53jWjeu/nmZeLOBsBtioLkNW2vBMQKHz6+q+wea2nh+YX3X5ZRpSp6znPR5fjaWzm0TEfA6oStUfsOIBds98XswghfT0GtWehG5FpPT/X9g7EObQKN/fzSSe1SdMSEMLPl+e0+KQ0+jB/pCULfSm9Qlw6I5cYQXwxKeT2tEPIcmLPe/U1hhoqGyaADo+a0OmCQ84yJ3obMNMWGH0uIQ== debug@planet-lab.org
+ssh-dss AAAAB3NzaC1kc3MAAAEBAKAUFdRRFdpS5GCp9AGKhhuxxJt73hvFMw5SXW4CVHByfC6FrXMTrE7a6U2tdyRUG5ljPE9fbBzXUEs7PvPrB7C/5lJuhuXpd3SY7KKaUa/Pa8R7S7jJx7+u/dlSCempyCXr/d0K/zVlC0jM1YeIyrbmRzg42mx5cB5mCFo9uKFf+JIm2dpL2ky/v9JWqRvArBJQ1pJcwL4gzUcVenRP4UnSZGGbxQGsHQpUcp2xde9BWojUQxqPUtxpkz9o1hs94d4PjInqLmUetn0K1PF0zJQTJVR+OSDB3hKfNMuzwds+0zVIJ5TWWhZ5OwPs46U0t5OPJmYrSFRuz/tbQCgcMI8AAAAVAOyBW4BaBeRN2pLXtrwxzCEVzjizAAABACozVBi3uoSf+BfzimsCXJono049Tr1lZODg0+piB5BP98Boe3r2wf0iO6bLis/EuCzoRYk+1J3j+TZwiyWsszkp4yoqmmvuhWTOdLuS9SPCksC28+GZj9W0clOINjQoF8SZxfgzdOYCOrm8KLC7ci8uZe6IwAdh8bHnMrwSaQUtiKZVJSWympl0Tg+WwXoE70oGPH86t5eBAUWAou/kEBSA3S+D8qYE+k6IpoPnJGgK5UygCnyfG/ONttUczk59fuB41EX1yZN7htgqdAAk9cPUkxAkGt/rNw9cAghUc6hHqTfHqmOIJLhXem21jT/wCGeFLNjtdhuD7pt6D+GP+poAAAEAfF431YPQOAnMDMczNFakRMVooVebc8BjSv53xGW8STwRAVcDPqzzT+QGCyx4JR0Rh6ksylcfptiADKs8H6/VZHQwgAtr743/S9EuwPH2qMQDIyn2P7vL5iwj94pMah3vuAfTNyu/Z0mh4fVRPgBeBKQ7Rh3OAk3wRMypIYTVrLJkkes4sctbhpFF2G+CE4tFdKHOpQ4LLLPIjEqrO8hZycXgSVO8IAgqu3o4vG1pklJugkHpmaMKY21TPgXHJ/9pv7VksBAtmTBEV2fQKh3lBZLuh0r8aaGKguH+N5CzCf2dAfrpiA4DhrFQJBUN+TpX0d8RIf443C6XIVqR2efXOA== faiyaza@houston