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

Provide DNS fallback

Browse Source
This commit is contained in:
Daniil Gentili 2020-02-26 00:11:06 +01:00
parent e03e707815
commit f22263ed78
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
5 changed files with 93 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -5,6 +5,8 @@ php:
- '7.0' - '7.0'
- '5.6' - '5.6'
git:
submodules: false
jobs: jobs:
allow_failures: allow_failures:

2
docs

@ -1 +1 @@
Subproject commit e8cd2a7bb534007357d2c07e886ea37bb223e91e Subproject commit 7a8bc742393a50f32acec02b8b0f8db31ada2028

22
src/danog/MadelineProto/API.php
View File

@ -161,17 +161,6 @@ class API extends InternalDoc
$this->logger->logger(Lang::$current_lang['madelineproto_ready'], Logger::NOTICE); $this->logger->logger(Lang::$current_lang['madelineproto_ready'], Logger::NOTICE);
} }
/**
* Enable or disable async.
*
* @param bool $async Whether to enable or disable async
*
* @return void
*/
public function async(bool $async): void
{
parent::async($async);
}
/** /**
* Destruct function. * Destruct function.
* *
@ -201,17 +190,6 @@ class API extends InternalDoc
{ {
$this->oldInstance = true; $this->oldInstance = true;
} }
/**
* Sleep function.
*
* @internal
*
* @return array
*/
public function __sleep(): array
{
return APIWrapper::__sleep();
}
/** /**
* Init API wrapper. * Init API wrapper.
* *

130
src/danog/MadelineProto/DataCenter.php
View File

@ -33,6 +33,7 @@ use Amp\Http\Client\DelegateHttpClient;
use Amp\Http\Client\HttpClientBuilder; use Amp\Http\Client\HttpClientBuilder;
use Amp\Http\Client\Request; use Amp\Http\Client\Request;
use Amp\Socket\ConnectContext; use Amp\Socket\ConnectContext;
use Amp\Socket\DnsConnector;
use Amp\Websocket\Client\Rfc6455Connector; use Amp\Websocket\Client\Rfc6455Connector;
use danog\MadelineProto\MTProto\PermAuthKey; use danog\MadelineProto\MTProto\PermAuthKey;
use danog\MadelineProto\MTProto\TempAuthKey; use danog\MadelineProto\MTProto\TempAuthKey;
@ -113,6 +114,12 @@ class DataCenter
* @var \Amp\Http\Client\Cookie\CookieJar * @var \Amp\Http\Client\Cookie\CookieJar
*/ */
private $CookieJar; private $CookieJar;
/**
* DNS connector
*
* @var DNSConnector
*/
private $dnsConnector;
public function __sleep() public function __sleep()
{ {
return ['sockets', 'curdc', 'dclist', 'settings']; return ['sockets', 'curdc', 'dclist', 'settings'];
@ -200,7 +207,7 @@ class DataCenter
$this->settings = $settings; $this->settings = $settings;
foreach ($this->sockets as $key => $socket) { foreach ($this->sockets as $key => $socket) {
if ($socket instanceof DataCenterConnection && !\strpos($key, '_bk')) { if ($socket instanceof DataCenterConnection && !\strpos($key, '_bk')) {
//$this->API->logger->logger(\sprintf(\danog\MadelineProto\Lang::$current_lang['dc_con_stop'], $key), \danog\MadelineProto\Logger::VERBOSE); //$this->API->logger->logger(\sprintf(Lang::$current_lang['dc_con_stop'], $key), \danog\MadelineProto\Logger::VERBOSE);
if ($reconnectAll || isset($changed[$id])) { if ($reconnectAll || isset($changed[$id])) {
$this->API->logger->logger("Disconnecting all before reconnect!"); $this->API->logger->logger("Disconnecting all before reconnect!");
$socket->needReconnect(true); $socket->needReconnect(true);
@ -219,6 +226,8 @@ class DataCenter
$nonProxiedDoHConfig = new DoHConfig([new Nameserver('https://mozilla.cloudflare-dns.com/dns-query'), new Nameserver('https://dns.google/resolve')]); $nonProxiedDoHConfig = new DoHConfig([new Nameserver('https://mozilla.cloudflare-dns.com/dns-query'), new Nameserver('https://dns.google/resolve')]);
$this->DoHClient = Magic::$altervista || Magic::$zerowebhost ? new Rfc1035StubResolver() : new Rfc8484StubResolver($DoHConfig); $this->DoHClient = Magic::$altervista || Magic::$zerowebhost ? new Rfc1035StubResolver() : new Rfc8484StubResolver($DoHConfig);
$this->nonProxiedDoHClient = Magic::$altervista || Magic::$zerowebhost ? new Rfc1035StubResolver() : new Rfc8484StubResolver($nonProxiedDoHConfig); $this->nonProxiedDoHClient = Magic::$altervista || Magic::$zerowebhost ? new Rfc1035StubResolver() : new Rfc8484StubResolver($nonProxiedDoHConfig);
$this->dnsConnector = new DnsConnector(new Rfc1035StubResolver());
} }
} }
public function dcConnect(string $dc_number, int $id = -1): \Generator public function dcConnect(string $dc_number, int $id = -1): \Generator
@ -253,7 +262,7 @@ class DataCenter
$this->API->logger->logger("Connection failed ({$dc_number}): " . $e->getMessage(), \danog\MadelineProto\Logger::ERROR); $this->API->logger->logger("Connection failed ({$dc_number}): " . $e->getMessage(), \danog\MadelineProto\Logger::ERROR);
} }
} }
throw new \danog\MadelineProto\Exception("Could not connect to DC {$dc_number}"); throw new Exception("Could not connect to DC {$dc_number}");
} }
public function generateContexts($dc_number = 0, string $uri = '', ConnectContext $context = null) public function generateContexts($dc_number = 0, string $uri = '', ConnectContext $context = null)
{ {
@ -348,7 +357,7 @@ class DataCenter
} }
$extra = $proxy_extras[$key]; $extra = $proxy_extras[$key];
if (!isset(\class_implements($proxy)[StreamInterface::class])) { if (!isset(\class_implements($proxy)[StreamInterface::class])) {
throw new \danog\MadelineProto\Exception(\danog\MadelineProto\Lang::$current_lang['proxy_class_invalid']); throw new Exception(Lang::$current_lang['proxy_class_invalid']);
} }
if ($proxy === ObfuscatedStream::getName() && \in_array(\strlen($extra['secret']), [17, 34])) { if ($proxy === ObfuscatedStream::getName() && \in_array(\strlen($extra['secret']), [17, 34])) {
$combos[] = [[DefaultStream::getName(), []], [BufferedRawStream::getName(), []], [$proxy, $extra], [IntermediatePaddedStream::getName(), []]]; $combos[] = [[DefaultStream::getName(), []], [BufferedRawStream::getName(), []], [$proxy, $extra], [IntermediatePaddedStream::getName(), []]];
@ -390,67 +399,72 @@ class DataCenter
foreach ($combos as $combo) { foreach ($combos as $combo) {
$ipv6 = [$this->settings[$dc_config_number]['ipv6'] ? 'ipv6' : 'ipv4', $this->settings[$dc_config_number]['ipv6'] ? 'ipv4' : 'ipv6']; $ipv6 = [$this->settings[$dc_config_number]['ipv6'] ? 'ipv6' : 'ipv4', $this->settings[$dc_config_number]['ipv6'] ? 'ipv4' : 'ipv6'];
foreach ($ipv6 as $ipv6) { foreach ($ipv6 as $ipv6) {
// This is only for non-MTProto connections foreach ([true, false] as $useDoH) {
if (!$dc_number) { // This is only for non-MTProto connections
/* @var $ctx \danog\MadelineProto\Stream\ConnectionContext */ if (!$dc_number) {
$ctx = (new ConnectionContext())->setSocketContext($context)->setUri($uri)->setIpv6($ipv6 === 'ipv6'); /* @var $ctx \danog\MadelineProto\Stream\ConnectionContext */
foreach ($combo as $stream) { $ctx = (new ConnectionContext())->setSocketContext($context)->setUri($uri)->setIpv6($ipv6 === 'ipv6');
if ($stream[0] === DefaultStream::getName() && $stream[1] === []) { foreach ($combo as $stream) {
$stream[1] = new DoHConnector($this, $ctx); if ($stream[0] === DefaultStream::getName() && $stream[1] === []) {
$stream[1] = $useDoH ? new DoHConnector($this, $ctx) : $this->dnsConnector;
}
$ctx->addStream(...$stream);
} }
$ctx->addStream(...$stream); $ctxs[] = $ctx;
continue;
} }
$ctxs[] = $ctx;
continue;
}
// This is only for MTProto connections // This is only for MTProto connections
if (!isset($this->dclist[$test][$ipv6][$dc_number]['ip_address'])) { if (!isset($this->dclist[$test][$ipv6][$dc_number]['ip_address'])) {
continue; continue;
}
$address = $this->dclist[$test][$ipv6][$dc_number]['ip_address'];
$port = $this->dclist[$test][$ipv6][$dc_number]['port'];
foreach (\array_unique([$port, 443, 80, 88, 5222]) as $port) {
$stream = \end($combo)[0];
if ($stream === HttpsStream::getName()) {
$subdomain = $this->dclist['ssl_subdomains'][\preg_replace('/\\D+/', '', $dc_number)];
if (\strpos($dc_number, '_media') !== false) {
$subdomain .= '-1';
}
$path = $this->settings[$dc_config_number]['test_mode'] ? 'apiw_test1' : 'apiw1';
$uri = 'tcp://' . $subdomain . '.web.telegram.org:' . $port . '/' . $path;
} elseif ($stream === HttpStream::getName()) {
$uri = 'tcp://' . $address . ':' . $port . '/api';
} else {
$uri = 'tcp://' . $address . ':' . $port;
} }
if ($combo[1][0] === WssStream::getName()) { $address = $this->dclist[$test][$ipv6][$dc_number]['ip_address'];
$subdomain = $this->dclist['ssl_subdomains'][\preg_replace('/\\D+/', '', $dc_number)]; $port = $this->dclist[$test][$ipv6][$dc_number]['port'];
if (\strpos($dc_number, '_media') !== false) { foreach (\array_unique([$port, 443, 80, 88, 5222]) as $port) {
$subdomain .= '-1'; $stream = \end($combo)[0];
if ($stream === HttpsStream::getName()) {
$subdomain = $this->dclist['ssl_subdomains'][\preg_replace('/\\D+/', '', $dc_number)];
if (\strpos($dc_number, '_media') !== false) {
$subdomain .= '-1';
}
$path = $this->settings[$dc_config_number]['test_mode'] ? 'apiw_test1' : 'apiw1';
$uri = 'tcp://'.$subdomain.'.web.telegram.org:'.$port.'/'.$path;
} elseif ($stream === HttpStream::getName()) {
$uri = 'tcp://'.$address.':'.$port.'/api';
} else {
$uri = 'tcp://'.$address.':'.$port;
} }
$path = $this->settings[$dc_config_number]['test_mode'] ? 'apiws_test' : 'apiws'; if ($combo[1][0] === WssStream::getName()) {
$uri = 'tcp://' . $subdomain . '.web.telegram.org:' . $port . '/' . $path; $subdomain = $this->dclist['ssl_subdomains'][\preg_replace('/\\D+/', '', $dc_number)];
} elseif ($combo[1][0] === WsStream::getName()) { if (\strpos($dc_number, '_media') !== false) {
$subdomain = $this->dclist['ssl_subdomains'][\preg_replace('/\\D+/', '', $dc_number)]; $subdomain .= '-1';
if (\strpos($dc_number, '_media') !== false) { }
$subdomain .= '-1'; $path = $this->settings[$dc_config_number]['test_mode'] ? 'apiws_test' : 'apiws';
$uri = 'tcp://'.$subdomain.'.web.telegram.org:'.$port.'/'.$path;
} elseif ($combo[1][0] === WsStream::getName()) {
$subdomain = $this->dclist['ssl_subdomains'][\preg_replace('/\\D+/', '', $dc_number)];
if (\strpos($dc_number, '_media') !== false) {
$subdomain .= '-1';
}
$path = $this->settings[$dc_config_number]['test_mode'] ? 'apiws_test' : 'apiws';
//$uri = 'tcp://' . $subdomain . '.web.telegram.org:' . $port . '/' . $path;
$uri = 'tcp://'.$address.':'.$port.'/'.$path;
} }
$path = $this->settings[$dc_config_number]['test_mode'] ? 'apiws_test' : 'apiws'; /* @var $ctx \danog\MadelineProto\Stream\ConnectionContext */
//$uri = 'tcp://' . $subdomain . '.web.telegram.org:' . $port . '/' . $path; $ctx = (new ConnectionContext())->setDc($dc_number)->setTest($this->settings[$dc_config_number]['test_mode'])->setSocketContext($context)->setUri($uri)->setIpv6($ipv6 === 'ipv6');
$uri = 'tcp://' . $address . ':' . $port . '/' . $path; foreach ($combo as $stream) {
if ($stream[0] === DefaultStream::getName() && $stream[1] === []) {
$stream[1] = $useDoH ? new DoHConnector($this, $ctx) : $this->dnsConnector;
}
if (\in_array($stream[0], [WsStream::class, WssStream::class]) && $stream[1] === []) {
$stream[1] = new Rfc6455Connector($this->HTTPClient);
}
$ctx->addStream(...$stream);
}
$ctxs[] = $ctx;
} }
/* @var $ctx \danog\MadelineProto\Stream\ConnectionContext */
$ctx = (new ConnectionContext())->setDc($dc_number)->setTest($this->settings[$dc_config_number]['test_mode'])->setSocketContext($context)->setUri($uri)->setIpv6($ipv6 === 'ipv6');
foreach ($combo as $stream) {
if ($stream[0] === DefaultStream::getName() && $stream[1] === []) {
$stream[1] = new DoHConnector($this, $ctx);
}
if (\in_array($stream[0], [WsStream::class, WssStream::class]) && $stream[1] === []) {
$stream[1] = new Rfc6455Connector($this->HTTPClient);
}
$ctx->addStream(...$stream);
}
$ctxs[] = $ctx;
} }
} }
} }

31
tests/danog/MadelineProto/DataCenterTest.php
View File

@ -20,12 +20,13 @@ final class DataCenterTest extends TestCase
* @param string $protocol Protocol name * @param string $protocol Protocol name
* @param boolean $test_mode Test mode * @param boolean $test_mode Test mode
* @param boolean $ipv6 IPv6 * @param boolean $ipv6 IPv6
* @param boolean $doh DNS over HTTPS?
* *
* @dataProvider protocolProvider * @dataProvider protocolProvider
* *
* @return void * @return void
*/ */
public function testCanUseProtocol(string $transport, bool $obfuscated, string $protocol, bool $test_mode, bool $ipv6): void public function testCanUseProtocol(string $transport, bool $obfuscated, string $protocol, bool $test_mode, bool $ipv6, bool $doh): void
{ {
$settings = MTProto::getSettings( $settings = MTProto::getSettings(
[ [
@ -72,7 +73,7 @@ final class DataCenterTest extends TestCase
); );
$API->datacenter = $datacenter; $API->datacenter = $datacenter;
$API->getLogger()->logger("Testing protocol $protocol using transport $transport, ".($obfuscated ? 'obfuscated ' : 'not obfuscated ').($test_mode ? 'test DC ' : 'main DC ').($ipv6 ? 'IPv6' : 'IPv4')); $API->getLogger()->logger("Testing protocol $protocol using transport $transport, ".($obfuscated ? 'obfuscated ' : 'not obfuscated ').($test_mode ? 'test DC ' : 'main DC ').($ipv6 ? 'IPv6 ' : 'IPv4 ').($doh ? "DNS over HTTPS" : "DNS");
\sleep(1); \sleep(1);
try { try {
@ -91,22 +92,26 @@ final class DataCenterTest extends TestCase
$ipv6Pair []= true; $ipv6Pair []= true;
} }
foreach ([false, true] as $test_mode) { foreach ([false, true] as $test_mode) {
foreach ($ipv6Pair as $ipv6) { foreach ([false, true] as $doh) {
foreach (['tcp', 'ws', 'wss'] as $transport) { foreach ($ipv6Pair as $ipv6) {
foreach ([true, false] as $obfuscated) { foreach (['tcp', 'ws', 'wss'] as $transport) {
if ($transport !== 'tcp' && !$obfuscated) { foreach ([true, false] as $obfuscated) {
continue; if ($transport !== 'tcp' && !$obfuscated) {
}
foreach (['abridged', 'intermediate', 'intermediate_padded', 'full'] as $protocol) {
if ($protocol === 'full' && $obfuscated) {
continue; continue;
} }
yield [$transport, $obfuscated, $protocol, $test_mode, $ipv6]; foreach (['abridged', 'intermediate', 'intermediate_padded', 'full'] as $protocol) {
if ($protocol === 'full' && $obfuscated) {
continue;
}
yield [$transport, $obfuscated, $protocol, $test_mode, $ipv6, $doh];
}
} }
} }
yield ['tcp', false, 'http', $test_mode, $ipv6, true];
yield ['tcp', false, 'https', $test_mode, $ipv6, true];
yield ['tcp', false, 'http', $test_mode, $ipv6, false];
yield ['tcp', false, 'https', $test_mode, $ipv6, false];
} }
yield ['tcp', false, 'http', $test_mode, $ipv6];
yield ['tcp', false, 'https', $test_mode, $ipv6];
} }
} }
} }