pl_genicw is allowed to call all methods
authorTony Mack <tmack@cs.princeton.edu>
Wed, 16 Dec 2009 02:20:30 +0000 (02:20 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Wed, 16 Dec 2009 02:20:30 +0000 (02:20 +0000)
api.py

diff --git a/api.py b/api.py
index 350cb25..015893b 100644 (file)
--- a/api.py
+++ b/api.py
@@ -65,12 +65,9 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             xid = struct.unpack('3i', ucred)[1]
             caller_name = pwd.getpwuid(xid)[0]
             # 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)
+            if caller_name == PLC_SLICE_PREFIX+"_genicw":
+                try: result = method(*args)
+                except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err)
             # Anyone can call these functions
             elif method_name not in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'):
                 # Authenticate the caller if not in the above fncts.