Nosial/socialbox-php
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor EncryptionChannelRejectMessage to remove UUID validation and ensure parameters are cast to string

Browse source 
https://github.com/nosial/Socialbox-PHP/issues/17
This commit is contained in:
netkas 2025-03-08 00:50:16 -05:00
parent 4f35485005
commit fa9352d938
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Socialbox/Classes/StandardMethods/EncryptionChannel/EncryptionChannelRejectMessage.php
View file

@ -5,12 +5,10 @@
use Exception; use Exception;
use Socialbox\Abstracts\Method; use Socialbox\Abstracts\Method;
use Socialbox\Classes\Logger; use Socialbox\Classes\Logger;
use Socialbox\Classes\Validator;
use Socialbox\Enums\StandardError; use Socialbox\Enums\StandardError;
use Socialbox\Enums\Status\EncryptionChannelStatus; use Socialbox\Enums\Status\EncryptionChannelStatus;
use Socialbox\Exceptions\DatabaseOperationException; use Socialbox\Exceptions\DatabaseOperationException;
use Socialbox\Exceptions\RpcException; use Socialbox\Exceptions\RpcException;
use Socialbox\Exceptions\Standard\InvalidRpcArgumentException;
use Socialbox\Exceptions\Standard\MissingRpcArgumentException; use Socialbox\Exceptions\Standard\MissingRpcArgumentException;
use Socialbox\Exceptions\Standard\StandardRpcException; use Socialbox\Exceptions\Standard\StandardRpcException;
use Socialbox\Interfaces\SerializableInterface; use Socialbox\Interfaces\SerializableInterface;
@ -32,27 +30,15 @@
{ {
throw new MissingRpcArgumentException('channel_uuid'); throw new MissingRpcArgumentException('channel_uuid');
} }
elseif(!Validator::validateUuid($rpcRequest->getParameter('channel_uuid')))
{
throw new InvalidRpcArgumentException('channel_uuid', 'The given channel uuid is not a valid UUID V4');
}
if(!$rpcRequest->containsParameter('message_uuid')) if(!$rpcRequest->containsParameter('message_uuid'))
{ {
throw new MissingRpcArgumentException('message_uuid'); throw new MissingRpcArgumentException('message_uuid');
} }
elseif(!is_string($rpcRequest->getParameter('message_uuid')))
{
throw new InvalidRpcArgumentException('message_uuid', 'Must be type string');
}
elseif(!Validator::validateUuid($rpcRequest->getParameter('message_uuid')))
{
throw new InvalidRpcArgumentException('message_uuid', 'Invalid message UUID V4');
}
try try
{ {
$channelUuid = $rpcRequest->getParameter('channel_uuid'); $channelUuid = (string)$rpcRequest->getParameter('channel_uuid');
$encryptionChannel = EncryptionChannelManager::getChannel($channelUuid); $encryptionChannel = EncryptionChannelManager::getChannel($channelUuid);
} }
catch(DatabaseOperationException $e) catch(DatabaseOperationException $e)
@ -117,7 +103,7 @@
} }
EncryptionChannelManager::rejectMessage( EncryptionChannelManager::rejectMessage(
$rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid') (string)$rpcRequest->getParameter('channel_uuid'), (string)$rpcRequest->getParameter('message_uuid')
); );
} }
catch(DatabaseOperationException $e) catch(DatabaseOperationException $e)
@ -176,8 +162,8 @@
return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The message is not for the requesting peer'); return $rpcRequest->produceError(StandardError::UNAUTHORIZED, 'The message is not for the requesting peer');
} }
EncryptionChannelManager::acknowledgeMessage( EncryptionChannelManager::rejectMessage(
$rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid') (string)$rpcRequest->getParameter('channel_uuid'), (string)$rpcRequest->getParameter('message_uuid')
); );
} }
catch(DatabaseOperationException $e) catch(DatabaseOperationException $e)
@ -191,8 +177,8 @@
{ {
$rpcClient = Socialbox::getExternalSession($message->getOwner($encryptionChannel)->getDomain()); $rpcClient = Socialbox::getExternalSession($message->getOwner($encryptionChannel)->getDomain());
$rpcClient->encryptionChannelRejectMessage( $rpcClient->encryptionChannelRejectMessage(
channelUuid: $rpcRequest->getParameter('channel_uuid'), channelUuid: (string)$rpcRequest->getParameter('channel_uuid'),
messageUuid: $rpcRequest->getParameter('message_uuid'), messageUuid: (string)$rpcRequest->getParameter('message_uuid'),
identifiedAs: $requestingPeer->getAddress() identifiedAs: $requestingPeer->getAddress()
); );
} }
@ -200,7 +186,7 @@
{ {
try try
{ {
EncryptionChannelManager::rejectMessage($rpcRequest->getParameter('channel_uuid'), $rpcRequest->getParameter('message_uuid'), true); EncryptionChannelManager::rejectMessage((string)$rpcRequest->getParameter('channel_uuid'), (string)$rpcRequest->getParameter('message_uuid'), true);
} }
catch (DatabaseOperationException $e) catch (DatabaseOperationException $e)
{ {