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 -5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8a843eb60b - Show all commits

10
src/Socialbox/Managers/RegisteredPeerManager.php
View file

@ -202,17 +202,17 @@
*/ */
public static function synchronizeExternalPeer(Peer $peer): void public static function synchronizeExternalPeer(Peer $peer): void
{ {
if($peer->getAddress()->getDomain() === Configuration::getInstanceConfiguration()->getDomain()) if($peer->getPeerAddress()->getDomain() === Configuration::getInstanceConfiguration()->getDomain())
{ {
throw new InvalidArgumentException('Given peer is not an external peer'); throw new InvalidArgumentException('Given peer is not an external peer');
} }
if($peer->getAddress()->getUsername() === ReservedUsernames::HOST->value) if($peer->getPeerAddress()->getUsername() === ReservedUsernames::HOST->value)
{ {
throw new InvalidArgumentException('Cannot synchronize an external host peer'); throw new InvalidArgumentException('Cannot synchronize an external host peer');
} }
$existingPeer = self::getPeerByAddress($peer->getAddress()); $existingPeer = self::getPeerByAddress($peer->getPeerAddress());
if($existingPeer !== null) if($existingPeer !== null)
{ {
// getUpdated is DateTime() if it's older than 1 hour, update it // getUpdated is DateTime() if it's older than 1 hour, update it
@ -263,9 +263,9 @@
{ {
$statement = Database::getConnection()->prepare('INSERT INTO peers (uuid, username, server, enabled) VALUES (:uuid, :username, :server, 1)'); $statement = Database::getConnection()->prepare('INSERT INTO peers (uuid, username, server, enabled) VALUES (:uuid, :username, :server, 1)');
$statement->bindParam(':uuid', $uuid); $statement->bindParam(':uuid', $uuid);
$username = $peer->getAddress()->getUsername(); $username = $peer->getPeerAddress()->getUsername();
$statement->bindParam(':username', $username); $statement->bindParam(':username', $username);
$server = $peer->getAddress()->getDomain(); $server = $peer->getPeerAddress()->getDomain();
$statement->bindParam(':server', $server); $statement->bindParam(':server', $server);
$statement->execute(); $statement->execute();