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

Made message signing in Cryptography use SHA512 as the message content for... #1

Closed
netkas wants to merge 421 commits from master into dev
pull from: master
merge into: Nosial:dev
Conversation 3 Commits 421 Files changed 226 +5 -6
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b003845f39 - Show all commits

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

@ -19,19 +19,18 @@ class ServerResolver
* @throws ResolutionException If the DNS TXT records cannot be resolved or if required information is missing. * @throws ResolutionException If the DNS TXT records cannot be resolved or if required information is missing.
* @throws DatabaseOperationException * @throws DatabaseOperationException
*/ */
public static function resolveDomain(string $domain): ResolvedServer public static function resolveDomain(string $domain, bool $useDatabase=true): ResolvedServer
{ {
// First query the database to check if the domain is already resolved // First query the database to check if the domain is already resolved
if(ResolvedServersManager::resolvedServerExists($domain)) if($useDatabase)
{ {
// If the resolved server was updated in the last 30 minutes, return it $resolvedServer = ResolvedServersManager::getResolvedServer($domain);
if(ResolvedServersManager::getResolvedServerUpdated($domain) > (time() - 1800)) if($resolvedServer !== null)
{ {
return ResolvedServersManager::getResolvedServer($domain)->toResolvedServer(); return $resolvedServer->toResolvedServer();
} }
} }
$txtRecords = self::dnsGetTxtRecords($domain); $txtRecords = self::dnsGetTxtRecords($domain);
if ($txtRecords === false) if ($txtRecords === false)
{ {