X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=api.py;h=0e51ba3cfe698617c5e74b4a883e99e9fd6b0e32;hb=refs%2Fheads%2F1.7;hp=8e8794ad2c741983a7308df4e3135d04e5c7432a;hpb=792d08a41a177761f077433cd5933550d196c4b0;p=nodemanager.git diff --git a/api.py b/api.py index 8e8794a..0e51ba3 100644 --- a/api.py +++ b/api.py @@ -17,6 +17,7 @@ import socket import struct import threading import xmlrpclib +import sys import accounts import database @@ -24,101 +25,18 @@ import logger import sliver_vs import ticket import tools - +from api_calls import * +try: + sys.path.append("/etc/planetlab") + from plc_config import * +except: + logger.log("api: Warning: Configuration file /etc/planetlab/plc_config.py not found", 2) + PLC_SLICE_PREFIX="pl" + logger.log("api: Warning: admin slice prefix set to %s" %(PLC_SLICE_PREFIX), 2) API_SERVER_PORT = 812 UNIX_ADDR = '/tmp/sliver_mgr.api' -deliver_ticket = None # set in sm.py:start() - -api_method_dict = {} -nargs_dict = {} - -def export_to_api(nargs): - def export(method): - nargs_dict[method.__name__] = nargs - api_method_dict[method.__name__] = method - return method - return export - - -@export_to_api(0) -def Help(): - """Help(): get help""" - return ''.join([method.__doc__ + '\n' for method in api_method_dict.itervalues()]) - -@export_to_api(1) -def Ticket(tkt): - """Ticket(tkt): deliver a ticket""" - try: - data = ticket.verify(tkt) - if data != None: - deliver_ticket(data) - except Exception, err: - raise xmlrpclib.Fault(102, 'Ticket error: ' + str(err)) - -@export_to_api(0) -def GetXIDs(): - """GetXIDs(): return an dictionary mapping slice names to XIDs""" - return dict([(pwent[0], pwent[2]) for pwent in pwd.getpwall() if pwent[6] == sliver_vs.Sliver_VS.SHELL]) - -@export_to_api(0) -def GetSSHKeys(): - """GetSSHKeys(): return an dictionary mapping slice names to SSH keys""" - keydict = {} - for rec in database.db.itervalues(): - if 'keys' in rec: - keydict[rec['name']] = rec['keys'] - return keydict - -@export_to_api(1) -def Create(rec): - """Create(sliver_name): create a non-PLC-instantiated sliver""" - if rec['instantiation'] == 'delegated': accounts.get(rec['name']).ensure_created(rec) - -@export_to_api(1) -def Destroy(rec): - """Destroy(sliver_name): destroy a non-PLC-instantiated sliver""" - if rec['instantiation'] == 'delegated': accounts.get(rec['name']).ensure_destroyed() - -@export_to_api(1) -def Start(rec): - """Start(sliver_name): run start scripts belonging to the specified sliver""" - accounts.get(rec['name']).start() - -@export_to_api(1) -def Stop(rec): - """Stop(sliver_name): kill all processes belonging to the specified sliver""" - accounts.get(rec['name']).stop() - -@export_to_api(1) -def GetEffectiveRSpec(rec): - """GetEffectiveRSpec(sliver_name): return the RSpec allocated to the specified sliver, including loans""" - return rec.get('_rspec', {}).copy() - -@export_to_api(1) -def GetRSpec(rec): - """GetRSpec(sliver_name): return the RSpec allocated to the specified sliver, excluding loans""" - return rec.get('rspec', {}).copy() - -@export_to_api(1) -def GetLoans(rec): - """GetLoans(sliver_name): return the list of loans made by the specified sliver""" - return rec.get('_loans', [])[:] - -def validate_loans(obj): - """Check that is a valid loan specification.""" - def validate_loan(obj): return (type(obj)==list or type(obj)==tuple) and len(obj)==3 and type(obj[0])==str and type(obj[1])==str and obj[1] in database.LOANABLE_RESOURCES and type(obj[2])==int and obj[2]>=0 - return type(obj)==list and False not in map(validate_loan, obj) - -@export_to_api(2) -def SetLoans(rec, loans): - """SetLoans(sliver_name, loans): overwrite the list of loans made by the specified sliver""" - if not validate_loans(loans): raise xmlrpclib.Fault(102, 'Invalid argument: the second argument must be a well-formed loan specification') - rec['_loans'] = loans - database.db.sync() - - class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): # overriding _dispatch to achieve this effect is officially deprecated, # but I can't figure out how to get access to .request without @@ -132,9 +50,12 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): except KeyError: api_method_list = api_method_dict.keys() api_method_list.sort() - raise xmlrpclib.Fault(100, 'Invalid API method %s. Valid choices are %s' % (method_name, ', '.join(api_method_list))) + raise xmlrpclib.Fault(100, 'Invalid API method %s. Valid choices are %s' % \ + (method_name, ', '.join(api_method_list))) expected_nargs = nargs_dict[method_name] - if len(args) != expected_nargs: raise xmlrpclib.Fault(101, 'Invalid argument count: got %d, expecting %d.' % (len(args), expected_nargs)) + if len(args) != expected_nargs: + raise xmlrpclib.Fault(101, 'Invalid argument count: got %d, expecting %d.' % \ + (len(args), expected_nargs)) else: # Figure out who's calling. # XXX - these ought to be imported directly from some .h file @@ -143,13 +64,32 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): ucred = self.request.getsockopt(socket.SOL_SOCKET, SO_PEERCRED, sizeof_struct_ucred) xid = struct.unpack('3i', ucred)[2] caller_name = pwd.getpwuid(xid)[0] - if method_name not in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'): + # Special case the genicw + if method_name == "AdminTicket": + if caller_name == PLC_SLICE_PREFIX+"_genicw": + try: result = method(*args) + except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err) + else: + raise xmlrpclib.Fault(108, '%s: Permission denied.' % caller_name) + # Anyone can call these functions + elif method_name not in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'): + # Authenticate the caller if not in the above fncts. target_name = args[0] + # Gather target slice's object. target_rec = database.db.get(target_name) - if not (target_rec and target_rec['type'].startswith('sliver.')): raise xmlrpclib.Fault(102, 'Invalid argument: the first argument must be a sliver name.') - if not (caller_name in (args[0], 'root') or (caller_name, method_name) in target_rec['delegations']): raise xmlrpclib.Fault(108, 'Permission denied.') - result = method(target_rec, *args[1:]) - else: result = method(*args) + # only work on slivers. Sannity check. + if not (target_rec and target_rec['type'].startswith('sliver.')): + raise xmlrpclib.Fault(102, \ + 'Invalid argument: the first argument must be a sliver name.') + # only manipulate slivers who delegate you authority + if caller_name in (target_name, target_rec['delegations']): + try: result = method(target_rec, *args[1:]) + except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err) + else: + raise xmlrpclib.Fault(108, '%s: Permission denied.' % caller_name) + else: # Execute anonymous call. + try: result = method(*args) + except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err) if result == None: result = 1 return result