From 9bab76076cf1f0d9c00d8e98c6b1c1e78a6575c8 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Thu, 11 Jan 2007 05:59:09 +0000 Subject: [PATCH] - simplify role validation - remove PLCCheckLocal functions, be more explicit about the error in each method --- PLC/Methods/DeleteRoleFromPerson.py | 34 ++++++++++++----------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/PLC/Methods/DeleteRoleFromPerson.py b/PLC/Methods/DeleteRoleFromPerson.py index acc2f741..009b0b27 100644 --- a/PLC/Methods/DeleteRoleFromPerson.py +++ b/PLC/Methods/DeleteRoleFromPerson.py @@ -29,27 +29,20 @@ class DeleteRoleFromPerson(Method): def call(self, auth, role_id_or_name, person_id_or_email): - # Get all roles - roles = {} - for role in Roles(self.api): - roles[role['role_id']] = role['name'] - roles[role['name']] = role['role_id'] - - if role_id_or_name not in roles: - raise PLCInvalidArgument, "Invalid role identifier or name" - - if isinstance(role_id_or_name, int): - role_id = role_id_or_name - else: - role_id = roles[role_id_or_name] + # Get role + roles = Roles(self.api, [role_id_or_name]) + if not roles: + raise PLCInvalidArgument, "Invalid role '%s'" % unicode(role_id_or_name) + role = roles[0] # Get account information persons = Persons(self.api, [person_id_or_email]) if not persons: raise PLCInvalidArgument, "No such account" - person = persons[0] - PLCCheckLocalPerson(person,"DeleteRoleFromPerson") + + if person['peer_id'] is not None: + raise PLCInvalidArgument, "Not a local account" # Authenticated function assert self.caller is not None @@ -60,14 +53,15 @@ class DeleteRoleFromPerson(Method): # Can only revoke lesser (higher) roles from others if 'admin' not in self.caller['roles'] and \ - role_id <= min(self.caller['role_ids']): + role['role_id'] <= min(self.caller['role_ids']): raise PLCPermissionDenied, "Not allowed to revoke that role" - if role_id in person['role_ids']: - person.remove_role(role_id) + if role['role_id'] in person['role_ids']: + person.remove_role(role) # Logging variables self.object_ids = [person['person_id']] - self.message = 'Role %d revoked from person %d' \ - (role['role_id'], person['person_id']) + self.message = "Role %d revoked from person %d" % \ + (role['role_id'], person['person_id']) + return 1 -- 2.47.0