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

Ensure server keypair expiration checks handle invalid values

Browse source
This commit is contained in:
netkas 2025-01-10 13:34:02 -05:00
parent e9d51a19d3
commit 36a2d52041
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@
if($exportedSession !== null) if($exportedSession !== null)
{ {
// Check if the server keypair has expired from the exported session // Check if the server keypair has expired from the exported session
if(time() > $exportedSession->getServerKeypairExpires()) if($exportedSession->getServerKeypairExpires() > 0 && time() > $exportedSession->getServerKeypairExpires())
{ {
throw new RpcException('The server keypair has expired, a new session must be created'); throw new RpcException('The server keypair has expired, a new session must be created');
} }
@ -71,7 +71,7 @@
$this->serverInformation = self::getServerInformation(); $this->serverInformation = self::getServerInformation();
// Check if the active keypair has expired // Check if the active keypair has expired
if(time() > $this->serverInformation->getServerKeypairExpires()) if($this->serverInformation->getServerKeypairExpires() > 0 && time() > $this->serverInformation->getServerKeypairExpires())
{ {
throw new RpcException('The server keypair has expired but the server has not provided a new keypair, contact the server administrator'); throw new RpcException('The server keypair has expired but the server has not provided a new keypair, contact the server administrator');
} }
@ -110,7 +110,7 @@
$this->serverInformation = self::getServerInformation(); $this->serverInformation = self::getServerInformation();
// Check if the server keypair has expired // Check if the server keypair has expired
if(time() > $this->serverInformation->getServerKeypairExpires()) if($this->serverInformation->getServerKeypairExpires() > 0 && time() > $this->serverInformation->getServerKeypairExpires())
{ {
throw new RpcException('The server keypair has expired but the server has not provided a new keypair, contact the server administrator'); throw new RpcException('The server keypair has expired but the server has not provided a new keypair, contact the server administrator');
} }
@ -500,14 +500,6 @@
{ {
throw new RpcException(sprintf('Failed to get server information at %s, server responded with ' . $responseCode, $this->rpcEndpoint)); throw new RpcException(sprintf('Failed to get server information at %s, server responded with ' . $responseCode, $this->rpcEndpoint));
} }
throw new RpcException(sprintf('Failed to get server information at %s, server responded with ' . $responseCode . ': ' . $response, $this->rpcEndpoint));
}
if(empty($response))
{
curl_close($ch);
throw new RpcException(sprintf('Failed to get server information at %s, server returned an empty response', $this->rpcEndpoint));
} }
curl_close($ch); curl_close($ch);