Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-03 07:04:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Wrong behaviour when displaying task progress on master password change. Thanks to @deajan for the feedback. Closes #1128

Browse Source 
* [FIX] Improved browser notifications format. Thanks to @vmario89 for the feedback. Closes #1142
* [FIX] Temporary master password change notifications are sent to all users. Thanks to @jorgemfm for the feedback. Closes #1156
* [MOD] Improved background tasks management
* [MOD] Improved email notifications format

Signed-off-by: nuxsmin <nuxsmin@syspass.org>
This commit is contained in:
nuxsmin
2018-12-10 07:01:25 +01:00
parent 9aa3f33308
commit 90ba034522
38 changed files with 1446 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/modules/web/Controllers/ConfigEncryptionController.php
View File

@@ -37,7 +37,6 @@ use SP\Services\Crypt\MasterPassService;
use SP\Services\Crypt\TemporaryMasterPassService;
use SP\Services\Crypt\UpdateMasterPassRequest;
use SP\Services\Task\TaskFactory;
use SP\Util\Util;
/**
* Class ConfigEncryptionController
@@ -52,9 +51,9 @@ final class ConfigEncryptionController extends SimpleControllerBase
* @return bool
* @throws \DI\DependencyException
* @throws \DI\NotFoundException
* @throws \SP\Core\Exceptions\SPException
* @throws \SP\Repositories\NoSuchItemException
* @throws \SP\Services\ServiceException
* @throws \SP\Core\Exceptions\SPException
*/
public function saveAction()
{
@@ -70,41 +69,69 @@ final class ConfigEncryptionController extends SimpleControllerBase
$taskId = $this->request->analyzeString('taskId');
if (!$mastePassService->checkUserUpdateMPass($this->session->getUserData()->getLastUpdateMPass())) {
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS_STICKY, __u('Master password updated'), [__u('Please, restart the session for update it')]);
return $this->returnJsonResponse(
JsonResponse::JSON_SUCCESS_STICKY,
__u('Master password updated'),
[__u('Please, restart the session for update it')]
);
}
if (empty($newMasterPass) || empty($currentMasterPass)) {
return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Master password not entered'));
return $this->returnJsonResponse(
JsonResponse::JSON_ERROR,
__u('Master password not entered')
);
}
if ($confirmPassChange === false) {
return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('The password update must be confirmed'));
return $this->returnJsonResponse(
JsonResponse::JSON_ERROR,
__u('The password update must be confirmed')
);
}
if ($newMasterPass === $currentMasterPass) {
return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Passwords are the same'));
return $this->returnJsonResponse(
JsonResponse::JSON_ERROR,
__u('Passwords are the same')
);
}
if ($newMasterPass !== $newMasterPassR) {
return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('Master passwords do not match'));
return $this->returnJsonResponse(
JsonResponse::JSON_ERROR,
__u('Master passwords do not match')
);
}
if (!$mastePassService->checkMasterPassword($currentMasterPass)) {
return $this->returnJsonResponse(JsonResponse::JSON_ERROR, __u('The current master password does not match'));
return $this->returnJsonResponse(
JsonResponse::JSON_ERROR,
__u('The current master password does not match')
);
}
if (!$this->config->getConfigData()->isMaintenance()) {
return $this->returnJsonResponse(
JsonResponse::JSON_WARNING,
__u('Maintenance mode not enabled'),
[__u('Please, emable it to avoid unwanted behavior from other sessions')]
);
}
if ($this->config->getConfigData()->isDemoEnabled()) {
return $this->returnJsonResponse(JsonResponse::JSON_WARNING, __u('Ey, this is a DEMO!!'));
return $this->returnJsonResponse(
JsonResponse::JSON_WARNING,
__u('Ey, this is a DEMO!!')
);
}
$configService = $this->dic->get(ConfigService::class);
if (!$noAccountPassChange) {
Util::lockApp($this->session->getUserData()->getId(), 'masterpass');
$task = $taskId !== null ? TaskFactory::create(__FUNCTION__, $taskId) : null;
try {
$task = $taskId !== null ? TaskFactory::create(__FUNCTION__, $taskId) : null;
$request = new UpdateMasterPassRequest(
$currentMasterPass,
$newMasterPass,
@@ -124,10 +151,8 @@ final class ConfigEncryptionController extends SimpleControllerBase
return $this->returnJsonResponseException($e);
} finally {
Util::unlockApp();
if ($task) {
TaskFactory::end($task->getTaskId());
if (isset($task)) {
TaskFactory::end($task);
}
}
} else {
@@ -193,12 +218,15 @@ final class ConfigEncryptionController extends SimpleControllerBase
$groupId = $this->request->analyzeInt('temporary_masterpass_group', 0);
$sendEmail = $this->configData->isMailEnabled()
&& $this->request->analyzeBool('temporary_masterpass_email')
&& $groupId > 0;
&& $this->request->analyzeBool('temporary_masterpass_email');
if ($sendEmail) {
try {
$temporaryMasterPassService->sendByEmailForGroup($groupId, $key);
if ($groupId > 0) {
$temporaryMasterPassService->sendByEmailForGroup($groupId, $key);
} else {
$temporaryMasterPassService->sendByEmailForAllUsers($key);
}
return $this->returnJsonResponse(
JsonResponse::JSON_SUCCESS,