From 20e2e43d29d9a813f69b29ad95492984d464c7bd Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Thu, 1 Mar 2018 17:30:27 +0000 Subject: [PATCH] Better auth key & DC management --- src/danog/MadelineProto/Logger.php | 7 ------- src/danog/MadelineProto/MTProto.php | 2 +- .../MTProtoTools/CallHandler.php | 8 +++++++- .../MTProtoTools/MessageHandler.php | 4 +++- .../MTProtoTools/ResponseHandler.php | 20 +++++++++++++++++-- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/danog/MadelineProto/Logger.php b/src/danog/MadelineProto/Logger.php index 51c02547..5c423a1f 100644 --- a/src/danog/MadelineProto/Logger.php +++ b/src/danog/MadelineProto/Logger.php @@ -52,11 +52,6 @@ class Logger if (!defined('\\danog\\MadelineProto\\VoIP::PHP_LIBTGVOIP_VERSION') || \danog\MadelineProto\VoIP::PHP_LIBTGVOIP_VERSION !== '1.1.2') { throw new \danog\MadelineProto\Exception(hex2bin(\danog\MadelineProto\Lang::$current_lang['v_tgerror']), 0, null, 'MadelineProto', 1); } - - try { - \Threaded::extend('\\danog\\MadelineProto\\VoIP'); - } catch (\RuntimeException $e) { - } } self::$colors[self::ULTRA_VERBOSE] = implode(';', [self::foreground['light_gray'], self::set['dim']]); self::$colors[self::VERBOSE] = implode(';', [self::foreground['green'], self::set['bold']]); @@ -120,8 +115,6 @@ class Logger case 3: echo self::$isatty ? "\33[".self::$colors[$level].'m'.$param."\33[0m".PHP_EOL : $param.PHP_EOL; break; - default: - break; } } } diff --git a/src/danog/MadelineProto/MTProto.php b/src/danog/MadelineProto/MTProto.php index 35edc237..d3049ab8 100644 --- a/src/danog/MadelineProto/MTProto.php +++ b/src/danog/MadelineProto/MTProto.php @@ -319,7 +319,7 @@ class MTProto // Set default settings $default_settings = ['authorization' => [ // Authorization settings - 'default_temp_auth_key_expires_in' => 31557600, + 'default_temp_auth_key_expires_in' => 1*24*60*60, // validity of temporary keys and the binding of the temporary and permanent keys 'rsa_keys' => ["-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAwVACPi9w23mF3tBkdZz+zwrzKOaaQdr01vAbU4E1pvkfj4sqDsm6\nlyDONS789sVoD/xCS9Y0hkkC3gtL1tSfTlgCMOOul9lcixlEKzwKENj1Yz/s7daS\nan9tqw3bfUV/nqgbhGX81v/+7RFAEd+RwFnK7a+XYl9sluzHRyVVaTTveB2GazTw\nEfzk2DWgkBluml8OREmvfraX3bkHZJTKX4EQSjBbbdJ2ZXIsRrYOXfaA+xayEGB+\n8hdlLmAjbCVfaigxX0CDqWeR1yFL9kwd9P0NsZRPsmoqVwMbMu7mStFai6aIhc3n\nSlv8kg9qv1m6XHVQY3PnEw+QQtqSIXklHwIDAQAB\n-----END RSA PUBLIC KEY-----", "-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAxq7aeLAqJR20tkQQMfRn+ocfrtMlJsQ2Uksfs7Xcoo77jAid0bRt\nksiVmT2HEIJUlRxfABoPBV8wY9zRTUMaMA654pUX41mhyVN+XoerGxFvrs9dF1Ru\nvCHbI02dM2ppPvyytvvMoefRoL5BTcpAihFgm5xCaakgsJ/tH5oVl74CdhQw8J5L\nxI/K++KJBUyZ26Uba1632cOiq05JBUW0Z2vWIOk4BLysk7+U9z+SxynKiZR3/xdi\nXvFKk01R3BHV+GUKM2RYazpS/P8v7eyKhAbKxOdRcFpHLlVwfjyM1VlDQrEZxsMp\nNTLYXb6Sce1Uov0YtNx5wEowlREH1WOTlwIDAQAB\n-----END RSA PUBLIC KEY-----", "-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAsQZnSWVZNfClk29RcDTJQ76n8zZaiTGuUsi8sUhW8AS4PSbPKDm+\nDyJgdHDWdIF3HBzl7DHeFrILuqTs0vfS7Pa2NW8nUBwiaYQmPtwEa4n7bTmBVGsB\n1700/tz8wQWOLUlL2nMv+BPlDhxq4kmJCyJfgrIrHlX8sGPcPA4Y6Rwo0MSqYn3s\ng1Pu5gOKlaT9HKmE6wn5Sut6IiBjWozrRQ6n5h2RXNtO7O2qCDqjgB2vBxhV7B+z\nhRbLbCmW0tYMDsvPpX5M8fsO05svN+lKtCAuz1leFns8piZpptpSCFn7bWxiA9/f\nx5x17D7pfah3Sy2pA+NDXyzSlGcKdaUmwQIDAQAB\n-----END RSA PUBLIC KEY-----", "-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAwqjFW0pi4reKGbkc9pK83Eunwj/k0G8ZTioMMPbZmW99GivMibwa\nxDM9RDWabEMyUtGoQC2ZcDeLWRK3W8jMP6dnEKAlvLkDLfC4fXYHzFO5KHEqF06i\nqAqBdmI1iBGdQv/OQCBcbXIWCGDY2AsiqLhlGQfPOI7/vvKc188rTriocgUtoTUc\n/n/sIUzkgwTqRyvWYynWARWzQg0I9olLBBC2q5RQJJlnYXZwyTL3y9tdb7zOHkks\nWV9IMQmZmyZh/N7sMbGWQpt4NMchGpPGeJ2e5gHBjDnlIf2p1yZOYeUYrdbwcS0t\nUiggS4UeE8TzIuXFQxw7fzEIlmhIaq3FnwIDAQAB\n-----END RSA PUBLIC KEY-----"], ], 'connection' => [ diff --git a/src/danog/MadelineProto/MTProtoTools/CallHandler.php b/src/danog/MadelineProto/MTProtoTools/CallHandler.php index dc066a11..a3805111 100644 --- a/src/danog/MadelineProto/MTProtoTools/CallHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/CallHandler.php @@ -215,7 +215,13 @@ trait CallHandler } } catch (\danog\MadelineProto\Exception $e) { $last_error = $e->getMessage().' in '.basename($e->getFile(), '.php').' on line '.$e->getLine(); - \danog\MadelineProto\Logger::log(['An error occurred while calling method '.$method.': '.$last_error.'. Recreating connection and retrying to call method...'], \danog\MadelineProto\Logger::WARNING); + if (strpos($e->getMessage(), 'Received request to switch to DC ') === 0) { + if ($this->authorized_dc === -1 && $method === 'users.getUsers' && $args = ['id' => [['_' => 'inputUserSelf']]]) { + $this->authorized_dc = $this->datacenter->curdc; + } + \danog\MadelineProto\Logger::log([$e->getMessage()], \danog\MadelineProto\Logger::WARNING); + continue; + } $this->close_and_reopen($aargs['datacenter']); if ($e->getMessage() === 'Re-executing query after server error...') { return $this->method_call($method, $args, $aargs); diff --git a/src/danog/MadelineProto/MTProtoTools/MessageHandler.php b/src/danog/MadelineProto/MTProtoTools/MessageHandler.php index 07a3e79b..ab7be873 100644 --- a/src/danog/MadelineProto/MTProtoTools/MessageHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/MessageHandler.php @@ -91,7 +91,9 @@ trait MessageHandler } $payload = $this->datacenter->sockets[$datacenter]->read_message(); if (strlen($payload) === 4) { - return $this->unpack_signed_int($payload); + $payload = $this->unpack_signed_int($payload); + \danog\MadelineProto\Logger::log(["Received $payload"], \danog\MadelineProto\Logger::ULTRA_VERBOSE); + return $payload; } $auth_key_id = substr($payload, 0, 8); if ($auth_key_id === "\0\0\0\0\0\0\0\0") { diff --git a/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php b/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php index d4c4540d..6f8d246e 100644 --- a/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/ResponseHandler.php @@ -340,6 +340,7 @@ trait ResponseHandler case 'USER_DEACTIVATED': case 'SESSION_REVOKED': case 'SESSION_EXPIRED': + \danog\MadelineProto\Logger::log([$server_answer['error_message']], \danog\MadelineProto\Logger::FATAL_ERROR); foreach ($this->datacenter->sockets as $socket) { $socket->temp_auth_key = null; $socket->auth_key = null; @@ -348,23 +349,38 @@ trait ResponseHandler $this->authorized = self::NOT_LOGGED_IN; $this->authorization = null; $this->init_authorization(); - // idk throw new \danog\MadelineProto\RPCErrorException($server_answer['error_message'], $server_answer['error_code']); case 'AUTH_KEY_UNREGISTERED': case 'AUTH_KEY_INVALID': if ($this->authorized !== self::LOGGED_IN) { throw new \danog\MadelineProto\RPCErrorException($server_answer['error_message'], $server_answer['error_code']); } + \danog\MadelineProto\Logger::log(['Auth key not registered, resetting temporary and permanent auth keys...'], \danog\MadelineProto\Logger::ERROR); + $this->datacenter->sockets[$aargs['datacenter']]->temp_auth_key = null; $this->datacenter->sockets[$aargs['datacenter']]->auth_key = null; $this->datacenter->sockets[$aargs['datacenter']]->authorized = false; + if ($this->authorized_dc === $aargs['datacenter'] && $this->authorized === self::LOGGED_IN) { + \danog\MadelineProto\Logger::log(['Permanent auth key was main authorized key, logging out...'], \danog\MadelineProto\Logger::FATAL_ERROR); + foreach ($this->datacenter->sockets as $socket) { + $socket->temp_auth_key = null; + $socket->auth_key = null; + $socket->authorized = false; + } + $this->authorized = self::NOT_LOGGED_IN; + $this->authorization = null; + $this->init_authorization(); + throw new \danog\MadelineProto\RPCErrorException($server_answer['error_message'], $server_answer['error_code']); + } $this->init_authorization(); - // idk + throw new \danog\MadelineProto\Exception('I had to recreate the temporary authorization key'); case 'AUTH_KEY_PERM_EMPTY': if ($this->authorized !== self::LOGGED_IN) { throw new \danog\MadelineProto\RPCErrorException($server_answer['error_message'], $server_answer['error_code']); } + \danog\MadelineProto\Logger::log(['Temporary auth key not bound, resetting temporary auth key...'], \danog\MadelineProto\Logger::ERROR); + $this->datacenter->sockets[$aargs['datacenter']]->temp_auth_key = null; $this->init_authorization(); // idk