viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ability to disable password recovery

Browse Source
This commit is contained in:
yuri
2019-09-16 15:47:03 +03:00
parent ef48999614
commit 3f056c8472
9 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/Espo/Controllers/User.php
View File

@@ -69,24 +69,29 @@ class User extends \Espo\Core\Controllers\Record
throw new BadRequest();
}
$p = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where(array(
'requestId' => $data->requestId
))->findOne();
if ($this->getConfig()->get('passwordRecoveryDisabled')) {
throw new Forbidden("Password recovery disabled");
}
if (!$p) {
$request = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where([
'requestId' => $data->requestId
])->findOne();
if (!$request) {
throw new Forbidden();
}
$userId = $p->get('userId');
$userId = $request->get('userId');
if (!$userId) {
throw new Error();
}
$this->getEntityManager()->removeEntity($p);
$this->getEntityManager()->removeEntity($request);
if ($this->getService('User')->changePassword($userId, $data->password)) {
return array(
'url' => $p->get('url')
);
return [
'url' => $request->get('url')
];
}
}

2
application/Espo/Core/defaults/systemConfig.php
View File

@@ -198,6 +198,8 @@ return [
'cleanupDeletedRecords',
'authTokenPreventConcurrent',
'emailParser',
'passwordRecoveryDisabled',
'passwordRecoveryForAdminDisabled',
'latestVersion',
],
'superAdminItems' => [

16
application/Espo/EntryPoints/ChangePassword.php
View File

@@ -39,21 +39,18 @@ class ChangePassword extends \Espo\Core\EntryPoints\Base
public function run()
{
$requestId = $_GET['id'];
if (empty($requestId)) {
throw new BadRequest();
}
$requestId = $_GET['id'] ?? null;
if (!$requestId) throw new BadRequest();
$config = $this->getConfig();
$themeManager = $this->getThemeManager();
$p = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where(array(
$request = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where([
'requestId' => $requestId
))->findOne();
])->findOne();
if (!$p) {
throw new NotFound();
}
if (!$request) throw new NotFound();
$runScript = "
app.getController('PasswordChangeRequest', function (controller) {
@@ -69,4 +66,3 @@ class ChangePassword extends \Espo\Core\EntryPoints\Base
return $this->getContainer()->get('themeManager');
}
}

3
application/Espo/Resources/i18n/en_US/Settings.json
View File

@@ -119,6 +119,8 @@
"cronDisabled": "Disable Cron",
"maintenanceMode": "Maintenance Mode",
"useWebSocket": "Use WebSocket",
"passwordRecoveryDisabled": "Disable password recovery",
"passwordRecoveryForAdminDisabled": "Disable password recover for admin users",
"auth2FA": "Enable 2-Factor Authentication",
"auth2FAMethodList": "Available 2FA methods"
},
@@ -207,6 +209,7 @@
"Connecting": "Connecting...",
"Activities": "Activities",
"Admin Notifications": "Admin Notifications",
"Passwords": "Passwords",
"2-Factor Authentication": "2-Factor Authentication"
},
"messages": {

6
application/Espo/Resources/layouts/Settings/authentication.json
View File

@@ -11,5 +11,11 @@
"rows": [
[{"name": "auth2FA"}, {"name": "auth2FAMethodList"}]
]
},
{
"label": "Passwords",
"rows": [
[{"name": "passwordRecoveryDisabled"}, {"name": "passwordRecoveryForAdminDisabled"}]
]
}
]

2
application/Espo/Resources/metadata/entityDefs/PasswordChangeRequest.json
View File

@@ -2,7 +2,7 @@
"fields": {
"requestId": {
"type": "varchar",
"maxLength": 24,
"maxLength": 64,
"index": true
},
"user": {

6
application/Espo/Resources/metadata/entityDefs/Settings.json
View File

@@ -160,6 +160,12 @@
"type": "multiEnum",
"view": "views/settings/fields/auth-two-fa-method-list"
},
"passwordRecoveryDisabled": {
"type": "bool"
},
"passwordRecoveryForAdminDisabled": {
"type": "bool"
},
"ldapHost": {
"type": "varchar",
"required": true

2
application/Espo/Services/Settings.php
View File

@@ -111,7 +111,7 @@ class Settings extends \Espo\Core\Services\Base
}
}
if ($this->getConfig()->get('smtpServer')) {
if ($this->getConfig()->get('smtpServer') && !$this->getConfig()->geT('passwordRecoveryDisabled')) {
$data->passwordRecoveryEnabled = true;
}

16
application/Espo/Services/User.php
View File

@@ -152,6 +152,10 @@ class User extends Record
public function passwordChangeRequest($userName, $emailAddress, $url = null)
{
if ($this->getConfig()->get('passwordRecoveryDisabled')) {
throw new Forbidden("Password recovery disabled");
}
$user = $this->getEntityManager()->getRepository('User')->where([
'userName' => $userName,
'emailAddress' => $emailAddress
@@ -165,6 +169,16 @@ class User extends Record
throw new NotFound();
}
if ($user->isApi()) {
throw new NotFound();
}
if ($this->getConfig()->get('passwordRecoveryForAdminDisabled')) {
if ($user->isAdmin()) {
throw new NotFound();
}
}
$userId = $user->id;
$passwordChangeRequest = $this->getEntityManager()->getRepository('PasswordChangeRequest')->where([
@@ -174,7 +188,7 @@ class User extends Record
throw new Forbidden(json_encode(['reason' => 'Already-Sent']));
}
$requestId = Util::generateId();
$requestId = Util::generateId() . Util::generateKey();
$passwordChangeRequest = $this->getEntityManager()->getEntity('PasswordChangeRequest');
$passwordChangeRequest->set([