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

29
src/Socialbox/Socialbox.php
View file

@ -243,9 +243,10 @@
self::returnError(403, StandardError::FORBIDDEN, 'Unauthorized: The requested peer is disabled/banned'); self::returnError(403, StandardError::FORBIDDEN, 'Unauthorized: The requested peer is disabled/banned');
return; return;
} }
// If-clause for handling the host peer, host peers are always enabled unless the fist clause is true // If-clause for handling the host peer, host peers are always enabled unless the fist clause is true
// in which case the host was blocked by this server. // in which case the host was blocked by this server.
elseif($clientRequest->getIdentifyAs()->getUsername() === ReservedUsernames::HOST->value) if($clientRequest->getIdentifyAs()->getUsername() === ReservedUsernames::HOST->value)
{ {
// If the host is not registered, register it // If the host is not registered, register it
if($registeredPeer === null) if($registeredPeer === null)
@ -262,8 +263,8 @@
} }
} }
} }
// Otherwise the peer isn't registered, so we need to register it
else if($registeredPeer === null)
{ {
// Check if registration is enabled // Check if registration is enabled
if(!Configuration::getRegistrationConfiguration()->isRegistrationEnabled()) if(!Configuration::getRegistrationConfiguration()->isRegistrationEnabled())
@ -290,6 +291,18 @@
clientPublicEncryptionKey: $clientPublicEncryptionKey, clientPublicEncryptionKey: $clientPublicEncryptionKey,
serverEncryptionKeyPair: $serverEncryptionKeyPair serverEncryptionKeyPair: $serverEncryptionKeyPair
); );
}
catch(InvalidArgumentException $e)
{
// This is usually thrown due to an invalid input
self::returnError(400, StandardError::BAD_REQUEST, $e->getMessage(), $e);
return;
}
catch(Exception $e)
{
self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'An internal error occurred while initiating the session', $e);
return;
}
// The server responds back with the session UUID & The server's public encryption key as the header // The server responds back with the session UUID & The server's public encryption key as the header
http_response_code(201); // Created http_response_code(201); // Created
@ -297,16 +310,6 @@
header(StandardHeaders::ENCRYPTION_PUBLIC_KEY->value . ': ' . $serverEncryptionKeyPair->getPublicKey()); header(StandardHeaders::ENCRYPTION_PUBLIC_KEY->value . ': ' . $serverEncryptionKeyPair->getPublicKey());
print($sessionUuid); // Return the session UUID print($sessionUuid); // Return the session UUID
} }
catch(InvalidArgumentException $e)
{
// This is usually thrown due to an invalid input
self::returnError(400, StandardError::BAD_REQUEST, $e->getMessage(), $e);
}
catch(Exception $e)
{
self::returnError(500, StandardError::INTERNAL_SERVER_ERROR, 'An internal error occurred while initiating the session', $e);
}
}
/** /**
* Handles the Diffie-Hellman Ephemeral (DHE) key exchange process between the client and server, * Handles the Diffie-Hellman Ephemeral (DHE) key exchange process between the client and server,