Commit 39b325be authored by Jérome Perrin's avatar Jérome Perrin

Support PluggableAuthService 1.10.0

See merge request nexedi/erp5!1405
parents b6dcbc19 612ee830
...@@ -6,5 +6,12 @@ if not acl_users.getUserById('super_user'): ...@@ -6,5 +6,12 @@ if not acl_users.getUserById('super_user'):
password='super_user', password='super_user',
confirm='super_user', confirm='super_user',
) )
acl_users.zodb_roles.assignRoleToPrincipal('Manager', 'super_user') # BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
acl_users.zodb_roles.manage_assignRoleToPrincipals(
'Manager',
('super_user',),
RESPONSE=response)
response.setStatus(200)
return 'Done' return 'Done'
...@@ -6,5 +6,11 @@ if not acl_users.getUserById('user_logout_test'): ...@@ -6,5 +6,11 @@ if not acl_users.getUserById('user_logout_test'):
password='user_logout_test', password='user_logout_test',
confirm='user_logout_test', confirm='user_logout_test',
) )
acl_users.zodb_roles.assignRoleToPrincipal('Manager', 'user_logout_test') # BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
acl_users.zodb_roles.manage_assignRoleToPrincipals(
'Manager',
('user_logout_test',),
RESPONSE=response)
response.setStatus(200)
return 'done' return 'done'
...@@ -11,7 +11,13 @@ if not acl_users.getUserById('tiosafe_sync_user'): ...@@ -11,7 +11,13 @@ if not acl_users.getUserById('tiosafe_sync_user'):
password='tiosafe_sync_user', password='tiosafe_sync_user',
confirm='tiosafe_sync_user', confirm='tiosafe_sync_user',
) )
acl_users.zodb_roles.assignRoleToPrincipal('Manager', 'tiosafe_sync_user') # BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
acl_users.zodb_roles.manage_assignRoleToPrincipals(
'Manager',
('tiosafe_sync_user',),
RESPONSE=response)
response.setStatus(200)
node_list = ['invoiced_person_module', 'person_module', 'organisation_module'] node_list = ['invoiced_person_module', 'person_module', 'organisation_module']
resource_list = ['product_module',] resource_list = ['product_module',]
......
...@@ -11,7 +11,13 @@ if not acl_users.getUserById('tiosafe_sync_user'): ...@@ -11,7 +11,13 @@ if not acl_users.getUserById('tiosafe_sync_user'):
password='tiosafe_sync_user', password='tiosafe_sync_user',
confirm='tiosafe_sync_user', confirm='tiosafe_sync_user',
) )
acl_users.zodb_roles.assignRoleToPrincipal('Manager', 'tiosafe_sync_user') # BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
acl_users.zodb_roles.manage_assignRoleToPrincipals(
'Manager',
('tiosafe_sync_user',),
RESPONSE=response)
response.setStatus(200)
node_list = ['person_module', 'organisation_module'] node_list = ['person_module', 'organisation_module']
resource_list = ['product_module',] resource_list = ['product_module',]
......
...@@ -8,7 +8,13 @@ if not acl_users.getUserById('tiosafe_sync_user'): ...@@ -8,7 +8,13 @@ if not acl_users.getUserById('tiosafe_sync_user'):
password='tiosafe_sync_user', password='tiosafe_sync_user',
confirm='tiosafe_sync_user', confirm='tiosafe_sync_user',
) )
acl_users.zodb_roles.assignRoleToPrincipal('Manager', 'tiosafe_sync_user') # BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
acl_users.zodb_roles.manage_assignRoleToPrincipals(
'Manager',
('tiosafe_sync_user',),
RESPONSE=response)
response.setStatus(200)
for im in context.objectValues(portal_type="Integration Module"): for im in context.objectValues(portal_type="Integration Module"):
......
...@@ -14,7 +14,13 @@ if not acl_users.getUserById('tiosafe_sync_user'): ...@@ -14,7 +14,13 @@ if not acl_users.getUserById('tiosafe_sync_user'):
password='tiosafe_sync_user', password='tiosafe_sync_user',
confirm='tiosafe_sync_user', confirm='tiosafe_sync_user',
) )
acl_users.zodb_roles.assignRoleToPrincipal('Manager', 'tiosafe_sync_user') # BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
acl_users.zodb_roles.manage_assignRoleToPrincipals(
'Manager',
('tiosafe_sync_user',),
RESPONSE=response)
response.setStatus(200)
# this dict map the portal type with their type # this dict map the portal type with their type
mapping_type_dict = { mapping_type_dict = {
......
...@@ -30,7 +30,13 @@ if person is None: ...@@ -30,7 +30,13 @@ if person is None:
login.validate() login.validate()
# XXX (lucas): These tests must be able to run on an instance without security. # XXX (lucas): These tests must be able to run on an instance without security.
# BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
for role in ('Assignee', 'Assignor', 'Associate', 'Auditor', 'Owner'): for role in ('Assignee', 'Assignor', 'Associate', 'Auditor', 'Owner'):
portal.acl_users.zodb_roles.assignRoleToPrincipal(role, person.Person_getUserId()) portal.acl_users.zodb_roles.manage_assignRoleToPrincipals(
role,
(person.Person_getUserId(),),
RESPONSE=response)
response.setStatus(200)
return 'Done.' return 'Done.'
...@@ -30,7 +30,13 @@ if person is None: ...@@ -30,7 +30,13 @@ if person is None:
login.validate() login.validate()
# XXX (lucas): These tests must be able to run on an instance without security. # XXX (lucas): These tests must be able to run on an instance without security.
# BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
for role in ('Assignee', 'Assignor', 'Associate', 'Auditor', 'Owner'): for role in ('Assignee', 'Assignor', 'Associate', 'Auditor', 'Owner'):
portal.acl_users.zodb_roles.assignRoleToPrincipal(role, person.Person_getUserId()) portal.acl_users.zodb_roles.manage_assignRoleToPrincipals(
role,
(person.Person_getUserId(),),
RESPONSE=response)
response.setStatus(200)
return 'Done.' return 'Done.'
...@@ -6,5 +6,11 @@ if not acl_users.getUserById('user_logout_test'): ...@@ -6,5 +6,11 @@ if not acl_users.getUserById('user_logout_test'):
password='user_logout_test', password='user_logout_test',
confirm='user_logout_test', confirm='user_logout_test',
) )
acl_users.zodb_roles.assignRoleToPrincipal('Manager', 'user_logout_test') # BBB for PAS 1.9.0 we pass a response and undo the redirect
response = container.REQUEST.RESPONSE
acl_users.zodb_roles.manage_assignRoleToPrincipals(
'Manager',
('user_logout_test',),
RESPONSE=response)
response.setStatus(200)
return 'done' return 'done'
...@@ -303,5 +303,16 @@ class ERP5LoginUserManager(BasePlugin): ...@@ -303,5 +303,16 @@ class ERP5LoginUserManager(BasePlugin):
}) })
return tuple(result) return tuple(result)
security.declarePrivate('updateUser')
def updateUser(self, user_id, login_name):
# Operation not supported here
return False
security.declarePrivate('updateEveryLoginName')
def updateEveryLoginName(self, quit_on_first_error=True):
# Operation not supported here
raise NotImplementedError()
classImplements(ERP5LoginUserManager, IAuthenticationPlugin, IUserEnumerationPlugin) classImplements(ERP5LoginUserManager, IAuthenticationPlugin, IUserEnumerationPlugin)
InitializeClass(ERP5LoginUserManager) InitializeClass(ERP5LoginUserManager)
...@@ -278,6 +278,16 @@ class ERP5UserManager(BasePlugin): ...@@ -278,6 +278,16 @@ class ERP5UserManager(BasePlugin):
for user in user_list for user in user_list
]) ])
security.declarePrivate( 'updateUser' )
def updateUser(self, user_id, login_name):
# Operation not supported here
return False
security.declarePrivate( 'updateEveryLoginName' )
def updateEveryLoginName(self, quit_on_first_error=True):
# Operation not supported here
raise NotImplementedError()
def getUserByLogin(self, login, exact_match=True): def getUserByLogin(self, login, exact_match=True):
# Search the Catalog for login and return a list of person objects # Search the Catalog for login and return a list of person objects
# login can be a string or a list of strings # login can be a string or a list of strings
......
...@@ -744,6 +744,45 @@ class TestPASAPI(UserManagementTestCase): ...@@ -744,6 +744,45 @@ class TestPASAPI(UserManagementTestCase):
verifyClass(IAuthenticationPlugin, ERP5UserManager) verifyClass(IAuthenticationPlugin, ERP5UserManager)
verifyClass(IUserEnumerationPlugin, ERP5UserManager) verifyClass(IUserEnumerationPlugin, ERP5UserManager)
def test_LoginUserManagerInterfaces(self):
"""Tests login user manager plugin respects interfaces."""
from Products.PluggableAuthService.interfaces.plugins import\
IAuthenticationPlugin, IUserEnumerationPlugin
from Products.ERP5Security.ERP5LoginUserManager import ERP5LoginUserManager
verifyClass(IAuthenticationPlugin, ERP5LoginUserManager)
verifyClass(IUserEnumerationPlugin, ERP5LoginUserManager)
def test_ERP5AccessTokenExtractionPluginInterfaces(self):
"""Tests access token extraction plugin respects interfaces."""
from Products.PluggableAuthService.interfaces.plugins import\
IAuthenticationPlugin, ILoginPasswordHostExtractionPlugin
from Products.ERP5Security.ERP5AccessTokenExtractionPlugin import\
ERP5AccessTokenExtractionPlugin
verifyClass(IAuthenticationPlugin, ERP5AccessTokenExtractionPlugin)
verifyClass(ILoginPasswordHostExtractionPlugin, ERP5AccessTokenExtractionPlugin)
def test_ERP5BearerExtractionPluginInterfaces(self):
"""Tests bearer extraction plugin respects interfaces."""
from Products.PluggableAuthService.interfaces.plugins import\
ILoginPasswordHostExtractionPlugin
from Products.ERP5Security.ERP5BearerExtractionPlugin import\
ERP5BearerExtractionPlugin
verifyClass(ILoginPasswordHostExtractionPlugin, ERP5BearerExtractionPlugin)
def test_ERP5DumbHTTPExtractionPluginInterfaces(self):
"""Tests dumb HTTP extraction plugin respects interfaces."""
from Products.PluggableAuthService.interfaces.plugins import\
ILoginPasswordHostExtractionPlugin
from Products.ERP5Security.ERP5DumbHTTPExtractionPlugin import\
ERP5DumbHTTPExtractionPlugin
verifyClass(ILoginPasswordHostExtractionPlugin, ERP5DumbHTTPExtractionPlugin)
def test_RoleManagerInterfaces(self):
"""Tests role manager plugin respects interfaces."""
from Products.PluggableAuthService.interfaces.plugins import IRolesPlugin
from Products.ERP5Security.ERP5RoleManager import ERP5RoleManager
verifyClass(IRolesPlugin, ERP5RoleManager)
def test_UserFolder(self): def test_UserFolder(self):
"""Tests user folder has correct meta type.""" """Tests user folder has correct meta type."""
self.assertTrue(isinstance(self.getUserFolder(), self.assertTrue(isinstance(self.getUserFolder(),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment