sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46804 from nextcloud/refactor/encryption/security-attributes

pull/46151/head
Kate 2024-08-01 09:56:19 +07:00 committed by GitHub
parent 553224b0a2 4016aace04
commit c52b7e5ebc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/encryption/lib/Controller/RecoveryController.php
Unescape Escape View File

@ -10,6 +10,7 @@ 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;
@ -136,11 +137,10 @@ class RecoveryController extends Controller {
}
/**
* @NoAdminRequired
*
* @param string $userEnableRecovery
* @return DataResponse
*/
#[NoAdminRequired]
public function userSetRecovery($userEnableRecovery) {
if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
$result = $this->recovery->setRecoveryForUser($userEnableRecovery);

10
apps/encryption/lib/Controller/SettingsController.php
Unescape Escape View File

@ -13,6 +13,8 @@ use OCA\Encryption\Session;
use OCA\Encryption\Util;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\UseSession;
use OCP\AppFramework\Http\DataResponse;
use OCP\IL10N;
use OCP\IRequest;
@ -82,13 +84,12 @@ class SettingsController extends Controller {
/**
* @NoAdminRequired
* @UseSession
*
* @param string $oldPassword
* @param string $newPassword
* @return DataResponse
*/
#[NoAdminRequired]
#[UseSession]
public function updatePrivateKeyPassword($oldPassword, $newPassword) {
$result = false;
$uid = $this->userSession->getUser()->getUID();
@ -137,11 +138,10 @@ class SettingsController extends Controller {
}
/**
* @UseSession
*
* @param bool $encryptHomeStorage
* @return DataResponse
*/
#[UseSession]
public function setEncryptHomeStorage($encryptHomeStorage) {
$this->util->setEncryptHomeStorage($encryptHomeStorage);
return new DataResponse();

3
apps/encryption/lib/Controller/StatusController.php
Unescape Escape View File

@ -9,6 +9,7 @@ namespace OCA\Encryption\Controller;
use OCA\Encryption\Session;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\Encryption\IManager;
use OCP\IL10N;
@ -45,9 +46,9 @@ class StatusController extends Controller {
}
/**
* @NoAdminRequired
* @return DataResponse
*/
#[NoAdminRequired]
public function getStatus() {
$status = 'error';
$message = 'no valid init status';