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

22
src/Socialbox/Managers/EncryptionChannelManager.php
View file

@ -373,37 +373,37 @@
* @param EncryptionMessageRecipient $recipient The recipient of the message * @param EncryptionMessageRecipient $recipient The recipient of the message
* @param string $checksum The SHA512 checksum of the decrypted data content * @param string $checksum The SHA512 checksum of the decrypted data content
* @param string $data The encrypted data of the message * @param string $data The encrypted data of the message
* @param string|null $uuid Optional. The UUID of the message, used for server-to-server replication * @param string|null $messageUuid Optional. The UUID of the message, used for server-to-server replication
* @param int|null $timestamp Optional. The Timestamp of the message, used for server-to-server replication * @param int|null $messageTimestamp Optional. The Timestamp of the message, used for server-to-server replication
* @return string Returns the UUID of the message, if $uuid was provided then it's value is returned. * @return string Returns the UUID of the message, if $uuid was provided then it's value is returned.
* @throws DatabaseOperationException Thrown if there was a database error while inserting the record * @throws DatabaseOperationException Thrown if there was a database error while inserting the record
*/ */
public static function sendMessage(string $channelUuid, EncryptionMessageRecipient $recipient, string $checksum, string $data, public static function sendMessage(string $channelUuid, EncryptionMessageRecipient $recipient, string $checksum, string $data,
?string $uuid=null, ?int $timestamp=null): string ?string $messageUuid=null, ?int $messageTimestamp=null): string
{ {
if($uuid === null) if($messageUuid === null)
{ {
$uuid = Uuid::v4()->toRfc4122(); $messageUuid = Uuid::v4()->toRfc4122();
} }
elseif(!Validator::validateUuid($uuid)) elseif(!Validator::validateUuid($messageUuid))
{ {
throw new InvalidArgumentException('Invalid UUID V4 of the message'); throw new InvalidArgumentException('Invalid UUID V4 of the message');
} }
if($timestamp === null) if($messageTimestamp === null)
{ {
$timestamp = time(); $messageTimestamp = time();
} }
try try
{ {
$stmt = Database::getConnection()->prepare('INSERT INTO encryption_channels_com (uuid, channel_uuid, recipient, checksum, data, timestamp) VALUES (:uuid, :channel_uuid, :recipient, :checksum, :data, :timestamp)'); $stmt = Database::getConnection()->prepare('INSERT INTO encryption_channels_com (uuid, channel_uuid, recipient, checksum, data, timestamp) VALUES (:uuid, :channel_uuid, :recipient, :checksum, :data, :timestamp)');
$stmt->bindParam(':uuid', $uuid); $stmt->bindParam(':uuid', $messageUuid);
$stmt->bindParam(':channel_uuid', $channelUuid); $stmt->bindParam(':channel_uuid', $channelUuid);
$stmt->bindParam(':recipient', $recipient); $stmt->bindParam(':recipient', $recipient);
$stmt->bindParam(':checksum', $checksum); $stmt->bindParam(':checksum', $checksum);
$stmt->bindParam(':data', $data); $stmt->bindParam(':data', $data);
$stmt->bindParam(':timestamp', $timestamp); $stmt->bindParam(':timestamp', $messageTimestamp);
$stmt->execute(); $stmt->execute();
} }
@ -412,7 +412,7 @@
throw new DatabaseOperationException('Failed to send data through the encryption channel', $e); throw new DatabaseOperationException('Failed to send data through the encryption channel', $e);
} }
return $uuid; return $messageUuid;
} }
/** /**