aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption/lib/Controller/RecoveryController.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption/lib/Controller/RecoveryController.php')
-rw-r--r--apps/encryption/lib/Controller/RecoveryController.php101
1 files changed, 33 insertions, 68 deletions
diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php
index 58ea4e4ece7..d75406e6319 100644
--- a/apps/encryption/lib/Controller/RecoveryController.php
+++ b/apps/encryption/lib/Controller/RecoveryController.php
@@ -1,68 +1,37 @@
<?php
+
/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
*/
-
namespace OCA\Encryption\Controller;
-
use OCA\Encryption\Recovery;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IRequest;
-use OCP\AppFramework\Http\DataResponse;
class RecoveryController extends Controller {
/**
- * @var IConfig
- */
- private $config;
- /**
- * @var IL10N
- */
- private $l;
- /**
- * @var Recovery
- */
- private $recovery;
-
- /**
* @param string $AppName
* @param IRequest $request
* @param IConfig $config
- * @param IL10N $l10n
+ * @param IL10N $l
* @param Recovery $recovery
*/
- public function __construct($AppName,
- IRequest $request,
- IConfig $config,
- IL10N $l10n,
- Recovery $recovery) {
+ public function __construct(
+ $AppName,
+ IRequest $request,
+ private IConfig $config,
+ private IL10N $l,
+ private Recovery $recovery,
+ ) {
parent::__construct($AppName, $request);
- $this->config = $config;
- $this->l = $l10n;
- $this->recovery = $recovery;
}
/**
@@ -74,36 +43,36 @@ class RecoveryController extends Controller {
public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableRecovery) {
// Check if both passwords are the same
if (empty($recoveryPassword)) {
- $errorMessage = (string)$this->l->t('Missing recovery key password');
+ $errorMessage = $this->l->t('Missing recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}
if (empty($confirmPassword)) {
- $errorMessage = (string)$this->l->t('Please repeat the recovery key password');
+ $errorMessage = $this->l->t('Please repeat the recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}
if ($recoveryPassword !== $confirmPassword) {
- $errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
+ $errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}
if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') {
if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
- return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully enabled')]]);
+ return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully enabled')]]);
}
- return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
+ return new DataResponse(['data' => ['message' => $this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
} elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') {
if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
- return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully disabled')]]);
+ return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully disabled')]]);
}
- return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
+ return new DataResponse(['data' => ['message' => $this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
}
// this response should never be sent but just in case.
- return new DataResponse(['data' => ['message' => (string)$this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
+ return new DataResponse(['data' => ['message' => $this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
}
/**
@@ -115,22 +84,22 @@ class RecoveryController extends Controller {
public function changeRecoveryPassword($newPassword, $oldPassword, $confirmPassword) {
//check if both passwords are the same
if (empty($oldPassword)) {
- $errorMessage = (string)$this->l->t('Please provide the old recovery password');
+ $errorMessage = $this->l->t('Please provide the old recovery password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if (empty($newPassword)) {
- $errorMessage = (string)$this->l->t('Please provide a new recovery password');
- return new DataResponse (['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+ $errorMessage = $this->l->t('Please provide a new recovery password');
+ return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if (empty($confirmPassword)) {
- $errorMessage = (string)$this->l->t('Please repeat the new recovery password');
+ $errorMessage = $this->l->t('Please repeat the new recovery password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if ($newPassword !== $confirmPassword) {
- $errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
+ $errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
@@ -141,27 +110,25 @@ class RecoveryController extends Controller {
return new DataResponse(
[
'data' => [
- 'message' => (string)$this->l->t('Password successfully changed.')]
+ 'message' => $this->l->t('Password successfully changed.')]
]
);
}
return new DataResponse(
[
'data' => [
- 'message' => (string)$this->l->t('Could not change the password. Maybe the old password was not correct.')
+ 'message' => $this->l->t('Could not change the password. Maybe the old password was not correct.')
]
], Http::STATUS_BAD_REQUEST);
}
/**
- * @NoAdminRequired
- *
* @param string $userEnableRecovery
* @return DataResponse
*/
+ #[NoAdminRequired]
public function userSetRecovery($userEnableRecovery) {
if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
-
$result = $this->recovery->setRecoveryForUser($userEnableRecovery);
if ($result) {
@@ -169,25 +136,23 @@ class RecoveryController extends Controller {
return new DataResponse(
[
'data' => [
- 'message' => (string)$this->l->t('Recovery Key disabled')]
+ 'message' => $this->l->t('Recovery Key disabled')]
]
);
}
return new DataResponse(
[
'data' => [
- 'message' => (string)$this->l->t('Recovery Key enabled')]
+ 'message' => $this->l->t('Recovery Key enabled')]
]
);
}
-
}
return new DataResponse(
[
'data' => [
- 'message' => (string)$this->l->t('Could not enable the recovery key, please try again or contact your administrator')
+ 'message' => $this->l->t('Could not enable the recovery key, please try again or contact your administrator')
]
], Http::STATUS_BAD_REQUEST);
}
-
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-16 04:37:02 +0000