- set methodresponse to True in ticket signing example code

[nodemanager.git] / api.py

diff --git a/api.py b/api.py
index 567d10b..825539f 100644 (file)
--- a/api.py
+++ b/api.py
@@ -21,12 +21,14 @@ import xmlrpclib
 import accounts
 import database
 import logger
+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 +46,16 @@ 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(1)
 def Create(rec):
     """Create(sliver_name): create a non-PLC-instantiated sliver"""
@@ -116,13 +128,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'):
                 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.')
                 result = method(target_rec, *args[1:])
-            else: result = method()
+            else: result = method(*args)
             if result == None: result = 1
             return result