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

Compare commits

base: Nosial:bde2b48470e09a8f830d68445e31ce0438c1fac7
Branches Tags
Nosial:master
Nosial:dev
..
compare: Nosial:22629f9b30654ef4a30a0f51f2e854aeddab50dc
Branches Tags
Nosial:master
Nosial:dev

No commits in common. "bde2b48470e09a8f830d68445e31ce0438c1fac7" and "22629f9b30654ef4a30a0f51f2e854aeddab50dc" have entirely different histories.
bde2b48470 ... 22629f9b30

4 changed files with 23 additions and 112 deletions
Show stats Expand all files Collapse all files

3
src/Socialbox/Classes/StandardMethods/Settings/SettingsUpdatePassword.php
View file

@ -3,7 +3,6 @@
namespace Socialbox\Classes\StandardMethods\Settings; namespace Socialbox\Classes\StandardMethods\Settings;
use Socialbox\Abstracts\Method; use Socialbox\Abstracts\Method;
use Socialbox\Classes\Logger;
use Socialbox\Enums\StandardError; use Socialbox\Enums\StandardError;
use Socialbox\Exceptions\CryptographyException; use Socialbox\Exceptions\CryptographyException;
use Socialbox\Exceptions\DatabaseOperationException; use Socialbox\Exceptions\DatabaseOperationException;
@ -44,7 +43,7 @@
try try
{ {
if (!PasswordManager::verifyPassword($request->getPeer(), (string)$rpcRequest->getParameter('existing_password'))) if (!PasswordManager::verifyPassword($request->getPeer()->getUuid(), $rpcRequest->getParameter('existing_password')))
{ {
return $rpcRequest->produceResponse(false); return $rpcRequest->produceResponse(false);
} }

2
src/Socialbox/Classes/StandardMethods/Verification/VerificationPasswordAuthentication.php
View file

@ -36,7 +36,7 @@
return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, 'Password verification is not required at this time'); return $rpcRequest->produceError(StandardError::METHOD_NOT_ALLOWED, 'Password verification is not required at this time');
} }
$result = PasswordManager::verifyPassword($request->getPeer(), $rpcRequest->getParameter('password')); $result = PasswordManager::verifyPassword($request->getPeer()->getUuid(), $rpcRequest->getParameter('password'));
if($result) if($result)
{ {

2
src/Socialbox/Managers/PasswordManager.php
View file

@ -199,7 +199,7 @@
$record = $stmt->fetch(PDO::FETCH_ASSOC); $record = $stmt->fetch(PDO::FETCH_ASSOC);
if($record === false) if($record === false)
{ {
throw new DatabaseOperationException('No password hash found for the given peer UUID'); return false;
} }
$encryptedHash = $record['hash']; $encryptedHash = $record['hash'];

128
tests/Socialbox/SettingsTest.php
View file

@ -26,7 +26,7 @@
*/ */
public function testInformationFieldDisplayName(): void public function testInformationFieldDisplayName(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldDisplayName'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'validInputTest');
$displayName = Helper::generateRandomString(32); $displayName = Helper::generateRandomString(32);
$rpcClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, $displayName); $rpcClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, $displayName);
@ -42,7 +42,7 @@
*/ */
public function testInformationFieldInvalidDisplayName(): void public function testInformationFieldInvalidDisplayName(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldInvalidDisplayName'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'malformedInputTest');
try try
{ {
@ -73,7 +73,7 @@
*/ */
public function testInformationFieldFirstName(): void public function testInformationFieldFirstName(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldFirstName'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'validInputTest');
$firstName = Helper::generateRandomString(32); $firstName = Helper::generateRandomString(32);
$rpcClient->settingsAddInformationField(InformationFieldName::FIRST_NAME, $firstName); $rpcClient->settingsAddInformationField(InformationFieldName::FIRST_NAME, $firstName);
@ -89,7 +89,7 @@
*/ */
public function testInformationFieldInvalidFirstName(): void public function testInformationFieldInvalidFirstName(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldInvalidFirstName'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'malformedInputTest');
try try
{ {
@ -120,7 +120,7 @@
*/ */
public function testInformationFieldMiddleName(): void public function testInformationFieldMiddleName(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldMiddleName'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'validInputTest');
$middleName = Helper::generateRandomString(32); $middleName = Helper::generateRandomString(32);
$rpcClient->settingsAddInformationField(InformationFieldName::MIDDLE_NAME, $middleName); $rpcClient->settingsAddInformationField(InformationFieldName::MIDDLE_NAME, $middleName);
@ -137,7 +137,7 @@
*/ */
public function testInformationFieldInvalidMiddleName(): void public function testInformationFieldInvalidMiddleName(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldInvalidMiddleName'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'malformedInputTest');
try try
{ {
@ -168,7 +168,7 @@
*/ */
public function testInformationFieldLastName(): void public function testInformationFieldLastName(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldLastName'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'validInputTest');
$lastName = Helper::generateRandomString(32); $lastName = Helper::generateRandomString(32);
$rpcClient->settingsAddInformationField(InformationFieldName::LAST_NAME, $lastName); $rpcClient->settingsAddInformationField(InformationFieldName::LAST_NAME, $lastName);
@ -184,7 +184,7 @@
*/ */
public function testInformationFieldInvalidLastName(): void public function testInformationFieldInvalidLastName(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldInvalidLastName'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'malformedInputTest');
try try
{ {
@ -215,7 +215,7 @@
*/ */
public function testInformationFieldPhoneNumber(): void public function testInformationFieldPhoneNumber(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldPhoneNumber'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'validInputTest');
$phoneNumber = sprintf('+%d', Helper::generateRandomNumber(12)); $phoneNumber = sprintf('+%d', Helper::generateRandomNumber(12));
$rpcClient->settingsAddInformationField(InformationFieldName::PHONE_NUMBER, $phoneNumber); $rpcClient->settingsAddInformationField(InformationFieldName::PHONE_NUMBER, $phoneNumber);
@ -231,7 +231,7 @@
*/ */
public function testInformationFieldInvalidPhoneNumber(): void public function testInformationFieldInvalidPhoneNumber(): void
{ {
$rpcClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'testInformationFieldInvalidPhoneNumber'); $rpcClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'malformedTest');
try try
{ {
@ -282,7 +282,7 @@
*/ */
public function testInformationFieldEmailAddress(): void public function testInformationFieldEmailAddress(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldEmailAddress'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'validInputTest');
$rpcClient->settingsAddInformationField(InformationFieldName::EMAIL_ADDRESS, 'testing@example.com'); $rpcClient->settingsAddInformationField(InformationFieldName::EMAIL_ADDRESS, 'testing@example.com');
$this->assertTrue($rpcClient->settingsInformationFieldExists(InformationFieldName::EMAIL_ADDRESS)); $this->assertTrue($rpcClient->settingsInformationFieldExists(InformationFieldName::EMAIL_ADDRESS));
@ -298,7 +298,7 @@
*/ */
public function testInformationFieldInvalidEmailAddress(): void public function testInformationFieldInvalidEmailAddress(): void
{ {
$rpcClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'testInformationFieldInvalidEmailAddress'); $rpcClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'malformedTest');
try try
{ {
@ -344,7 +344,7 @@
*/ */
public function testInformationFieldInvalidUrl(): void public function testInformationFieldInvalidUrl(): void
{ {
$rpcClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'testInformationFieldInvalidUrl'); $rpcClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'malformedTest');
try try
{ {
@ -375,7 +375,7 @@
*/ */
public function testInformationFieldBirthday(): void public function testInformationFieldBirthday(): void
{ {
$rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInformationFieldBirthday'); $rpcClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'validInputTest');
$rpcClient->settingsAddInformationField(InformationFieldName::BIRTHDAY, '2021-01-01'); $rpcClient->settingsAddInformationField(InformationFieldName::BIRTHDAY, '2021-01-01');
$this->assertTrue($rpcClient->settingsInformationFieldExists(InformationFieldName::BIRTHDAY)); $this->assertTrue($rpcClient->settingsInformationFieldExists(InformationFieldName::BIRTHDAY));
@ -390,7 +390,7 @@
*/ */
public function testInformationFieldInvalidBirthday(): void public function testInformationFieldInvalidBirthday(): void
{ {
$rpcClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'testInformationFieldInvalidBirthday'); $rpcClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'malformedTest');
try try
{ {
@ -421,7 +421,7 @@
*/ */
public function testInvalidInformationField(): void public function testInvalidInformationField(): void
{ {
$testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testInvalidInformationField'); $testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'invalidInformationFieldTest');
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe')); $this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe'));
$this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123')); $this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($testClient->getSessionState()->isAuthenticated()); $this->assertTrue($testClient->getSessionState()->isAuthenticated());
@ -456,7 +456,7 @@
*/ */
public function testDeleteRequiredInformationField(): void public function testDeleteRequiredInformationField(): void
{ {
$testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testDeleteRequiredInformationField'); $testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'invalidInformationFieldPrivacyTest');
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe')); $this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe'));
$this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123')); $this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($testClient->getSessionState()->isAuthenticated()); $this->assertTrue($testClient->getSessionState()->isAuthenticated());
@ -473,7 +473,7 @@
*/ */
public function testDeleteInformationField(): void public function testDeleteInformationField(): void
{ {
$johnClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'testDeleteInformationField'); $johnClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'johnDeleteInformationFieldTest');
$this->assertTrue($johnClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe')); $this->assertTrue($johnClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe'));
$this->assertTrue($johnClient->settingsAddInformationField(InformationFieldName::FIRST_NAME, 'John', PrivacyState::PUBLIC)); $this->assertTrue($johnClient->settingsAddInformationField(InformationFieldName::FIRST_NAME, 'John', PrivacyState::PUBLIC));
$this->assertTrue($johnClient->settingsSetPassword('SecretTestingPassword123')); $this->assertTrue($johnClient->settingsSetPassword('SecretTestingPassword123'));
@ -589,7 +589,7 @@
*/ */
public function testSettingsAddMultipleSigningKeys(): void public function testSettingsAddMultipleSigningKeys(): void
{ {
$testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testSettingsAddMultipleSigningKeys'); $testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'deleteRequiredPassword');
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe')); $this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe'));
$this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123')); $this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($testClient->getSessionState()->isAuthenticated()); $this->assertTrue($testClient->getSessionState()->isAuthenticated());
@ -603,32 +603,6 @@
$signingKeys[$signatureUuid] = $signingKeypair; $signingKeys[$signatureUuid] = $signingKeypair;
} }
$this->assertCount(20, $testClient->settingsGetSignatures());
// Verify all the signatures
foreach($signingKeys as $signatureUuid => $signingKeypair)
{
$signature = $testClient->settingsGetSignature($signatureUuid);
$this->assertNotNull($signature);
$this->assertEquals($signingKeypair->getPublicKey(), $signature->getPublicKey());
}
// Delete the first 5 signatures
$deletedSignatures = array_slice($signingKeys, 0, 10);
foreach($deletedSignatures as $signatureUuid => $signingKeypair)
{
$this->assertTrue($testClient->settingsDeleteSignature($signatureUuid));
}
// Verify the remaining signatures
$remainingSignatures = array_slice($signingKeys, 10);
foreach($remainingSignatures as $signatureUuid => $signingKeypair)
{
$signature = $testClient->settingsGetSignature($signatureUuid);
$this->assertNotNull($signature);
$this->assertEquals($signingKeypair->getPublicKey(), $signature->getPublicKey());
}
$this->assertCount(10, $testClient->settingsGetSignatures()); $this->assertCount(10, $testClient->settingsGetSignatures());
} }
@ -640,7 +614,7 @@
*/ */
public function testSettingsAddExceedingSigningKeys(): void public function testSettingsAddExceedingSigningKeys(): void
{ {
$testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testSettingsAddExceedingSigningKeys'); $testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'deleteRequiredPassword');
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe')); $this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe'));
$this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123')); $this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($testClient->getSessionState()->isAuthenticated()); $this->assertTrue($testClient->getSessionState()->isAuthenticated());
@ -656,66 +630,4 @@
$signingKeys[$signatureUuid] = $signingKeypair; $signingKeys[$signatureUuid] = $signingKeypair;
} }
} }
/**
* @throws RpcException
* @throws DatabaseOperationException
* @throws ResolutionException
* @throws CryptographyException
*/
public function testGetInformationFields(): void
{
$testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testGetInformationFields');
$phoneNumber = sprintf('+%d', Helper::generateRandomNumber(12));
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe', PrivacyState::PUBLIC));
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::FIRST_NAME, 'John', PrivacyState::PUBLIC));
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::LAST_NAME, 'Doe', PrivacyState::PUBLIC));
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::EMAIL_ADDRESS, 'johndoe@example.com', PrivacyState::CONTACTS));
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::PHONE_NUMBER, $phoneNumber, PrivacyState::TRUSTED));
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::BIRTHDAY, '1978-16-05', PrivacyState::TRUSTED));
$this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($testClient->getSessionState()->isAuthenticated());
$informationFields = $testClient->settingsGetInformationFields();
$this->assertCount(6, $informationFields);
foreach($informationFields as $informationField)
{
switch($informationField->getName())
{
case InformationFieldName::DISPLAY_NAME:
$this->assertEquals('John Doe', $informationField->getValue());
$this->assertEquals(PrivacyState::PUBLIC, $informationField->getPrivacyState());
break;
case InformationFieldName::FIRST_NAME:
$this->assertEquals('John', $informationField->getValue());
$this->assertEquals(PrivacyState::PUBLIC, $informationField->getPrivacyState());
break;
case InformationFieldName::LAST_NAME:
$this->assertEquals('Doe', $informationField->getValue());
$this->assertEquals(PrivacyState::PUBLIC, $informationField->getPrivacyState());
break;
case InformationFieldName::EMAIL_ADDRESS:
$this->assertEquals('johndoe@example.com', $informationField->getValue());
$this->assertEquals(PrivacyState::CONTACTS, $informationField->getPrivacyState());
break;
case InformationFieldName::PHONE_NUMBER:
$this->assertEquals($phoneNumber, $informationField->getValue());
$this->assertEquals(PrivacyState::TRUSTED, $informationField->getPrivacyState());
break;
case InformationFieldName::BIRTHDAY:
$this->assertEquals('1978-16-05', $informationField->getValue());
$this->assertEquals(PrivacyState::TRUSTED, $informationField->getPrivacyState());
break;
default:
$this->fail(sprintf('Unexpected information field: %s', $informationField->getName()->value));
}
}
}
} }