cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check if principal exists before adding to group

Browse source
This commit is contained in:
Hannes Plattner 2021-06-11 10:02:13 +02:00
parent 34c9d24ffa
commit aab2d6c955
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
organize/member.py
View file

@ -44,7 +44,7 @@ from loops.interfaces import ILoops
from loops.organize.auth import IPersonBasedAuthenticator from loops.organize.auth import IPersonBasedAuthenticator
from loops.organize.interfaces import IMemberRegistrationManager from loops.organize.interfaces import IMemberRegistrationManager
from loops.organize.util import getPrincipalFolder, getGroupsFolder from loops.organize.util import getPrincipalFolder, getGroupsFolder
from loops.organize.util import getInternalPrincipal from loops.organize.util import getInternalPrincipal, getPrincipalForUserId
from loops.type import getOptionsDict from loops.type import getOptionsDict
from loops.util import _ from loops.util import _
@ -79,7 +79,7 @@ class MemberRegistrationManager(object):
if pfName is None: if pfName is None:
pfName = options(self.principalfolder_key, pfName = options(self.principalfolder_key,
(self.default_principalfolder,))[0] (self.default_principalfolder,))[0]
rc = self.createPrincipal(pfName, userId, password, rc = self.createPrincipal(pfName, userId, password,
lastName, firstName, useExisting=useExisting) lastName, firstName, useExisting=useExisting)
if rc is not None: if rc is not None:
return rc return rc
@ -93,7 +93,7 @@ class MemberRegistrationManager(object):
firstName=u'', groups=[], useExisting=False, firstName=u'', groups=[], useExisting=False,
overwrite=False, **kw): overwrite=False, **kw):
if not self.checkPrincipalId(userId): if not self.checkPrincipalId(userId):
return dict(fieldName='loginName', error='illegal_loginname') return dict(fieldName='loginName', error='illegal_loginname')
pFolder = getPrincipalFolder(self.context, pfName) pFolder = getPrincipalFolder(self.context, pfName)
if IPersonBasedAuthenticator.providedBy(pFolder): if IPersonBasedAuthenticator.providedBy(pFolder):
pFolder.setPassword(userId, password) pFolder.setPassword(userId, password)
@ -129,8 +129,9 @@ class MemberRegistrationManager(object):
if gFolder is not None: if gFolder is not None:
group = gFolder.get(gName) group = gFolder.get(gName)
if group is not None: if group is not None:
members = [p for p in group.principals members = [p for p in group.principals
if self.checkPrincipalId(p)] if self.checkPrincipalId(p)
and getPrincipalForUserId(p) is not None]
members.append(pFolder.prefix + userId) members.append(pFolder.prefix + userId)
group.principals = members group.principals = members