Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
139
Merge Requests
139
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
ee9e1d26
Commit
ee9e1d26
authored
May 20, 2024
by
Jérome Perrin
Committed by
Arnaud Fontaine
Jul 31, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
base/credential: fix password type ( use str )
parent
4d100221
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
bt5/erp5_authentication_policy/TestTemplateItem/portal_components/test.erp5.testAuthenticationPolicy.py
...m/portal_components/test.erp5.testAuthenticationPolicy.py
+7
-7
bt5/erp5_base/MixinTemplateItem/portal_components/mixin.erp5.EncryptedPasswordMixin.py
...em/portal_components/mixin.erp5.EncryptedPasswordMixin.py
+0
-2
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.py
...credential/CredentialRequest_createPersonAndAssignment.py
+1
-1
No files found.
bt5/erp5_authentication_policy/TestTemplateItem/portal_components/test.erp5.testAuthenticationPolicy.py
View file @
ee9e1d26
...
...
@@ -228,13 +228,13 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
self
.
tic
()
# password change date should be saved as well hashed old password value
old_password
=
login
.
getPassword
()
.
decode
()
old_password
=
login
.
getPassword
()
self
.
assertSameSet
([
old_password
],
[
x
.
getPassword
()
for
x
in
self
.
_getPasswordEventList
(
login
)])
# .. test one more time to check history of password is saved in a list
login
.
setPassword
(
'123456789'
)
self
.
tic
()
old_password1
=
login
.
getPassword
()
.
decode
()
old_password1
=
login
.
getPassword
()
# password change date should be saved as well hashed old password value
self
.
assertSameSet
([
old_password1
,
old_password
],
[
x
.
getPassword
()
for
x
in
self
.
_getPasswordEventList
(
login
)])
...
...
@@ -242,29 +242,29 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
# other methods (_setPassword)...
login
.
_setPassword
(
'123456789-1'
)
self
.
tic
()
old_password2
=
login
.
getPassword
()
.
decode
()
old_password2
=
login
.
getPassword
()
self
.
assertSameSet
([
old_password2
,
old_password1
,
old_password
],
\
[
x
.
getPassword
()
for
x
in
self
.
_getPasswordEventList
(
login
)])
# other methods (_forceSetPassword)...
login
.
_forceSetPassword
(
'123456789-2'
)
self
.
tic
()
old_password3
=
login
.
getPassword
()
.
decode
()
old_password3
=
login
.
getPassword
()
self
.
assertSameSet
([
old_password3
,
old_password2
,
old_password1
,
old_password
],
\
[
x
.
getPassword
()
for
x
in
self
.
_getPasswordEventList
(
login
)])
# other methods (setEncodedPassword)...
login
.
setEncodedPassword
(
b
'123456789-3'
)
login
.
setEncodedPassword
(
'123456789-3'
)
self
.
tic
()
old_password4
=
login
.
getPassword
()
.
decode
()
old_password4
=
login
.
getPassword
()
self
.
assertSameSet
([
old_password4
,
old_password3
,
old_password2
,
old_password1
,
old_password
],
\
[
x
.
getPassword
()
for
x
in
self
.
_getPasswordEventList
(
login
)])
# other methods (edit)...
login
.
edit
(
password
=
'123456789-4'
)
self
.
tic
()
old_password5
=
login
.
getPassword
()
.
decode
()
old_password5
=
login
.
getPassword
()
self
.
assertSameSet
([
old_password5
,
old_password4
,
old_password3
,
old_password2
,
old_password1
,
old_password
],
\
[
x
.
getPassword
()
for
x
in
self
.
_getPasswordEventList
(
login
)])
...
...
bt5/erp5_base/MixinTemplateItem/portal_components/mixin.erp5.EncryptedPasswordMixin.py
View file @
ee9e1d26
...
...
@@ -84,8 +84,6 @@ class EncryptedPasswordMixin(object):
value
,
format
=
'default'
,
# pylint: disable=redefined-builtin
):
if
value
is
not
None
and
not
isinstance
(
value
,
bytes
):
value
=
value
.
encode
()
password
=
getattr
(
aq_base
(
self
),
'password'
,
None
)
if
password
is
None
or
isinstance
(
password
,
basestring
):
password
=
self
.
password
=
PersistentMapping
()
...
...
bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.py
View file @
ee9e1d26
...
...
@@ -35,7 +35,7 @@ for portal_type in related_portal_type:
context
.
CredentialRequest_updateLocalRolesOnSecurityGroups
()
if
password
is
not
None
:
if
password
.
startswith
(
b
'{SSHA}'
):
if
password
.
startswith
(
'{SSHA}'
):
#password is encoded, set it to None to script witch send the password to user
password
=
None
# Send notification in activities
...
...
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