Nosial/FederationServer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Refactor authentication handling by replacing getAuthenticatedOperator with requireAuthenticatedOperator in multiple entity methods

Browse source
This commit is contained in:
netkas 2025-06-06 13:39:32 -04:00
parent 1eb5b83eb2
commit 079c1a9428
Signed by: netkas
GPG key ID: 4D8629441B76E4CC
6 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/FederationServer/FederationServer.php
View file

@ -122,11 +122,10 @@
* This method retrieves the currently authenticated operator, if any.
* If no operator is authenticated, it returns null.
*
* @param bool $requireAuthentication Whether to require authentication. Defaults to true.
* @return OperatorRecord|null The authenticated operator record or null if not authenticated.
* @throws RequestException If authentication is provided but is invalid/operator is disabled.
*/
public static function getAuthenticatedOperator(bool $requireAuthentication=true): ?OperatorRecord
public static function getAuthenticatedOperator(): ?OperatorRecord
{
return parent::getAuthenticatedOperator();
}

2
src/FederationServer/Methods/Entities/ListEntityAuditLogs.php
View file

@ -47,8 +47,6 @@
$page = 1;
}
$results = [];
if($authenticatedOperator === null)
{
// Public audit logs are enabled, filter by public entries

2
src/FederationServer/Methods/Entities/ListEntityBlacklistRecords.php
View file

@ -18,7 +18,7 @@
*/
public static function handleRequest(): void
{
$authenticatedOperator = FederationServer::getAuthenticatedOperator(false);
$authenticatedOperator = FederationServer::getAuthenticatedOperator();
if(!Configuration::getServerConfiguration()->isBlacklistPublic() && $authenticatedOperator === null)
{
throw new RequestException('Unauthorized: You must be authenticated to list blacklist records', 401);

5
src/FederationServer/Methods/Entities/ListEntityEvidence.php
View file

@ -17,7 +17,7 @@
*/
public static function handleRequest(): void
{
$authenticatedOperator = FederationServer::getAuthenticatedOperator(false);
$authenticatedOperator = FederationServer::getAuthenticatedOperator();
$includeConfidential = false;
if(!Configuration::getServerConfiguration()->isEvidencePublic() && $authenticatedOperator === null)
@ -70,8 +70,7 @@
throw new RequestException('Internal Server Error: Unable to retrieve evidence', 500, $e);
}
$result = array_map(fn($evidence) => $evidence->toArray(), $evidenceRecords);
self::successResponse($result);
self::successResponse(array_map(fn($evidence) => $evidence->toArray(), $evidenceRecords));
}
}

2
src/FederationServer/Methods/Entities/PushEntity.php
View file

@ -15,7 +15,7 @@
*/
public static function handleRequest(): void
{
$authenticatedOperator = FederationServer::getAuthenticatedOperator();
$authenticatedOperator = FederationServer::requireAuthenticatedOperator();
if(!$authenticatedOperator->isClient() && !$authenticatedOperator->canManageOperators())
{
throw new RequestException('Unauthorized: Insufficient permissions to push entities', 403);

11
src/FederationServer/Methods/Entities/QueryEntity.php
View file

@ -2,6 +2,7 @@
namespace FederationServer\Methods\Entities;
use FederationServer\Classes\Configuration;
use FederationServer\Classes\Managers\EntitiesManager;
use FederationServer\Classes\RequestHandler;
use FederationServer\Exceptions\DatabaseOperationException;
@ -15,6 +16,12 @@
*/
public static function handleRequest(): void
{
$authenticatedOperator = FederationServer::getAuthenticatedOperator();
if(!Configuration::getServerConfiguration()->isEntitiesPublic() && $authenticatedOperator === null)
{
throw new RequestException('Unauthorized: You must be authenticated to view entity records', 401);
}
$id = FederationServer::getParameter('id');
$domain = FederationServer::getParameter('domain') ?? null;
@ -30,14 +37,14 @@
try
{
$entitiy = EntitiesManager::getEntity($id, $domain);
$entity = EntitiesManager::getEntity($id, $domain);
}
catch (DatabaseOperationException $e)
{
throw new RequestException('Internal Server Error: Unable to retrieve entity', 500, $e);
}
self::successResponse($entitiy->toArray());
self::successResponse($entity->toArray());
}
}