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

Compare commits

base: Nosial:f36a7f8563c2c27cd9b4398ce63ededf2b32d322
Branches Tags
Nosial:master
Nosial:dev
..
compare: Nosial:3c151bfd998e6e5d41f431a49d62c5d9cbc12937
Branches Tags
Nosial:master
Nosial:dev

No commits in common. "f36a7f8563c2c27cd9b4398ce63ededf2b32d322" and "3c151bfd998e6e5d41f431a49d62c5d9cbc12937" have entirely different histories.
f36a7f8563 ... 3c151bfd99

6 changed files with 6 additions and 68 deletions
Show stats Expand all files Collapse all files

3
docker/logger.py
View file

@ -303,13 +303,12 @@ class MultiProtocolServer:
def _start_udp_server(self):
with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as udp_socket:
udp_socket.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 1024 * 1024)
udp_socket.bind((self.host, self.port))
self.logger.debug(f"UDP server running on {self.host}:{self.port}")
while not self.stop_event.is_set():
try:
data, address = udp_socket.recvfrom(65535)
data, address = udp_socket.recvfrom(4096)
self._handle_udp_client(data, address)
except Exception as e:
self.logger.error(f"UDP server error: {e}")

4
src/Socialbox/Classes/RpcClient.php
View file

@ -59,10 +59,6 @@
public function __construct(string|PeerAddress $identifiedAs, ?string $server=null, ?ExportedSession $exportedSession=null)
{
$this->logger = new \LogLib2\Logger('net.nosial.socialbox');
if($server !== null)
{
$server = strtolower($server);
}
// If an exported session is provided, no need to re-connect.
// Just use the session details provided.

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

@ -20,8 +20,6 @@
*/
public static function sessionExists(string $domain): bool
{
$domain = strtolower($domain);
try
{
$stmt = Database::getConnection()->prepare("SELECT COUNT(*) FROM external_sessions WHERE domain=:domain LIMIT 1");
@ -49,7 +47,7 @@
try
{
$stmt = Database::getConnection()->prepare("INSERT INTO external_sessions (domain, rpc_endpoint, session_uuid, transport_encryption_algorithm, server_keypair_expires, server_public_signing_key, server_public_encryption_key, host_public_encryption_key, host_private_encryption_key, private_shared_secret, host_transport_encryption_key, server_transport_encryption_key) VALUES (:domain, :rpc_endpoint, :session_uuid, :transport_encryption_algorithm, :server_keypair_expires, :server_public_signing_key, :server_public_encryption_key, :host_public_encryption_key, :host_private_encryption_key, :private_shared_secret, :host_transport_encryption_key, :server_transport_encryption_key)");
$domain = strtolower($exportedSession->getRemoteServer());
$domain = $exportedSession->getRemoteServer();
$stmt->bindParam(':domain', $domain);
$rpcEndpoint = $exportedSession->getRpcEndpoint();
$stmt->bindParam(':rpc_endpoint', $rpcEndpoint);
@ -91,8 +89,6 @@
*/
public static function getSession(string $domain): ?ExportedSession
{
$domain = strtolower($domain);
try
{
$stmt = Database::getConnection()->prepare("SELECT * FROM external_sessions WHERE domain=:domain LIMIT 1");
@ -138,8 +134,6 @@
*/
public static function removeSession(string $domain): void
{
$domain = strtolower($domain);
try
{
$stmt = Database::getConnection()->prepare("DELETE FROM external_sessions WHERE domain=:domain");
@ -162,8 +156,6 @@
*/
public static function updateLastAccessed(string $domain): void
{
try
{
$stmt = Database::getConnection()->prepare("UPDATE external_sessions SET last_accessed=CURRENT_TIMESTAMP WHERE domain=:domain");

7
src/Socialbox/Socialbox.php
View file

@ -734,8 +734,6 @@
*/
public static function getExternalSession(string $domain): SocialClient
{
$domain = strtolower($domain);
if(ExternalSessionManager::sessionExists($domain))
{
return new SocialClient(self::getServerAddress(), $domain, ExternalSessionManager::getSession($domain));
@ -751,11 +749,6 @@
throw new ResolutionException(sprintf('Failed to connect to remote server %s: %s', $domain, $e->getMessage()), $e->getCode(), $e);
}
if(!$client->getSessionState()->isAuthenticated())
{
throw new ResolutionException(sprintf('Failed to authenticate with remote server %s', $domain));
}
ExternalSessionManager::addSession($client->exportSession());
return $client;
}

10
tests/Socialbox/AddressBookTest.php
View file

@ -688,14 +688,12 @@
public function testCaseInsensitiveContactAddress(): void
{
$johnClient = Helper::generateRandomClient(TEAPOT_DOMAIN, prefix: 'johnCaseTest');
$this->assertTrue($johnClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe'));
$this->assertTrue($johnClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($johnClient->getSessionState()->isAuthenticated());
$johnClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe');
$johnClient->settingsSetPassword('SecretTestingPassword123');
$aliceClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'aliceCaseTest');
$this->assertTrue($aliceClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'Alice Smith'));
$this->assertTrue($aliceClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($aliceClient->getSessionState()->isAuthenticated());
$aliceClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'Alice Smith');
$aliceClient->settingsSetPassword('SecretTestingPassword123');
$aliceAddress = $aliceClient->getIdentifiedAs();
$mixedCaseAddress = ucfirst(strtolower($aliceAddress->getUsername())).'@'.strtoupper($aliceAddress->getDomain());

40
tests/Socialbox/SettingsTest.php
View file

@ -4,7 +4,6 @@
use Helper;
use PHPUnit\Framework\TestCase;
use Socialbox\Enums\Flags\SessionFlags;
use Socialbox\Enums\PrivacyState;
use Socialbox\Enums\Types\InformationFieldName;
use Socialbox\Exceptions\CryptographyException;
@ -513,43 +512,4 @@
$this->assertTrue($aliceResolved->informationFieldExists(InformationFieldName::DISPLAY_NAME));
$this->assertEquals('Alice Smith', $aliceResolved->getInformationField(InformationFieldName::DISPLAY_NAME)->getValue());
}
/**
* @throws RpcException
* @throws ResolutionException
* @throws CryptographyException
* @throws DatabaseOperationException
*/
public function testDeleteRequiredPassword(): void
{
$testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'deleteRequiredPassword');
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe'));
$this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($testClient->getSessionState()->isAuthenticated());
$this->expectException(RpcException::class);
$testClient->settingsDeletePassword();
}
/**
* @throws RpcException
* @throws DatabaseOperationException
* @throws ResolutionException
* @throws CryptographyException
*/
public function testSettingsSetOtp(): void
{
$testClient = Helper::generateRandomClient(COFFEE_DOMAIN, prefix: 'testSetOtp');
$testAddress = $testClient->getIdentifiedAs();
$this->assertTrue($testClient->settingsAddInformationField(InformationFieldName::DISPLAY_NAME, 'John Doe'));
$this->assertTrue($testClient->settingsSetPassword('SecretTestingPassword123'));
$this->assertTrue($testClient->getSessionState()->isAuthenticated());
$secret = $testClient->settingsSetOtp('SecretTestingPassword123');
$this->assertNotEmpty($secret);
$testClient = new SocialClient($testAddress);
$this->assertFalse($testClient->getSessionState()->isAuthenticated());
$this->assertTrue($testClient->getSessionState()->containsFlag(SessionFlags::VER_OTP));
}
}