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

refactor(files_external): Replace security annotations with respective attributes 

Signed-off-by: provokateurin <kate@provokateurin.de>
pull/46809/head
provokateurin 2024-07-25 13:14:46 +07:00 committed by Joas Schilling
parent 1f1cb6da48
commit c102b89cd5
No known key found for this signature in database
GPG Key ID: 74434EFE0D2E2205
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_external/lib/Controller/AjaxController.php
Unescape Escape View File

@ -9,6 +9,7 @@ namespace OCA\Files_External\Controller;
use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
use OCA\Files_External\Lib\Auth\PublicKey\RSA;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IGroupManager;
use OCP\IRequest;
@ -60,9 +61,9 @@ class AjaxController extends Controller {
/**
* Generates an SSH public/private key pair.
*
* @NoAdminRequired
* @param int $keyLength
*/
#[NoAdminRequired]
public function getSshKeys($keyLength = 1024) {
$key = $this->generateSshKeys($keyLength);
return new JSONResponse(
@ -75,13 +76,12 @@ class AjaxController extends Controller {
}
/**
* @NoAdminRequired
*
* @param string $uid
* @param string $user
* @param string $password
* @return bool
*/
#[NoAdminRequired]
public function saveGlobalCredentials($uid, $user, $password) {
$currentUser = $this->userSession->getUser();
if ($currentUser === null) {

8
apps/files_external/lib/Controller/ApiController.php
Unescape Escape View File

@ -14,6 +14,7 @@ use OCA\Files_External\ResponseDefinitions;
use OCA\Files_External\Service\UserGlobalStoragesService;
use OCA\Files_External\Service\UserStoragesService;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCSController;
@ -76,14 +77,13 @@ class ApiController extends OCSController {
}
/**
* @NoAdminRequired
*
* Get the mount points visible for this user
*
* @return DataResponse<Http::STATUS_OK, Files_ExternalMount[], array{}>
*
* 200: User mounts returned
*/
#[NoAdminRequired]
public function getUserMounts(): DataResponse {
$entries = [];
$mountPoints = [];
@ -105,12 +105,10 @@ class ApiController extends OCSController {
}
/**
* @NoAdminRequired
* @NoCSRFRequired
*
* Ask for credentials using a browser's native basic auth prompt
* Then returns it if provided
*/
#[NoAdminRequired]
#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
public function askNativeAuth(): DataResponse {
if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) {

10
apps/files_external/lib/Controller/UserGlobalStoragesController.php
Unescape Escape View File

@ -15,6 +15,7 @@ use OCA\Files_External\Lib\StorageConfig;
use OCA\Files_External\NotFoundException;
use OCA\Files_External\Service\UserGlobalStoragesService;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\IGroupManager;
@ -64,9 +65,8 @@ class UserGlobalStoragesController extends StoragesController {
* Get all storage entries
*
* @return DataResponse
*
* @NoAdminRequired
*/
#[NoAdminRequired]
public function index() {
/** @var UserGlobalStoragesService */
$service = $this->service;
@ -97,9 +97,8 @@ class UserGlobalStoragesController extends StoragesController {
* @param int $id storage id
* @param bool $testOnly whether to storage should only test the connection or do more things
* @return DataResponse
*
* @NoAdminRequired
*/
#[NoAdminRequired]
public function show($id, $testOnly = true) {
try {
$storage = $this->service->getStorage($id);
@ -135,9 +134,8 @@ class UserGlobalStoragesController extends StoragesController {
* @param bool $testOnly whether to storage should only test the connection or do more things
*
* @return DataResponse
*
* @NoAdminRequired
*/
#[NoAdminRequired]
public function update(
$id,
$backendOptions,

16
apps/files_external/lib/Controller/UserStoragesController.php
Unescape Escape View File

@ -12,6 +12,7 @@ use OCA\Files_External\Lib\StorageConfig;
use OCA\Files_External\NotFoundException;
use OCA\Files_External\Service\UserStoragesService;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\IGroupManager;
@ -69,10 +70,9 @@ class UserStoragesController extends StoragesController {
/**
* Get all storage entries
*
* @NoAdminRequired
*
* @return DataResponse
*/
#[NoAdminRequired]
public function index() {
return parent::index();
}
@ -80,10 +80,9 @@ class UserStoragesController extends StoragesController {
/**
* Return storage
*
* @NoAdminRequired
*
* {@inheritdoc}
*/
#[NoAdminRequired]
public function show($id, $testOnly = true) {
return parent::show($id, $testOnly);
}
@ -98,9 +97,8 @@ class UserStoragesController extends StoragesController {
* @param array $mountOptions backend-specific mount options
*
* @return DataResponse
*
* @NoAdminRequired
*/
#[NoAdminRequired]
public function create(
$mountPoint,
$backend,
@ -154,9 +152,8 @@ class UserStoragesController extends StoragesController {
* @param bool $testOnly whether to storage should only test the connection or do more things
*
* @return DataResponse
*
* @NoAdminRequired
*/
#[NoAdminRequired]
public function update(
$id,
$mountPoint,
@ -205,10 +202,9 @@ class UserStoragesController extends StoragesController {
/**
* Delete storage
*
* @NoAdminRequired
*
* {@inheritdoc}
*/
#[NoAdminRequired]
public function destroy($id) {
return parent::destroy($id);
}