X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2FBootAPI.py;h=b3bbffb8a3a1ecd8db72635808fd91aa8d6a39a0;hb=8acad258abfff20c890f6cc60aeee0049502a769;hp=8bb3c265088b4ee05e61921daea3e5174a45141a;hpb=8d36fdc99c333a60c78ccd1edcf94fea1bc56c7c;p=bootmanager.git

diff --git a/source/BootAPI.py b/source/BootAPI.py
index 8bb3c26..b3bbffb 100644
--- a/source/BootAPI.py
+++ b/source/BootAPI.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
@@ -27,36 +27,62 @@ def create_auth_structure( vars, call_params ):
     API call. Return None if unable to (typically due to missing
     keys in vars, such as node_id or node_key)
     """
-    
+
     auth= {}
-    auth['AuthMethod']= 'hmac'
 
-    try:
-        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(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 = {}
-        if not vars.has_key('SESSION'):
-            session = vars['API_SERVER_INST'].GetSession(auth)
+        auth_session['AuthMethod'] = 'session'
+
+        if not vars.has_key('NODE_SESSION'):
+            # Try to load /etc/planetlab/session if it exists.
+            sessionfile = open('/etc/planetlab/session', 'r')
+            session = sessionfile.read().strip()
+
             auth_session['session'] = session
-            vars['SESSION'] = session
+            # Test session.  Faults if it's no good.
+            vars['API_SERVER_INST'].AuthCheck(auth_session)
+            vars['NODE_SESSION'] = session
+
+            sessionfile.close()
         else:
-            auth_session['session'] = vars['SESSION']
-        auth_session['AuthMethod'] = 'session'
+            auth_session['session'] = vars['NODE_SESSION']
+
         auth = auth_session
-    except Exception, e:
-        print e
-        pass
-    print auth
+
+    except:
+        import traceback; traceback.print_exc()
+        auth['AuthMethod']= 'hmac'
+
+        try:
+            auth['node_id'] = vars['NODE_ID']
+            auth['node_ip'] = vars['INTERFACE_SETTINGS']['ip']
+        except KeyError, e:
+            return None
+
+        node_hmac= hmac.new(vars['NODE_KEY'], "[]".encode('utf-8'), sha).hexdigest()
+        auth['value']= node_hmac
+        try:
+            auth_session = {}
+            if not vars.has_key('NODE_SESSION'):
+                session = vars['API_SERVER_INST'].GetSession(auth)
+                auth_session['session'] = session
+                vars['NODE_SESSION'] = session
+                # NOTE: save session value to /etc/planetlab/session for 
+                # RunlevelAgent and future BootManager runs
+                sessionfile = open('/etc/planetlab/session', 'w')
+                sessionfile.write( vars['NODE_SESSION'] )
+                sessionfile.close()
+            else:
+                auth_session['session'] = vars['NODE_SESSION']
+
+            auth_session['AuthMethod'] = 'session'
+            auth = auth_session
+
+        except Exception, e:
+            print e
+            pass
+
     return auth