X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=api.py;h=8da28efa90f598dc7070069f5346cb9e3c4bb1fb;hb=refs%2Fheads%2F1.5;hp=4a64c3de20ca0a3d5652cd2843e8bee79f79dba0;hpb=38f77cf31084d8af5d233639f1dbe10f377fb8f3;p=nodemanager.git

diff --git a/api.py b/api.py
index 4a64c3d..8da28ef 100644
--- a/api.py
+++ b/api.py
@@ -21,6 +21,7 @@ import xmlrpclib
 import accounts
 import database
 import logger
+import sliver_vs
 import ticket
 import tools
 
@@ -49,13 +50,29 @@ def Help():
 @export_to_api(1)
 def Ticket(tkt):
     """Ticket(tkt): deliver a ticket"""
-    succeeded = False
-    if type(tkt) == str:
+    try:
         data = ticket.verify(tkt)
+        name = data['slivers'][0]['name']
         if data != None:
             deliver_ticket(data)
-            succeeded = True
-    if not succeeded: raise xmlrpclib.Fault(102, 'Invalid argument: the sole argument must be a valid ticket as returned from GetTicket().')
+        logger.log('Ticket delivered for %s' % name)
+        Create(database.db.get(name))
+    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):
@@ -118,9 +135,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
@@ -129,11 +149,14 @@ 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'):
+            if method_name not in ('ReCreate', 'Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'):
                 target_name = args[0]
                 target_rec = database.db.get(target_name)
-                if not target_rec: 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.')
+                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 (target_name, target_rec['delegations']):
+                    raise xmlrpclib.Fault(108, 'Permission denied.')
                 result = method(target_rec, *args[1:])
             else: result = method(*args)
             if result == None: result = 1