Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
maarchRM
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Redmine
Redmine
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Maarch Labs
maarchRM
Commits
0285f011
Commit
0285f011
authored
Apr 28, 2020
by
Arnaud Pauget
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Support/2.6.X' into 'master'
Support/2.6.x See merge request
!474
parents
ad53bf18
e3e1122d
Pipeline
#8033
failed with stages
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
2 deletions
+17
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
VERSION.md
VERSION.md
+1
-1
userAuthentication.php
src/bundle/auth/Controller/userAuthentication.php
+7
-1
authentication.php
src/presentation/maarchRM/Presenter/auth/authentication.php
+5
-0
No files found.
CHANGELOG.md
View file @
0285f011
# CHANGELOG
## Version 2.6.4
-
`Fixed`
Correction faille de sécurité concernant le vol de compte via l'interface de login
## Version 2.6.3
-
`Fixed`
Possiblité de verser en mode transactionnel via bordereau, avec des pièces de plus de 2Mo
...
...
VERSION.md
View file @
0285f011
2.
6.3
\ No newline at end of file
2.
6.4
\ No newline at end of file
src/bundle/auth/Controller/userAuthentication.php
View file @
0285f011
...
...
@@ -182,7 +182,13 @@ class userAuthentication
*/
public
function
definePassword
(
$userName
,
$oldPassword
,
$newPassword
,
$requestPath
)
{
if
(
$userAccount
=
$this
->
sdoFactory
->
read
(
'auth/account'
,
array
(
'accountName'
=>
$userName
)))
{
$tempToken
=
\laabs
::
getToken
(
'TEMP-AUTH'
);
if
(
$this
->
sdoFactory
->
exists
(
'auth/account'
,
array
(
'accountName'
=>
$userName
))
&&
$userAccount
=
$this
->
sdoFactory
->
read
(
'auth/account'
,
array
(
'accountName'
=>
$userName
))
&&
!
is_null
(
$tempToken
)
&&
$tempToken
->
accountId
==
$userAccount
->
accountId
)
{
$this
->
checkPasswordPolicies
(
$newPassword
);
$encryptedPassword
=
$newPassword
;
...
...
src/presentation/maarchRM/Presenter/auth/authentication.php
View file @
0285f011
...
...
@@ -116,7 +116,12 @@ class authentication
public
function
definePassword
(
$requestPath
)
{
$json
=
$this
->
json
;
$json
->
status
=
true
;
$json
->
message
=
"Password changed."
;
if
(
$requestPath
===
false
)
{
$json
->
status
=
false
;
$json
->
message
=
"Password not changed."
;
}
$json
->
requestPath
=
$requestPath
;
return
$json
->
save
();
...
...
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