Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
erp5
Commits
653383d4
Commit
653383d4
authored
8 years ago
by
Kazuhiko Shiozaki
Committed by
Vincent Pelletier
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Security: disable erp5_users plugin instead of deleting in post_upgrade.
parent
93e30e5e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
79 additions
and
6 deletions
+79
-6
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_disableERP5UserManager.py
...portal_skins/erp5_base/ERP5Site_disableERP5UserManager.py
+4
-0
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_disableERP5UserManager.xml
...ortal_skins/erp5_base/ERP5Site_disableERP5UserManager.xml
+62
-0
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/TemplateTool_checkERP5UserManagerNonExistenceConsistency.py
...mplateTool_checkERP5UserManagerNonExistenceConsistency.py
+1
-4
product/ERP5Security/tests/testERP5Security.py
product/ERP5Security/tests/testERP5Security.py
+12
-2
No files found.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_disableERP5UserManager.py
0 → 100644
View file @
653383d4
portal
=
context
.
getPortalObject
()
acl_users
=
portal
.
acl_users
plugin_id
=
'erp5_users'
getattr
(
acl_users
,
plugin_id
).
manage_activateInterfaces
([])
This diff is collapsed.
Click to expand it.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_disableERP5UserManager.xml
0 → 100644
View file @
653383d4
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"PythonScript"
module=
"Products.PythonScripts.PythonScript"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
ERP5Site_disableERP5UserManager
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
This diff is collapsed.
Click to expand it.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/TemplateTool_checkERP5UserManagerNonExistenceConsistency.py
View file @
653383d4
...
...
@@ -11,8 +11,5 @@ if plugin_id in acl_users.plugins.getAllPlugins(plugin_type='IAuthenticationPlug
activate_kw
=
{
'tag'
:
tag
,
'priority'
:
6
},
method_id
=
'Person_migrateToERP5Login'
,
)
portal
.
portal_activities
.
activateObject
(
'/'
+
acl_users
.
absolute_url
(
relative
=
True
),
after_tag
=
tag
,
).
manage_delObjects
(
ids
=
[
plugin_id
])
portal
.
portal_activities
.
activate
(
after_tag
=
tag
).
ERP5Site_disableERP5UserManager
()
return
error_list
This diff is collapsed.
Click to expand it.
product/ERP5Security/tests/testERP5Security.py
View file @
653383d4
...
...
@@ -39,6 +39,8 @@ from AccessControl.SecurityManagement import newSecurityManager
from
AccessControl.SecurityManagement
import
getSecurityManager
from
AccessControl
import
SpecialUsers
from
Products.PluggableAuthService
import
PluggableAuthService
from
Products.PluggableAuthService.interfaces.plugins
\
import
IAuthenticationPlugin
,
IUserEnumerationPlugin
from
zope.interface.verify
import
verifyClass
from
DateTime
import
DateTime
from
Products
import
ERP5Security
...
...
@@ -443,6 +445,7 @@ class TestUserManagement(ERP5TypeTestCase):
self
.
_assertUserExists
(
login
,
password
)
def
test_PersonLoginMigration
(
self
):
if
'erp5_users'
not
in
self
.
portal
.
acl_users
:
self
.
portal
.
acl_users
.
manage_addProduct
[
'ERP5Security'
].
addERP5UserManager
(
'erp5_users'
)
self
.
portal
.
acl_users
.
erp5_users
.
manage_activateInterfaces
([
'IAuthenticationPlugin'
,
...
...
@@ -472,6 +475,10 @@ class TestUserManagement(ERP5TypeTestCase):
self
.
tic
()
self
.
_assertUserDoesNotExists
(
'the_user'
,
'secret'
)
self
.
_assertUserExists
(
'the_user'
,
'secret2'
)
self
.
assertFalse
(
'erp5_users'
in
\
[
x
[
0
]
for
x
in
self
.
portal
.
acl_users
.
plugins
.
listPlugins
(
IAuthenticationPlugin
)])
self
.
assertFalse
(
'erp5_users'
in
\
[
x
[
0
]
for
x
in
self
.
portal
.
acl_users
.
plugins
.
listPlugins
(
IUserEnumerationPlugin
)])
def
test_ERP5LoginUserManagerMigration
(
self
):
acl_users
=
self
.
portal
.
acl_users
...
...
@@ -482,7 +489,10 @@ class TestUserManagement(ERP5TypeTestCase):
self
.
assertNotEqual
(
portal_templates
.
checkConsistency
(
filter
=
{
'constraint_type'
:
'pre_upgrade'
})
,
[])
portal_templates
.
fixConsistency
(
filter
=
{
'constraint_type'
:
'pre_upgrade'
})
self
.
assertEqual
(
portal_templates
.
checkConsistency
(
filter
=
{
'constraint_type'
:
'pre_upgrade'
})
,
[])
self
.
assertTrue
(
'erp5_login_users'
in
acl_users
)
self
.
assertTrue
(
'erp5_login_users'
in
\
[
x
[
0
]
for
x
in
self
.
portal
.
acl_users
.
plugins
.
listPlugins
(
IAuthenticationPlugin
)])
self
.
assertTrue
(
'erp5_login_users'
in
\
[
x
[
0
]
for
x
in
self
.
portal
.
acl_users
.
plugins
.
listPlugins
(
IUserEnumerationPlugin
)])
def
test_AssignmentWithDate
(
self
):
"""Tests a person with an assignment with correct date is a valid user."""
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment