-# $Id$
-
import safexmlrpc
-import hmac, sha
+import hmac
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ import sha
import logger
class PLCAPI:
session => SessionAuth
To authenticate using the Boot Manager authentication method, or
- the new session-based method.
+ the new session-based method, respectively.
"""
def __init__(self, uri, cacert, auth, timeout = 90, **kwds):
def update_session(self, f="/usr/boot/plnode.txt"):
- # try authenticatipopulate /etc.planetlab/session
+ # try authenticatipopulate /etc.planetlab/session
def plnode(key):
try:
return [i[:-1].split('=') for i in open(f).readlines() if i.startswith(key)][0][1].strip('"')
open("/etc/planetlab/session", 'w').write(plc.GetSession().strip())
self.session = open("/etc/planetlab/session").read().strip()
-
+
def check_authentication(self):
authstatus = False
if self.key or self.session:
- try:
+ try:
authstatus = self.AuthCheck()
- except:
- logger.log_exc()
+ except:
+ logger.log_exc("plcapi: failed in plcapi.check_authentication")
return authstatus