Function to grab a user alias from a user and a namespace

This commit is contained in:
Mikaël Ates 2011-09-01 08:38:25 +02:00
parent e22746a608
commit ed3bdb6b6c
1 changed files with 32 additions and 24 deletions

View File

@ -1210,6 +1210,14 @@ def get_alias_in_policy(user, policy):
return None
def get_alias_in_policy_from_namespace(user, namespace):
try:
alias = UserAlias.objects.get(user=user, namespace=namespace)
return alias
except:
return None
def synchronize_users_in_policy(requester, policy):
if not requester or not policy:
return -1
@ -1927,34 +1935,34 @@ def mod_role(requester, target_role, policy,
if is_authorized_on_alias_or_role(requester, target_role, policy):
logger.error('mod_role: requester not authorized')
return -2
try:
for user in users_removed:
for user in users_removed:
try:
target_role.users.remove(user)
except Exception, err:
logger.critical('mod_role: unable to remove %s of %s due to %s' \
% (user, target_role, err))
return -3
try:
for user in users_added:
except Exception, err:
logger.critical('mod_role: unable to remove %s of %s due to %s' \
% (user, target_role, err))
return -3
for user in users_added:
try:
target_role.users.add(user)
except Exception, err:
logger.critical('mod_role: unable to add %s of %s due to %s' \
% (user, target_role, err))
return -4
try:
for role in roles_removed:
except Exception, err:
logger.critical('mod_role: unable to add %s of %s due to %s' \
% (user, target_role, err))
return -4
for role in roles_removed:
try:
target_role.roles.remove(role)
except Exception, err:
logger.critical('mod_role: unable to remove %s of %s due to %s' \
% (role, target_role, err))
return -5
try:
for role in roles_added:
except Exception, err:
logger.critical('mod_role: unable to remove %s of %s due to %s' \
% (role, target_role, err))
return -5
for role in roles_added:
try:
target_role.roles.add(role)
except Exception, err:
logger.critical('mod_role: unable to add %s of %s due to %s' \
% (role, target_role, err))
return -6
except Exception, err:
logger.critical('mod_role: unable to add %s of %s due to %s' \
% (role, target_role, err))
return -6
logger.debug('mod_role: role %s successfully modified' % target_role)
return 0