# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Auth.py,v 1.11 2007/01/11 05:28:21 mlhuang Exp $
+# $Id$
+# $URL$
#
import crypt
-import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ import sha
import hmac
import time
+import os
from PLC.Faults import *
from PLC.Parameter import Parameter, Mixed
from PLC.Persons import Persons
from PLC.Nodes import Node, Nodes
+from PLC.Interfaces import Interface, Interfaces
from PLC.Sessions import Session, Sessions
from PLC.Peers import Peer, Peers
from PLC.Boot import notify_owners
class Auth(Parameter):
"""
Base class for all API authentication methods, as well as a class
- that can be used to represent Mixed(SessionAuth(), PasswordAuth(),
- GPGAuth()), i.e. the three principal API authentication methods.
+ that can be used to represent all supported API authentication
+ methods.
"""
- def __init__(self, auth = {}):
+ def __init__(self, auth = None):
+ if auth is None:
+ auth = {'AuthMethod': Parameter(str, "Authentication method to use", optional = False)}
Parameter.__init__(self, auth, "API authentication structure")
def check(self, method, auth, *args):
- method.type_check("auth", auth,
- Mixed(SessionAuth(), PasswordAuth(), GPGAuth()),
- (auth,) + args)
+ global auth_methods
+
+ # Method.type_check() should have checked that all of the
+ # mandatory fields were present.
+ assert 'AuthMethod' in auth
+
+ if auth['AuthMethod'] in auth_methods:
+ expected = auth_methods[auth['AuthMethod']]()
+ else:
+ sm = "'" + "', '".join(auth_methods.keys()) + "'"
+ raise PLCInvalidArgument("must be " + sm, "AuthMethod")
+
+ # Re-check using the specified authentication method
+ method.type_check("auth", auth, expected, (auth,) + args)
class GPGAuth(Auth):
"""
for key in keys:
try:
from PLC.GPG import gpg_verify
- gpg_verify(method.name, args, auth['signature'], key)
+ gpg_verify(args, key, auth['signature'], method.name)
return
except PLCAuthenticationFailure, fault:
pass
person = persons[0]
if not set(person['roles']).intersection(method.roles):
- raise PLCAuthenticationFailure, "Not allowed to call method"
+ raise PLCPermissionDenied, "Not allowed to call method"
method.caller = persons[0]
# mandatory fields were present.
assert auth.has_key('node_id')
+ if 'node' not in method.roles:
+ raise PLCAuthenticationFailure, "Not allowed to call method"
+
try:
nodes = Nodes(method.api, {'node_id': auth['node_id'], 'peer_id': None})
if not nodes:
# on record for the node.
key = node['boot_nonce']
- nodenetwork = None
- if node['nodenetwork_ids']:
- nodenetworks = NodeNetworks(method.api, node['nodenetwork_ids'])
- for nodenetwork in nodenetworks:
- if nodenetwork['is_primary']:
+ interface = None
+ if node['interface_ids']:
+ interfaces = Interfaces(method.api, node['interface_ids'])
+ for interface in interfaces:
+ if interface['is_primary']:
break
-
- if not nodenetwork or not nodenetwork['is_primary']:
+
+ if not interface or not interface['is_primary']:
raise PLCAuthenticationFailure, "No primary network interface on record"
-
+
if method.source is None:
raise PLCAuthenticationFailure, "Cannot determine IP address of requestor"
- if nodenetwork['ip'] != method.source[0]:
- raise PLCAuthenticationFailure, "Requestor IP %s does not mach node IP %s" % \
- (method.source[0], nodenetwork['ip'])
+ if interface['ip'] != method.source[0]:
+ raise PLCAuthenticationFailure, "Requestor IP %s does not match node IP %s" % \
+ (method.source[0], interface['ip'])
else:
raise PLCAuthenticationFailure, "No node key or boot nonce"
# We encode in UTF-8 before calculating the HMAC, which is
# an 8-bit algorithm.
- digest = hmac.new(key, msg.encode('utf-8'), sha).hexdigest()
+ # python 2.6 insists on receiving a 'str' as opposed to a 'unicode'
+ digest = hmac.new(str(key), msg.encode('utf-8'), sha).hexdigest()
if digest != auth['value']:
raise PLCAuthenticationFailure, "Call could not be authenticated"
})
def check(self, method, auth, *args):
- # Sure, dude, whatever
- return True
+ if 'anonymous' not in method.roles:
+ raise PLCAuthenticationFailure, "Not allowed to call method anonymously"
+
+ method.caller = None
class PasswordAuth(Auth):
"""
def __init__(self):
Auth.__init__(self, {
- 'AuthMethod': Parameter(str, "Authentication method to use, typically 'password'", optional = False),
+ 'AuthMethod': Parameter(str, "Authentication method to use, always 'password' or 'capability'", optional = False),
'Username': Parameter(str, "PlanetLab username, typically an e-mail address", optional = False),
'AuthString': Parameter(str, "Authentication string, typically a password", optional = False),
})
assert auth.has_key('Username')
# Get record (must be enabled)
- persons = Persons(method.api, {'email': auth['Username'], 'enabled': True, 'peer_id': None})
+ persons = Persons(method.api, {'email': auth['Username'].lower(), 'enabled': True, 'peer_id': None})
if len(persons) != 1:
raise PLCAuthenticationFailure, "No such account"
raise PLCAuthenticationFailure, "Not allowed to call method"
method.caller = person
+
+auth_methods = {'session': SessionAuth,
+ 'password': PasswordAuth,
+ 'capability': PasswordAuth,
+ 'gpg': GPGAuth,
+ 'hmac': BootAuth,
+ 'hmac_dummybox': BootAuth,
+ 'anonymous': AnonymousAuth}
+
+path = os.path.dirname(__file__) + "/Auth.d"
+try:
+ extensions = os.listdir(path)
+except OSError, e:
+ extensions = []
+for extension in extensions:
+ if extension.startswith("."):
+ continue
+ if not extension.endswith(".py"):
+ continue
+ execfile("%s/%s" % (path, extension))
+del extensions
git://git.onelab.eu / plcapi.git / blobdiff