Added xml rpc ReCreate Method.

[nodemanager.git] / api.py

diff --git a/api.py b/api.py
index 0dd7115..937fb78 100644 (file)
--- a/api.py
+++ b/api.py
@@ -21,12 +21,15 @@ import xmlrpclib
 import accounts
 import database
 import logger
+import sliver_vs
+import ticket
 import tools
 
 
 API_SERVER_PORT = 812
 UNIX_ADDR = '/tmp/sliver_mgr.api'
 
+deliver_ticket = None  # set in sm.py:start()
 
 api_method_dict = {}
 nargs_dict = {}
@@ -44,6 +47,30 @@ 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"""
@@ -54,6 +81,14 @@ 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 ReCreate(rec):
+    """ReCreate(sliver_name): destroy then recreate 
+    and start sliver regardless of instantiation."""
+    accounts.get(rec['name']).ensure_destroyed()
+    accounts.get(rec['name']).ensure_created(rec)
+    accounts.get(rec['name']).start()
+
 @export_to_api(1)
 def Start(rec):
     """Start(sliver_name): run start scripts belonging to the specified sliver"""
@@ -77,7 +112,7 @@ def GetRSpec(rec):
 @export_to_api(1)
 def GetLoans(rec):
     """GetLoans(sliver_name): return the list of loans made by the specified sliver"""
-    return rec.get('_loans', []).copy()
+    return rec.get('_loans', [])[:]
 
 def validate_loans(obj):
     """Check that <obj> is a valid loan specification."""
@@ -116,13 +151,13 @@ 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 expected_nargs >= 1:
+            if method_name not in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'):
                 target_name = args[0]
                 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.')
+                if not (caller_name in (args[0], 'root') or (caller_name, method_name) in target_rec['delegations'] or (caller_name == 'utah_elab_delegate' and target_name.startswith('utah_'))): raise xmlrpclib.Fault(108, 'Permission denied.')
                 result = method(target_rec, *args[1:])
-            else: result = method()
+            else: result = method(*args)
             if result == None: result = 1
             return result