danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

8912pwzx!

Browse Source
This commit is contained in:
Daniil Gentili 2017-07-19 23:41:35 +02:00
parent 3a5e5a9c43
commit d278293589
3 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/danog/MadelineProto/MTProto.php
View File

@ -269,7 +269,7 @@ class MTProto extends \Volatile
} }
foreach ($this->calls as $id => $controller) { foreach ($this->calls as $id => $controller) {
if (is_array($controller) || $controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { if (is_array($controller) || $controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
unset($this->calls[$id]); $controller->discard();
} else var_dump($controller->getCallState()); } else var_dump($controller->getCallState());
} }
// Detect ipv6 // Detect ipv6

23
src/danog/MadelineProto/VoIP/AuthKeyHandler.php
View File

@ -26,7 +26,7 @@ trait AuthKeyHandler
{ {
foreach ($this->calls as $id => $controller) { foreach ($this->calls as $id => $controller) {
if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
unset($this->calls[$id]); $controller->discard();
} }
} }
@ -55,7 +55,7 @@ trait AuthKeyHandler
{ {
foreach ($this->calls as $id => $controller) { foreach ($this->calls as $id => $controller) {
if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
unset($this->calls[$id]); $controller->discard();
} }
} }
$dh_config = $this->get_dh_config(); $dh_config = $this->get_dh_config();
@ -73,7 +73,7 @@ trait AuthKeyHandler
{ {
foreach ($this->calls as $id => $controller) { foreach ($this->calls as $id => $controller) {
if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
unset($this->calls[$id]); $controller->discard();
} }
} }
if ($this->calls[$params['id']]->getCallState() !== \danog\MadelineProto\VoIP::CALL_STATE_REQUESTED) { if ($this->calls[$params['id']]->getCallState() !== \danog\MadelineProto\VoIP::CALL_STATE_REQUESTED) {
@ -90,11 +90,9 @@ trait AuthKeyHandler
$key['visualization'] = ''; $key['visualization'] = '';
$length = new \phpseclib\Math\BigInteger(count($this->emojis)); $length = new \phpseclib\Math\BigInteger(count($this->emojis));
foreach (str_split(hash('sha256', $key['auth_key'].$this->calls[$params['id']]->storage['g_a'], true), 8) as $number) { foreach (str_split(hash('sha256', $key['auth_key'].$this->calls[$params['id']]->storage['g_a'], true), 8) as $number) {
var_dump((new \phpseclib\Math\BigInteger($number, -256))->toString());
var_dump($this->emojis[(int) ((new \phpseclib\Math\BigInteger($number, -256))->divide($length)[1]->toString())]);
$key['visualization'] .= $this->emojis[(int) ((new \phpseclib\Math\BigInteger($number, -256))->divide($length)[1]->toString())]; $key['visualization'] .= $this->emojis[(int) ((new \phpseclib\Math\BigInteger($number, -256))->divide($length)[1]->toString())];
} }
readline();
$this->calls[$params['id']]->setCallState(\danog\MadelineProto\VoIP::CALL_STATE_READY); $this->calls[$params['id']]->setCallState(\danog\MadelineProto\VoIP::CALL_STATE_READY);
$this->calls[$params['id']]->storage = ['InputPhoneCall' => ['id' => $params['id'], 'access_hash' => $params['access_hash'], '_' => 'inputPhoneCall'], 'protocol' => $params['protocol']]; $this->calls[$params['id']]->storage = ['InputPhoneCall' => ['id' => $params['id'], 'access_hash' => $params['access_hash'], '_' => 'inputPhoneCall'], 'protocol' => $params['protocol']];
$this->calls[$params['id']]->setVisualization($key['visualization']); $this->calls[$params['id']]->setVisualization($key['visualization']);
@ -129,7 +127,7 @@ trait AuthKeyHandler
{ {
foreach ($this->calls as $id => $controller) { foreach ($this->calls as $id => $controller) {
if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
unset($this->calls[$id]); $controller->discard();
} }
} }
if ($this->call_status($params['id']) !== \danog\MadelineProto\VoIP::CALL_STATE_ACCEPTED) { if ($this->call_status($params['id']) !== \danog\MadelineProto\VoIP::CALL_STATE_ACCEPTED) {
@ -141,16 +139,17 @@ trait AuthKeyHandler
if (hash('sha256', $params['g_a_or_b'], true) != $this->calls[$params['id']]['g_a_hash']) { if (hash('sha256', $params['g_a_or_b'], true) != $this->calls[$params['id']]['g_a_hash']) {
throw new \danog\MadelineProto\SecurityException('Invalid g_a!'); throw new \danog\MadelineProto\SecurityException('Invalid g_a!');
} }
$g_a = str_pad($params['g_a_or_b'], 256, chr(0), \STR_PAD_LEFT);
$params['g_a_or_b'] = new \phpseclib\Math\BigInteger($params['g_a_or_b'], 256); $params['g_a_or_b'] = new \phpseclib\Math\BigInteger($params['g_a_or_b'], 256);
$this->check_G($params['g_a_or_b'], $dh_config['p']); $this->check_G($params['g_a_or_b'], $dh_config['p']);
$key = ['auth_key' => str_pad($params['g_a_or_b']->powMod($this->calls[$params['id']]['b'], $dh_config['p'])->toBytes(), 256, chr(0), \STR_PAD_LEFT)]; $key = ['auth_key' => str_pad($params['g_a_or_b']->powMod($this->calls[$params['id']]['b'], $dh_config['p'])->toBytes(), 256, chr(0), \STR_PAD_LEFT)];
$key['fingerprint'] = substr(sha1($key['auth_key'], true), -8); $key['fingerprint'] = substr(sha1($key['auth_key'], true), -8);
if ($key['fingerprint'] != $params['key_fingerprint']) { if ($key['fingerprint'] != $params['key_fingerprint']) {
// throw new \danog\MadelineProto\SecurityException('Invalid key fingerprint!'); throw new \danog\MadelineProto\SecurityException('Invalid key fingerprint!');
} }
$key['visualization'] = ''; $key['visualization'] = '';
$length = new \phpseclib\Math\BigInteger(count($this->emojis)); $length = new \phpseclib\Math\BigInteger(count($this->emojis));
foreach (str_split(strrev(substr(hash('sha256', $params['g_a_or_b']->toBytes().$key['auth_key'], true), 20)), 8) as $number) { foreach (str_split(hash('sha256', $key['auth_key'].$g_a, true), 8) as $number) {
$key['visualization'] .= $this->emojis[(int) ((new \phpseclib\Math\BigInteger($number, -256))->divide($length)[1]->toString())]; $key['visualization'] .= $this->emojis[(int) ((new \phpseclib\Math\BigInteger($number, -256))->divide($length)[1]->toString())];
} }
@ -174,7 +173,7 @@ trait AuthKeyHandler
{ {
foreach ($this->calls as $id => $controller) { foreach ($this->calls as $id => $controller) {
if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
unset($this->calls[$id]); $controller->discard();
} }
} }
if (isset($this->calls[$id])) { if (isset($this->calls[$id])) {
@ -188,7 +187,7 @@ trait AuthKeyHandler
{ {
foreach ($this->calls as $id => $controller) { foreach ($this->calls as $id => $controller) {
if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
unset($this->calls[$id]); $controller->discard();
} }
} }
return $this->calls[$call]; return $this->calls[$call];
@ -198,7 +197,7 @@ trait AuthKeyHandler
{ {
foreach ($this->calls as $id => $controller) { foreach ($this->calls as $id => $controller) {
if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) { if ($controller->getCallState() === \danog\MadelineProto\VoIP::CALL_STATE_ENDED) {
unset($this->calls[$id]); $controller->discard();
} }
} }
\danog\MadelineProto\Logger::log(['Discarding call '.$call.'...'], \danog\MadelineProto\Logger::VERBOSE); \danog\MadelineProto\Logger::log(['Discarding call '.$call.'...'], \danog\MadelineProto\Logger::VERBOSE);

21
src/danog/MadelineProto/VoIP/CallbackHandler.php
View File

@ -1,21 +0,0 @@
<?php
/*
Copyright 2016-2017 Daniil Gentili
(https://daniil.it)
This file is part of MadelineProto.
MadelineProto is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
MadelineProto is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Affero General Public License for more details.
You should have received a copy of the GNU General Public License along with MadelineProto.
If not, see <http://www.gnu.org/licenses/>.
*/
namespace danog\MadelineProto\VoIP;
trait CallbackHandler
{
public function get_incoming_call_callbacks()
{
$callbacks = $this->settings['calls']['incoming_callback'] === 'default_incoming_call_callback' ? [] : $this->settings['calls']['incoming_callback']();
}
}