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

Fix peer identification logic in Socialbox and enhance remote resolution handling
Some checks are pending
CI / check-phpdoc (push) Waiting to run
Details
CI / release (push) Waiting to run
Details
CI / debug (push) Waiting to run
Details
CI / release_executable (push) Waiting to run
Details
CI / debug_executable (push) Waiting to run
Details
CI / check-phpunit (push) Waiting to run
Details
CI / generate-phpdoc (push) Blocked by required conditions
Details
CI / test (push) Blocked by required conditions
Details
CI / release-documentation (push) Blocked by required conditions
Details
CI / release-artifacts (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
netkas 2025-03-26 13:41:51 -04:00
parent 3250407f2b
commit 03a4fa2a84
Signed by: netkas
GPG key ID: 4D8629441B76E4CC
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Socialbox/Socialbox.php
View file

@ -539,7 +539,7 @@
return;
}
// First check if the client is identifying as the host
elseif($hostPeer->getAddress() !== ReservedUsernames::HOST->value)
elseif($hostPeer->getUsername() !== ReservedUsernames::HOST->value)
{
self::returnError(403, StandardError::FORBIDDEN, 'Cannot identify as a peer when not identifying as the host');
return;
@ -1017,6 +1017,25 @@
Logger::getLogger()->debug(sprintf('Resolving external peer by %s while identified as %s', $peerAddress, $identifiedAs ?? 'nobody'));
// Always resolve remotely if an identifier has been provided (this is a personal resolution)
// Otherwise, in all other cases we try to use local peers first and fall back on remote if necessary
// and use local storage to improve performance when possible
if($identifiedAs !== null)
{
try
{
return self::getExternalSession($peerAddress->getDomain())->resolvePeer($peerAddress, $identifiedAs);
}
catch(RpcException $e)
{
throw StandardRpcException::fromRpcException($e);
}
catch(Exception $e)
{
throw new StandardRpcException('Failed to resolve the peer: ' . $e->getMessage(), StandardError::RESOLUTION_FAILED, $e);
}
}
// Resolve the peer from the local database if it exists
try
{
@ -1098,9 +1117,9 @@
return $peer;
}
// If the peer exists and is up to date, return it from our local database instead. (Quicker)
try
{
// If the peer exists and is up to date, return it from our local database instead. (Quicker)
Logger::getLogger()->debug(sprintf('Local peer resolution occurred, resolving locally stored information fields for %s', $existingPeer->getAddress()));
$informationFields = PeerInformationManager::getFields($existingPeer);
}