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

Improve RPC handling and add terms/privacy methods.

Browse source
This commit is contained in:
netkas 2024-12-19 17:59:50 -05:00
parent ef3b10b286
commit 014b63705b
5 changed files with 68 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Socialbox/Classes/RpcClient.php
View file

@ -76,6 +76,11 @@
$this->serverPublicKey = $resolvedServer->getPublicKey();
$this->rpcEndpoint = $resolvedServer->getEndpoint();
if(empty($this->serverPublicKey))
{
throw new ResolutionException('Failed to resolve domain: No public key found for the server');
}
// Attempt to create an encrypted session with the server
$this->sessionUuid = $this->createSession();
$this->sendDheExchange();

17
src/Socialbox/Classes/ServerResolver.php
View file

@ -38,22 +38,18 @@
}
$fullRecord = self::concatenateTxtRecords($txtRecords);
if (preg_match(self::PATTERN, $fullRecord, $matches))
{
$endpoint = trim($matches[1]);
$publicKey = trim(str_replace(' ', '', $matches[2]));
if (empty($endpoint))
{
throw new ResolutionException(sprintf("Failed to resolve RPC endpoint for %s", $domain));
}
if (empty($publicKey))
{
throw new ResolutionException(sprintf("Failed to resolve public key for %s", $domain));
}
return new ResolvedServer($endpoint, $publicKey);
}
else
@ -74,23 +70,26 @@
}
/**
* Concatenates an array of TXT records into a single string.
* Concatenates an array of TXT records into a single string, filtering for SocialBox records.
*
* @param array $txtRecords An array of TXT records, where each record is expected to have a 'txt' key.
* @return string A concatenated string of all TXT records.
* @return string A concatenated string of all relevant TXT records.
*/
private static function concatenateTxtRecords(array $txtRecords): string
{
$fullRecordBuilder = '';
foreach ($txtRecords as $txt)
{
if (isset($txt['txt']))
{
$fullRecordBuilder .= trim($txt['txt'], '" ');
$record = trim($txt['txt'], '" ');
// Only include records that start with v=socialbox
if (stripos($record, 'v=socialbox') === 0)
{
$fullRecordBuilder .= $record;
}
}
}
return $fullRecordBuilder;
}
}

1
src/Socialbox/Classes/Utilities.php
View file

@ -83,6 +83,7 @@ class Utilities
if ($decoded === false)
{
var_dump($data);
throw new InvalidArgumentException('Failed to decode data from Base64');
}