From 246579d6452ee38cafd18ba3b0ea77148d497834 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Fri, 7 Oct 2016 09:57:07 +0000 Subject: [PATCH] Applied fixes from StyleCI --- .../MTProtoTools/AuthKeyHandler.php | 298 +++++++++--------- 1 file changed, 145 insertions(+), 153 deletions(-) diff --git a/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php b/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php index bcb340d0..b9848513 100644 --- a/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php +++ b/src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php @@ -14,7 +14,7 @@ namespace danog\MadelineProto\MTProtoTools; /** * Manages the creation of the authorization key. - * + * * https://core.telegram.org/mtproto/auth_key * https://core.telegram.org/mtproto/samples-auth_key */ @@ -22,61 +22,62 @@ class AuthKeyHandler extends AckHandler { public function create_auth_key($expires_in = -1) { - foreach (\danog\MadelineProto\Tools::range(0, $this->settings['max_tries']['authorization']) as $retry_id_total) - { + foreach (\danog\MadelineProto\Tools::range(0, $this->settings['max_tries']['authorization']) as $retry_id_total) { $this->log->log('Handshake: Requesting pq'); - + /** * *********************************************************************** - * Make pq request, DH exchange initiation + * Make pq request, DH exchange initiation. + * * @method req_pq + * * @param [ * int128 $nonce : The value of nonce is selected randomly by the client (random number) and identifies the client within this communication * ] + * * @return ResPQ [ - * int128 $nonce : The value of nonce is selected randomly by the server - * int128 $server_nonce : The value of server_nonce is selected randomly by the server - * string $pq : This is a representation of a natural number (in binary big endian format). This number is the product of two different odd prime numbers - * Vector long $server_public_key_fingerprints : This is a list of public RSA key fingerprints - * ] + * int128 $nonce : The value of nonce is selected randomly by the server + * int128 $server_nonce : The value of server_nonce is selected randomly by the server + * string $pq : This is a representation of a natural number (in binary big endian format). This number is the product of two different odd prime numbers + * Vector long $server_public_key_fingerprints : This is a list of public RSA key fingerprints + * ] */ $nonce = \phpseclib\Crypt\Random::string(16); $ResPQ = $this->method_call('req_pq', - [ - 'nonce' => $nonce - ] - ); - - /** + [ + 'nonce' => $nonce, + ] + ); + + /* * *********************************************************************** * Compare the equal of nonce client and nonce server */ if ($ResPQ['nonce'] !== $nonce) { throw new Exception('Handshake: wrong nonce'); } - - /** + + /* * *********************************************************************** * Find our key in the server_public_key_fingerprints vector */ - foreach ($ResPQ['server_public_key_fingerprints'] as $curfp) - { + foreach ($ResPQ['server_public_key_fingerprints'] as $curfp) { $curfp_biginteger = new \phpseclib\Math\BigInteger($curfp); - + if ($this->key->fp->equals($curfp_biginteger)) { $public_key_fingerprint = $curfp; break; } } - + if (!isset($public_key_fingerprint)) { throw new Exception("Handshake: couldn't find our key in the server_public_key_fingerprints vector."); } - - $pq_bytes = $ResPQ['pq']; - $server_nonce = $ResPQ['server_nonce']; - - /** + + $pq_bytes = $ResPQ['pq']; + $server_nonce = $ResPQ['server_nonce']; + + /* * *********************************************************************** * Compute p and q */ @@ -84,18 +85,18 @@ class AuthKeyHandler extends AckHandler list($p, $q) = $this->PrimeModule->primefactors($pq); $p = new \phpseclib\Math\BigInteger($p); $q = new \phpseclib\Math\BigInteger($q); - + if ($p->compare($q) > 0) { list($p, $q) = [$q, $p]; } - + if (!($pq->equals($p->multiply($q)) && $p->compare($q) < 0)) { throw new Exception("Handshake: couldn't compute p and q."); } $this->log->log(sprintf('Factorization %s = %s * %s', $pq, $p, $q)); - - /** + + /* * *********************************************************************** * Serialize object for req_DH_params */ @@ -103,44 +104,42 @@ class AuthKeyHandler extends AckHandler $q_bytes = $this->struct->pack('>I', (string) $q); $new_nonce = \phpseclib\Crypt\Random::string(32); - if ($expires_in < 0) - { + if ($expires_in < 0) { $data = $this->tl->serialize_obj('p_q_inner_data', - [ - 'pq' => $pq_bytes, - 'p' => $p_bytes, - 'q' => $q_bytes, - 'nonce' => $nonce, - 'server_nonce' => $server_nonce, - 'new_nonce' => $new_nonce - ] - ); - } - else { + [ + 'pq' => $pq_bytes, + 'p' => $p_bytes, + 'q' => $q_bytes, + 'nonce' => $nonce, + 'server_nonce' => $server_nonce, + 'new_nonce' => $new_nonce, + ] + ); + } else { $data = $this->tl->serialize_obj('p_q_inner_data_temp', - [ - 'pq' => $pq_bytes, - 'p' => $p_bytes, - 'q' => $q_bytes, - 'nonce' => $nonce, - 'server_nonce' => $server_nonce, - 'new_nonce' => $new_nonce, - 'expires_in' => $expires_in - ] - ); + [ + 'pq' => $pq_bytes, + 'p' => $p_bytes, + 'q' => $q_bytes, + 'nonce' => $nonce, + 'server_nonce' => $server_nonce, + 'new_nonce' => $new_nonce, + 'expires_in' => $expires_in, + ] + ); } - - /** + + /* * *********************************************************************** * Encrypt serialized object */ - $sha_digest = sha1($data, true); - $random_bytes = \phpseclib\Crypt\Random::string(255 - strlen($data) - strlen($sha_digest)); - $to_encrypt = $sha_digest.$data.$random_bytes; - $encrypted_data = $this->key->encrypt($to_encrypt); + $sha_digest = sha1($data, true); + $random_bytes = \phpseclib\Crypt\Random::string(255 - strlen($data) - strlen($sha_digest)); + $to_encrypt = $sha_digest.$data.$random_bytes; + $encrypted_data = $this->key->encrypt($to_encrypt); $this->log->log('Starting Diffie Hellman key exchange'); - /** + /* * *********************************************************************** * Starting Diffie Hellman key exchange, Server authentication * @method req_DH_params @@ -159,7 +158,7 @@ class AuthKeyHandler extends AckHandler * string $encrypted_answer : Return this value If server responds is server_DH_params_ok * ] */ - // + // $server_dh_params = $this->method_call('req_DH_params', [ 'nonce' => $nonce, @@ -171,15 +170,15 @@ class AuthKeyHandler extends AckHandler ] ); - /** + /* * *********************************************************************** * Compare the equal of nonce client and nonce server */ if ($nonce != $server_dh_params['nonce']) { throw new Exception('Handshake: wrong nonce.'); } - - /** + + /* * *********************************************************************** * Compare the equal of server_nonce and new server_nonce */ @@ -187,7 +186,7 @@ class AuthKeyHandler extends AckHandler throw new Exception('Handshake: wrong server nonce.'); } - /** + /* * *********************************************************************** * Check valid new nonce hash if return from server * new nonce hash return in server_DH_params_fail @@ -196,24 +195,24 @@ class AuthKeyHandler extends AckHandler throw new Exception('Handshake: wrong new nonce hash.'); } - /** + /* * *********************************************************************** * Get key, iv and decrypt answer */ $encrypted_answer = $server_dh_params['encrypted_answer']; - - $tmp_aes_key = sha1($new_nonce.$server_nonce, true).substr(sha1($server_nonce.$new_nonce, true), 0, 12); - $tmp_aes_iv = substr(sha1($server_nonce.$new_nonce, true), 12, 8).sha1($new_nonce.$new_nonce, true).substr($new_nonce, 0, 4); - $answer_with_hash = $this->ige_decrypt($encrypted_answer, $tmp_aes_key, $tmp_aes_iv); - /** + $tmp_aes_key = sha1($new_nonce.$server_nonce, true).substr(sha1($server_nonce.$new_nonce, true), 0, 12); + $tmp_aes_iv = substr(sha1($server_nonce.$new_nonce, true), 12, 8).sha1($new_nonce.$new_nonce, true).substr($new_nonce, 0, 4); + $answer_with_hash = $this->ige_decrypt($encrypted_answer, $tmp_aes_key, $tmp_aes_iv); + + /* * *********************************************************************** * Separate answer and hash */ - $answer_hash = substr($answer_with_hash, 0, 20); - $answer = substr($answer_with_hash, 20); + $answer_hash = substr($answer_with_hash, 0, 20); + $answer = substr($answer_with_hash, 20); - /** + /* * *********************************************************************** * Deserialize answer * @return Server_DH_inner_data [ @@ -227,7 +226,7 @@ class AuthKeyHandler extends AckHandler */ $server_DH_inner_data = $this->tl->deserialize(\danog\MadelineProto\Tools::fopen_and_write('php://memory', 'rw+b', $answer)); - /** + /* * *********************************************************************** * Do some checks */ @@ -235,39 +234,39 @@ class AuthKeyHandler extends AckHandler if (sha1(substr($answer, 0, $server_DH_inner_data_length), true) != $answer_hash) { throw new Exception('Handshake: answer_hash mismatch.'); } - + if ($nonce != $server_DH_inner_data['nonce']) { throw new Exception('Handshake: wrong nonce'); } - + if ($server_nonce != $server_DH_inner_data['server_nonce']) { throw new Exception('Handshake: wrong server nonce'); } - - $g = new \phpseclib\Math\BigInteger($server_DH_inner_data['g']); - $g_a = new \phpseclib\Math\BigInteger($server_DH_inner_data['g_a'], 256); - $dh_prime = new \phpseclib\Math\BigInteger($server_DH_inner_data['dh_prime'], 256); - /** + $g = new \phpseclib\Math\BigInteger($server_DH_inner_data['g']); + $g_a = new \phpseclib\Math\BigInteger($server_DH_inner_data['g_a'], 256); + $dh_prime = new \phpseclib\Math\BigInteger($server_DH_inner_data['dh_prime'], 256); + + /* * *********************************************************************** * Time delta */ - $server_time = $server_DH_inner_data['server_time']; - $this->timedelta = ($server_time - time()); - + $server_time = $server_DH_inner_data['server_time']; + $this->timedelta = ($server_time - time()); + $this->log->log(sprintf('Server-client time delta = %.1f s', $this->timedelta)); - /** + /* * *********************************************************************** * Define some needed numbers for BigInteger */ - $one = new \phpseclib\Math\BigInteger(1); - $two = new \phpseclib\Math\BigInteger(2); - $twoe2047 = new \phpseclib\Math\BigInteger('16158503035655503650357438344334975980222051334857742016065172713762327569433945446598600705761456731844358980460949009747059779575245460547544076193224141560315438683650498045875098875194826053398028819192033784138396109321309878080919047169238085235290822926018152521443787945770532904303776199561965192760957166694834171210342487393282284747428088017663161029038902829665513096354230157075129296432088558362971801859230928678799175576150822952201848806616643615613562842355410104862578550863465661734839271290328348967522998634176499319107762583194718667771801067716614802322659239302476074096777926805529798115328'); - $twoe2048 = new \phpseclib\Math\BigInteger('32317006071311007300714876688669951960444102669715484032130345427524655138867890893197201411522913463688717960921898019494119559150490921095088152386448283120630877367300996091750197750389652106796057638384067568276792218642619756161838094338476170470581645852036305042887575891541065808607552399123930385521914333389668342420684974786564569494856176035326322058077805659331026192708460314150258592864177116725943603718461857357598351152301645904403697613233287231227125684710820209725157101726931323469678542580656697935045997268352998638215525166389437335543602135433229604645318478604952148193555853611059596230656'); + $one = new \phpseclib\Math\BigInteger(1); + $two = new \phpseclib\Math\BigInteger(2); + $twoe2047 = new \phpseclib\Math\BigInteger('16158503035655503650357438344334975980222051334857742016065172713762327569433945446598600705761456731844358980460949009747059779575245460547544076193224141560315438683650498045875098875194826053398028819192033784138396109321309878080919047169238085235290822926018152521443787945770532904303776199561965192760957166694834171210342487393282284747428088017663161029038902829665513096354230157075129296432088558362971801859230928678799175576150822952201848806616643615613562842355410104862578550863465661734839271290328348967522998634176499319107762583194718667771801067716614802322659239302476074096777926805529798115328'); + $twoe2048 = new \phpseclib\Math\BigInteger('32317006071311007300714876688669951960444102669715484032130345427524655138867890893197201411522913463688717960921898019494119559150490921095088152386448283120630877367300996091750197750389652106796057638384067568276792218642619756161838094338476170470581645852036305042887575891541065808607552399123930385521914333389668342420684974786564569494856176035326322058077805659331026192708460314150258592864177116725943603718461857357598351152301645904403697613233287231227125684710820209725157101726931323469678542580656697935045997268352998638215525166389437335543602135433229604645318478604952148193555853611059596230656'); - /** + /* * *********************************************************************** * Check validity of dh_prime * 2^2047 < dh_prime < 2^2048 @@ -275,21 +274,21 @@ class AuthKeyHandler extends AckHandler if (!$dh_prime->isPrime()) { throw new Exception("Handshake: dh_prime isn't a safe 2048-bit prime (dh_prime isn't a prime)."); } - + /* // Almost always fails if (!$dh_prime->subtract($one)->divide($two)[0]->isPrime()) { throw new Exception("Handshake: dh_prime isn't a safe 2048-bit prime ((dh_prime - 1) / 2 isn't a prime)."); } */ - + if ($dh_prime->compare($twoe2047) <= 0 // 2^2047 < dh_prime or dh_prime > 2^2047 or ! dh_prime <= 2^2047 || $dh_prime->compare($twoe2048) >= 0 // dh_prime < 2^2048 or ! dh_prime >= 2^2048 ) { throw new Exception("Handshake: g isn't a safe 2048-bit prime (2^2047 < dh_prime < 2^2048 is false)."); } - /** + /* * *********************************************************************** * Check validity of g * 1 < g < dh_prime - 1 @@ -300,7 +299,7 @@ class AuthKeyHandler extends AckHandler throw new Exception('Handshake: g is invalid (1 < g < dh_prime - 1 is false).'); } - /** + /* * *********************************************************************** * Check validity of g_a * 1 < g_a < dh_prime - 1 @@ -311,12 +310,11 @@ class AuthKeyHandler extends AckHandler throw new Exception('Handshake: g_a is invalid (1 < g_a < dh_prime - 1 is false).'); } - foreach (\danog\MadelineProto\Tools::range(0, $this->settings['max_tries']['authorization']) as $retry_id) - { + foreach (\danog\MadelineProto\Tools::range(0, $this->settings['max_tries']['authorization']) as $retry_id) { $b = new \phpseclib\Math\BigInteger(\phpseclib\Crypt\Random::string(256), 256); $g_b = $g->powMod($b, $dh_prime); - /** + /* * *********************************************************************** * Check validity of g_b * 1 < g_b < dh_prime - 1 @@ -326,10 +324,10 @@ class AuthKeyHandler extends AckHandler ) { throw new Exception('Handshake: g_b is invalid (1 < g_b < dh_prime - 1 is false).'); } - + $g_b_str = $g_b->toBytes(); - /** + /* * *********************************************************************** * serialize client_DH_inner_data * @method client_DH_inner_data @@ -341,23 +339,23 @@ class AuthKeyHandler extends AckHandler * ] */ $data = $this->tl->serialize_obj('client_DH_inner_data', - [ - 'nonce' => $nonce, - 'server_nonce' => $server_nonce, - 'retry_id' => $retry_id, - 'g_b' => $g_b_str - ] + [ + 'nonce' => $nonce, + 'server_nonce' => $server_nonce, + 'retry_id' => $retry_id, + 'g_b' => $g_b_str, + ] ); - /** + /* * *********************************************************************** * encrypt client_DH_inner_data */ - $data_with_sha = sha1($data, true).$data; - $data_with_sha_padded = $data_with_sha.\phpseclib\Crypt\Random::string(\danog\MadelineProto\Tools::posmod(-strlen($data_with_sha), 16)); + $data_with_sha = sha1($data, true).$data; + $data_with_sha_padded = $data_with_sha.\phpseclib\Crypt\Random::string(\danog\MadelineProto\Tools::posmod(-strlen($data_with_sha), 16)); $encrypted_data = $this->ige_encrypt($data_with_sha_padded, $tmp_aes_key, $tmp_aes_iv); - /** + /* * *********************************************************************** * Send set_client_DH_params query * @method set_client_DH_params @@ -366,44 +364,44 @@ class AuthKeyHandler extends AckHandler * int128 $server_nonce : The value of server_nonce is selected randomly by the server * string $encrypted_data * ] - * @return Set_client_DH_params_answer [ - * string $_ : This value is dh_gen_ok, dh_gen_retry OR dh_gen_fail - * int128 $server_nonce : The value of server_nonce is selected randomly by the server - * int128 $new_nonce_hash1 : Return this value If server responds is dh_gen_ok - * int128 $new_nonce_hash2 : Return this value If server responds is dh_gen_retry - * int128 $new_nonce_hash2 : Return this value If server responds is dh_gen_fail - * ] + * @return Set_client_DH_params_answer [ + * string $_ : This value is dh_gen_ok, dh_gen_retry OR dh_gen_fail + * int128 $server_nonce : The value of server_nonce is selected randomly by the server + * int128 $new_nonce_hash1 : Return this value If server responds is dh_gen_ok + * int128 $new_nonce_hash2 : Return this value If server responds is dh_gen_retry + * int128 $new_nonce_hash2 : Return this value If server responds is dh_gen_fail + * ] */ $Set_client_DH_params_answer = $this->method_call('set_client_DH_params', - [ - 'nonce' => $nonce, - 'server_nonce' => $server_nonce, - 'encrypted_data' => $encrypted_data - ] - ); + [ + 'nonce' => $nonce, + 'server_nonce' => $server_nonce, + 'encrypted_data' => $encrypted_data, + ] + ); - /** + /* * *********************************************************************** * Generate auth_key */ - $auth_key = $g_a->powMod($b, $dh_prime); - $auth_key_str = $auth_key->toBytes(); - $auth_key_sha = sha1($auth_key_str, true); - $auth_key_aux_hash = substr($auth_key_sha, 0, 8); - $new_nonce_hash1 = substr(sha1($new_nonce.chr(1).$auth_key_aux_hash, true), -16); - $new_nonce_hash2 = substr(sha1($new_nonce.chr(2).$auth_key_aux_hash, true), -16); - $new_nonce_hash3 = substr(sha1($new_nonce.chr(3).$auth_key_aux_hash, true), -16); + $auth_key = $g_a->powMod($b, $dh_prime); + $auth_key_str = $auth_key->toBytes(); + $auth_key_sha = sha1($auth_key_str, true); + $auth_key_aux_hash = substr($auth_key_sha, 0, 8); + $new_nonce_hash1 = substr(sha1($new_nonce.chr(1).$auth_key_aux_hash, true), -16); + $new_nonce_hash2 = substr(sha1($new_nonce.chr(2).$auth_key_aux_hash, true), -16); + $new_nonce_hash3 = substr(sha1($new_nonce.chr(3).$auth_key_aux_hash, true), -16); - /** + /* * *********************************************************************** * Compare the equal of nonce client and nonce server */ if ($Set_client_DH_params_answer['nonce'] != $nonce) { throw new Exception('Handshake: wrong nonce.'); } - - /** + + /* * *********************************************************************** * Compare the equal of server_nonce and new server_nonce */ @@ -411,50 +409,44 @@ class AuthKeyHandler extends AckHandler throw new Exception('Handshake: wrong server nonce'); } - /** + /* * *********************************************************************** * Check Set_client_DH_params_answer type */ - if ($Set_client_DH_params_answer['_'] == 'dh_gen_ok') - { + if ($Set_client_DH_params_answer['_'] == 'dh_gen_ok') { if ($Set_client_DH_params_answer['new_nonce_hash1'] != $new_nonce_hash1) { throw new Exception('Handshake: wrong new_nonce_hash1'); } - + $this->log->log('Diffie Hellman key exchange processed successfully'); - $res_authorization['server_salt'] = $this->struct->unpack('struct->unpack('log->log('Auth key generated'); $this->timedelta = 0; return $res_authorization; - } - elseif ($Set_client_DH_params_answer['_'] == 'dh_gen_retry') - { + } elseif ($Set_client_DH_params_answer['_'] == 'dh_gen_retry') { if ($Set_client_DH_params_answer['new_nonce_hash2'] != $new_nonce_hash2) { throw new Exception('Handshake: wrong new_nonce_hash_2'); } //repeat foreach $this->log->log('Retrying Auth'); - } - elseif ($Set_client_DH_params_answer['_'] == 'dh_gen_fail') - { + } elseif ($Set_client_DH_params_answer['_'] == 'dh_gen_fail') { if ($Set_client_DH_params_answer['new_nonce_hash3'] != $new_nonce_hash3) { throw new Exception('Handshake: wrong new_nonce_hash_3'); } - + $this->log->log('Auth Failed'); break; - } - else { + } else { throw new Exception('Response Error'); } }