X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2FBootAPI.py;h=6d169678e1089e42d0afcb8c3a99eb5047c88fea;hb=8565e92aa528970527325a47a30e49cbec0214e1;hp=7d5a5cbef35ad699310c0d7e184152de596a9ab6;hpb=058804ef1dd26ffb3f230b9a93f1e170e6e87291;p=bootmanager.git

diff --git a/source/BootAPI.py b/source/BootAPI.py
index 7d5a5cb..6d16967 100644
--- a/source/BootAPI.py
+++ b/source/BootAPI.py
@@ -27,35 +27,61 @@ 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['INTERFACE_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 = {}
+        auth_session['AuthMethod'] = 'session'
+
         if not vars.has_key('NODE_SESSION'):
-            session = vars['API_SERVER_INST'].GetSession(auth)
+            # Try to load /etc/planetlab/session if it exists.
+            sessionfile = open('/etc/planetlab/session', 'r')
+            session = sessionfile.read().strip()
+
             auth_session['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['NODE_SESSION']
-        auth_session['AuthMethod'] = 'session'
+
         auth = auth_session
-    except Exception, e:
-        print e
-        pass
+
+    except:
+        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:
+            # NOTE: BM has failed to authenticate utterly.
+            raise BootManagerAuthenticationException, "%s" % e
+
     return auth