Skip to content

Commit 751d6df

Browse files
soklymeachsoklymeach
committed
ACP2E-3657: Weak Password Management
1 parent a68324b commit 751d6df

File tree

2 files changed

+177
-2
lines changed
  • app/code/Magento/User

2 files changed

+177
-2
lines changed

‎app/code/Magento/User/Controller/Adminhtml/User/Save.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\User\Controller\Adminhtml\User;
@@ -64,6 +64,22 @@ public function execute()
6464
return;
6565
}
6666
$model->setData($this->_getAdminUserData($data));
67+
try {
68+
$errors = $model->validate();
69+
if ($errors !== true && !empty($errors)) {
70+
foreach ($errors as $error) {
71+
$this->messageManager->addError($error);
72+
}
73+
$this->redirectToEdit($model, $data);
74+
return;
75+
}
76+
} catch (\Magento\Framework\Validator\Exception $e) {
77+
if ($e->getMessage()) {
78+
$this->messageManager->addError($e->getMessage());
79+
}
80+
$this->redirectToEdit($model, $data);
81+
return;
82+
}
6783
$userRoles = $this->getRequest()->getParam('roles', []);
6884
if (count($userRoles)) {
6985
$model->setRoleId($userRoles[0]);

‎app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/SaveTest.php

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
<?php
2+
/**
3+
* Copyright 2025 Adobe
4+
* All Rights Reserved.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\User\Test\Unit\Controller\Adminhtml\User;
9+
10+
use Magento\Backend\App\Action\Context;
11+
use Magento\Backend\Model\Session;
12+
use Magento\Framework\App\Request\Http;
13+
use Magento\Framework\App\Response\RedirectInterface;
14+
use Magento\Framework\App\ResponseInterface;
15+
use Magento\Framework\Message\ManagerInterface;
16+
use Magento\Framework\ObjectManagerInterface;
17+
use Magento\Framework\Registry;
18+
use Magento\User\Controller\Adminhtml\User\Save;
19+
use Magento\User\Model\User;
20+
use Magento\User\Model\UserFactory;
21+
use PHPUnit\Framework\MockObject\MockObject;
22+
use PHPUnit\Framework\TestCase;
23+
24+
class SaveTest extends TestCase
25+
{
26+
/**
27+
* @var Save|MockObject
28+
*/
29+
private $controller;
30+
31+
/**
32+
* @var Http|MockObject
33+
*/
34+
private $requestMock;
35+
36+
/**
37+
* @var ManagerInterface|MockObject
38+
*/
39+
private $messageManagerMock;
40+
41+
/**
42+
* @var UserFactory|MockObject
43+
*/
44+
private $userFactoryMock;
45+
46+
/**
47+
* @var User|MockObject
48+
*/
49+
private $userModelMock;
50+
51+
/**
52+
* @var ObjectManagerInterface|MockObject
53+
*/
54+
private $objectManagerMock;
55+
56+
/**
57+
* @var Session|MockObject
58+
*/
59+
private $sessionMock;
60+
61+
/**
62+
* @var Context|MockObject
63+
*/
64+
private $contextMock;
65+
66+
/**
67+
* @var Registry|MockObject
68+
*/
69+
private $registryMock;
70+
71+
protected function setUp(): void
72+
{
73+
$this->requestMock = $this->createMock(Http::class);
74+
$this->messageManagerMock = $this->createMock(ManagerInterface::class);
75+
$this->userFactoryMock = $this->createPartialMock(UserFactory::class, ['create']);
76+
$this->userModelMock = $this->getMockBuilder(User::class)
77+
->disableOriginalConstructor()
78+
->onlyMethods(['isObjectNew', 'load', 'setData', 'validate'])
79+
->addMethods(['setRoleId'])
80+
->getMock();
81+
$this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
82+
$this->sessionMock = $this->getMockBuilder(Session::class)
83+
->disableOriginalConstructor()
84+
->addMethods(['setUserData'])
85+
->getMock();
86+
$this->contextMock = $this->createMock(Context::class);
87+
$this->registryMock = $this->createMock(Registry::class);
88+
$this->userFactoryMock->expects($this->any())
89+
->method('create')
90+
->willReturn($this->userModelMock);
91+
$responseMock = $this->createMock(ResponseInterface::class);
92+
$redirectMock = $this->createMock(RedirectInterface::class);
93+
$this->contextMock->expects($this->any())
94+
->method('getRequest')
95+
->willReturn($this->requestMock);
96+
$this->contextMock->expects($this->any())
97+
->method('getMessageManager')
98+
->willReturn($this->messageManagerMock);
99+
$this->contextMock->expects($this->any())
100+
->method('getResponse')
101+
->willReturn($responseMock);
102+
$this->contextMock->expects($this->any())
103+
->method('getRedirect')
104+
->willReturn($redirectMock);
105+
$this->contextMock->expects($this->any())
106+
->method('getSession')
107+
->willReturn($this->sessionMock);
108+
$this->contextMock->expects($this->any())
109+
->method('getObjectManager')
110+
->willReturn($this->objectManagerMock);
111+
$this->controller = $this->getMockBuilder(Save::class)
112+
->setConstructorArgs([
113+
'context' => $this->contextMock,
114+
'userFactory' => $this->userFactoryMock,
115+
'coreRegistry' => $this->registryMock
116+
])
117+
->onlyMethods(['redirectToEdit'])
118+
->getMock();
119+
}
120+
121+
public function testExecuteValidationFailure()
122+
{
123+
$userId = 1;
124+
$postData = ['username' => 'testuser'];
125+
$this->requestMock->expects($this->once())
126+
->method('getParam')
127+
->with('user_id')
128+
->willReturn($userId);
129+
$this->requestMock->expects($this->once())
130+
->method('getPostValue')
131+
->willReturn($postData);
132+
$this->userModelMock->expects($this->once())
133+
->method('load')
134+
->with($userId)
135+
->willReturnSelf();
136+
$this->userModelMock->expects($this->once())
137+
->method('isObjectNew')
138+
->willReturn(false);
139+
$this->userModelMock->expects($this->once())
140+
->method('setData')
141+
->willReturnSelf();
142+
$this->userModelMock->expects($this->once())
143+
->method('validate')
144+
->willReturn(['Validation error message']);
145+
$this->messageManagerMock->expects($this->once())
146+
->method('addError')
147+
->with('Validation error message');
148+
$this->sessionMock->expects($this->once())
149+
->method('setUserData')
150+
->with($postData);
151+
$this->controller->expects($this->once())
152+
->method('redirectToEdit')
153+
->with($this->userModelMock, $postData)
154+
->willReturnCallback(function ($model, $data) {
155+
$this->sessionMock->setUserData($data);
156+
});
157+
$this->controller->execute();
158+
}
159+
}

0 commit comments

Comments
 (0)