Apply fixes from StyleCI
This commit is contained in:
parent
965feb3ba4
commit
5948b17e88
@ -42,7 +42,6 @@ class Conversion
|
|||||||
return !\danog\MadelineProto\Magic::$BIG_ENDIAN ? strrev($res) : $res;
|
return !\danog\MadelineProto\Magic::$BIG_ENDIAN ? strrev($res) : $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static function old_aes_calculate($msg_key, $auth_key, $to_server = true)
|
public static function old_aes_calculate($msg_key, $auth_key, $to_server = true)
|
||||||
{
|
{
|
||||||
$x = $to_server ? 0 : 8;
|
$x = $to_server ? 0 : 8;
|
||||||
@ -131,11 +130,13 @@ class Conversion
|
|||||||
return $MadelineProto;
|
return $MadelineProto;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function tdesktop_md5($data) {
|
public static function tdesktop_md5($data)
|
||||||
|
{
|
||||||
$result = '';
|
$result = '';
|
||||||
foreach (str_split(md5($data), 2) as $byte) {
|
foreach (str_split(md5($data), 2) as $byte) {
|
||||||
$result .= strrev($byte);
|
$result .= strrev($byte);
|
||||||
}
|
}
|
||||||
|
|
||||||
return strtoupper($result);
|
return strtoupper($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -144,11 +145,15 @@ class Conversion
|
|||||||
public static $tdesktop_base_path;
|
public static $tdesktop_base_path;
|
||||||
public static $tdesktop_user_base_path;
|
public static $tdesktop_user_base_path;
|
||||||
public static $tdesktop_key;
|
public static $tdesktop_key;
|
||||||
public static function tdesktop_fopen($fileName, $options = 3) {
|
|
||||||
$name = ($options & self::FILEOPTION_USER ? self::$tdesktop_user_base_path : self::$tdesktop_base_path) . $fileName;
|
public static function tdesktop_fopen($fileName, $options = 3)
|
||||||
|
{
|
||||||
|
$name = ($options & self::FILEOPTION_USER ? self::$tdesktop_user_base_path : self::$tdesktop_base_path).$fileName;
|
||||||
$totry = [];
|
$totry = [];
|
||||||
for ($x = 0; $x <= 1; $x++) {
|
for ($x = 0; $x <= 1; $x++) {
|
||||||
if (file_exists($name.$x)) $totry []= fopen($name.$x, 'rb');
|
if (file_exists($name.$x)) {
|
||||||
|
$totry[] = fopen($name.$x, 'rb');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
foreach ($totry as $fp) {
|
foreach ($totry as $fp) {
|
||||||
if (stream_get_contents($fp, 4) !== 'TDF$') {
|
if (stream_get_contents($fp, 4) !== 'TDF$') {
|
||||||
@ -171,30 +176,40 @@ class Conversion
|
|||||||
$res = fopen('php://memory', 'rw+b');
|
$res = fopen('php://memory', 'rw+b');
|
||||||
fwrite($res, $data);
|
fwrite($res, $data);
|
||||||
fseek($res, 0);
|
fseek($res, 0);
|
||||||
|
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new Exception("Could not open $fileName");
|
throw new Exception("Could not open $fileName");
|
||||||
}
|
}
|
||||||
public static function tdesktop_fopen_encrypted($fileName, $options = 3) {
|
|
||||||
|
public static function tdesktop_fopen_encrypted($fileName, $options = 3)
|
||||||
|
{
|
||||||
$f = self::tdesktop_fopen($fileName, $options);
|
$f = self::tdesktop_fopen($fileName, $options);
|
||||||
$data = self::tdesktop_read_bytearray($f);
|
$data = self::tdesktop_read_bytearray($f);
|
||||||
$res = self::tdesktop_decrypt($data, self::$tdesktop_key);
|
$res = self::tdesktop_decrypt($data, self::$tdesktop_key);
|
||||||
$length = unpack('V', stream_get_contents($res, 4))[1];
|
$length = unpack('V', stream_get_contents($res, 4))[1];
|
||||||
|
|
||||||
if ($length > fstat($res)['size'] || $length < 4) {
|
if ($length > fstat($res)['size'] || $length < 4) {
|
||||||
throw new \danog\MadelineProto\Exception('Wrong length');
|
throw new \danog\MadelineProto\Exception('Wrong length');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
public static function tdesktop_read_bytearray($fp) {
|
|
||||||
|
public static function tdesktop_read_bytearray($fp)
|
||||||
|
{
|
||||||
$length = self::unpack_signed_int(stream_get_contents($fp, 4));
|
$length = self::unpack_signed_int(stream_get_contents($fp, 4));
|
||||||
$data = $length ? stream_get_contents($fp, $length) : '';
|
$data = $length ? stream_get_contents($fp, $length) : '';
|
||||||
$res = fopen('php://memory', 'rw+b');
|
$res = fopen('php://memory', 'rw+b');
|
||||||
fwrite($res, $data);
|
fwrite($res, $data);
|
||||||
fseek($res, 0);
|
fseek($res, 0);
|
||||||
|
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
public static function tdesktop_decrypt($data, $auth_key) {
|
|
||||||
|
public static function tdesktop_decrypt($data, $auth_key)
|
||||||
|
{
|
||||||
$message_key = stream_get_contents($data, 16);
|
$message_key = stream_get_contents($data, 16);
|
||||||
$encrypted_data = stream_get_contents($data);
|
$encrypted_data = stream_get_contents($data);
|
||||||
|
|
||||||
@ -202,7 +217,7 @@ class Conversion
|
|||||||
$decrypted_data = self::ige_decrypt($encrypted_data, $aes_key, $aes_iv);
|
$decrypted_data = self::ige_decrypt($encrypted_data, $aes_key, $aes_iv);
|
||||||
|
|
||||||
if ($message_key != substr(sha1($decrypted_data, true), 0, 16)) {
|
if ($message_key != substr(sha1($decrypted_data, true), 0, 16)) {
|
||||||
throw new \danog\MadelineProto\SecurityException('msg_key mismatch');
|
throw new \danog\MadelineProto\SecurityException('msg_key mismatch');
|
||||||
}
|
}
|
||||||
|
|
||||||
$res = fopen('php://memory', 'rw+b');
|
$res = fopen('php://memory', 'rw+b');
|
||||||
@ -212,93 +227,99 @@ class Conversion
|
|||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
const dbiKey = 0x00;
|
const dbiKey = 0x00;
|
||||||
const dbiUser = 0x01;
|
const dbiUser = 0x01;
|
||||||
const dbiDcOptionOldOld = 0x02;
|
const dbiDcOptionOldOld = 0x02;
|
||||||
const dbiChatSizeMax = 0x03;
|
const dbiChatSizeMax = 0x03;
|
||||||
const dbiMutePeer = 0x04;
|
const dbiMutePeer = 0x04;
|
||||||
const dbiSendKey = 0x05;
|
const dbiSendKey = 0x05;
|
||||||
const dbiAutoStart = 0x06;
|
const dbiAutoStart = 0x06;
|
||||||
const dbiStartMinimized = 0x07;
|
const dbiStartMinimized = 0x07;
|
||||||
const dbiSoundNotify = 0x08;
|
const dbiSoundNotify = 0x08;
|
||||||
const dbiWorkMode = 0x09;
|
const dbiWorkMode = 0x09;
|
||||||
const dbiSeenTrayTooltip = 0x0a;
|
const dbiSeenTrayTooltip = 0x0a;
|
||||||
const dbiDesktopNotify = 0x0b;
|
const dbiDesktopNotify = 0x0b;
|
||||||
const dbiAutoUpdate = 0x0c;
|
const dbiAutoUpdate = 0x0c;
|
||||||
const dbiLastUpdateCheck = 0x0d;
|
const dbiLastUpdateCheck = 0x0d;
|
||||||
const dbiWindowPosition = 0x0e;
|
const dbiWindowPosition = 0x0e;
|
||||||
const dbiConnectionTypeOld = 0x0f;
|
const dbiConnectionTypeOld = 0x0f;
|
||||||
// 0x10 reserved
|
// 0x10 reserved
|
||||||
const dbiDefaultAttach = 0x11;
|
const dbiDefaultAttach = 0x11;
|
||||||
const dbiCatsAndDogs = 0x12;
|
const dbiCatsAndDogs = 0x12;
|
||||||
const dbiReplaceEmojis = 0x13;
|
const dbiReplaceEmojis = 0x13;
|
||||||
const dbiAskDownloadPath = 0x14;
|
const dbiAskDownloadPath = 0x14;
|
||||||
const dbiDownloadPathOld = 0x15;
|
const dbiDownloadPathOld = 0x15;
|
||||||
const dbiScale = 0x16;
|
const dbiScale = 0x16;
|
||||||
const dbiEmojiTabOld = 0x17;
|
const dbiEmojiTabOld = 0x17;
|
||||||
const dbiRecentEmojiOldOld = 0x18;
|
const dbiRecentEmojiOldOld = 0x18;
|
||||||
const dbiLoggedPhoneNumber = 0x19;
|
const dbiLoggedPhoneNumber = 0x19;
|
||||||
const dbiMutedPeers = 0x1a;
|
const dbiMutedPeers = 0x1a;
|
||||||
// 0x1b reserved
|
// 0x1b reserved
|
||||||
const dbiNotifyView = 0x1c;
|
const dbiNotifyView = 0x1c;
|
||||||
const dbiSendToMenu = 0x1d;
|
const dbiSendToMenu = 0x1d;
|
||||||
const dbiCompressPastedImage = 0x1e;
|
const dbiCompressPastedImage = 0x1e;
|
||||||
const dbiLangOld = 0x1f;
|
const dbiLangOld = 0x1f;
|
||||||
const dbiLangFileOld = 0x20;
|
const dbiLangFileOld = 0x20;
|
||||||
const dbiTileBackground = 0x21;
|
const dbiTileBackground = 0x21;
|
||||||
const dbiAutoLock = 0x22;
|
const dbiAutoLock = 0x22;
|
||||||
const dbiDialogLastPath = 0x23;
|
const dbiDialogLastPath = 0x23;
|
||||||
const dbiRecentEmojiOld = 0x24;
|
const dbiRecentEmojiOld = 0x24;
|
||||||
const dbiEmojiVariantsOld = 0x25;
|
const dbiEmojiVariantsOld = 0x25;
|
||||||
const dbiRecentStickers = 0x26;
|
const dbiRecentStickers = 0x26;
|
||||||
const dbiDcOptionOld = 0x27;
|
const dbiDcOptionOld = 0x27;
|
||||||
const dbiTryIPv6 = 0x28;
|
const dbiTryIPv6 = 0x28;
|
||||||
const dbiSongVolume = 0x29;
|
const dbiSongVolume = 0x29;
|
||||||
const dbiWindowsNotificationsOld = 0x30;
|
const dbiWindowsNotificationsOld = 0x30;
|
||||||
const dbiIncludeMuted = 0x31;
|
const dbiIncludeMuted = 0x31;
|
||||||
const dbiMegagroupSizeMax = 0x32;
|
const dbiMegagroupSizeMax = 0x32;
|
||||||
const dbiDownloadPath = 0x33;
|
const dbiDownloadPath = 0x33;
|
||||||
const dbiAutoDownload = 0x34;
|
const dbiAutoDownload = 0x34;
|
||||||
const dbiSavedGifsLimit = 0x35;
|
const dbiSavedGifsLimit = 0x35;
|
||||||
const dbiShowingSavedGifsOld = 0x36;
|
const dbiShowingSavedGifsOld = 0x36;
|
||||||
const dbiAutoPlay = 0x37;
|
const dbiAutoPlay = 0x37;
|
||||||
const dbiAdaptiveForWide = 0x38;
|
const dbiAdaptiveForWide = 0x38;
|
||||||
const dbiHiddenPinnedMessages = 0x39;
|
const dbiHiddenPinnedMessages = 0x39;
|
||||||
const dbiRecentEmoji = 0x3a;
|
const dbiRecentEmoji = 0x3a;
|
||||||
const dbiEmojiVariants = 0x3b;
|
const dbiEmojiVariants = 0x3b;
|
||||||
const dbiDialogsMode = 0x40;
|
const dbiDialogsMode = 0x40;
|
||||||
const dbiModerateMode = 0x41;
|
const dbiModerateMode = 0x41;
|
||||||
const dbiVideoVolume = 0x42;
|
const dbiVideoVolume = 0x42;
|
||||||
const dbiStickersRecentLimit = 0x43;
|
const dbiStickersRecentLimit = 0x43;
|
||||||
const dbiNativeNotifications = 0x44;
|
const dbiNativeNotifications = 0x44;
|
||||||
const dbiNotificationsCount = 0x45;
|
const dbiNotificationsCount = 0x45;
|
||||||
const dbiNotificationsCorner = 0x46;
|
const dbiNotificationsCorner = 0x46;
|
||||||
const dbiThemeKey = 0x47;
|
const dbiThemeKey = 0x47;
|
||||||
const dbiDialogsWidthRatioOld = 0x48;
|
const dbiDialogsWidthRatioOld = 0x48;
|
||||||
const dbiUseExternalVideoPlayer = 0x49;
|
const dbiUseExternalVideoPlayer = 0x49;
|
||||||
const dbiDcOptions = 0x4a;
|
const dbiDcOptions = 0x4a;
|
||||||
const dbiMtpAuthorization = 0x4b;
|
const dbiMtpAuthorization = 0x4b;
|
||||||
const dbiLastSeenWarningSeenOld = 0x4c;
|
const dbiLastSeenWarningSeenOld = 0x4c;
|
||||||
const dbiAuthSessionSettings = 0x4d;
|
const dbiAuthSessionSettings = 0x4d;
|
||||||
const dbiLangPackKey = 0x4e;
|
const dbiLangPackKey = 0x4e;
|
||||||
const dbiConnectionType = 0x4f;
|
const dbiConnectionType = 0x4f;
|
||||||
const dbiStickersFavedLimit = 0x50;
|
const dbiStickersFavedLimit = 0x50;
|
||||||
const dbiSuggestStickersByEmoji = 0x51;
|
const dbiSuggestStickersByEmoji = 0x51;
|
||||||
|
|
||||||
const dbiEncryptedWithSalt = 333;
|
const dbiEncryptedWithSalt = 333;
|
||||||
const dbiEncrypted = 444;
|
const dbiEncrypted = 444;
|
||||||
|
|
||||||
// 500-600 reserved
|
// 500-600 reserved
|
||||||
|
|
||||||
const dbiVersion = 666;
|
const dbiVersion = 666;
|
||||||
|
|
||||||
|
public static function tdesktop($session, $new_session, $settings = [])
|
||||||
public static function tdesktop($session, $new_session, $settings = []) {
|
{
|
||||||
set_error_handler(['\\danog\\MadelineProto\\Exception', 'ExceptionErrorHandler']);
|
set_error_handler(['\\danog\\MadelineProto\\Exception', 'ExceptionErrorHandler']);
|
||||||
if (!isset($settings['old_session_key'])) $settings['old_session_key'] = 'data';
|
if (!isset($settings['old_session_key'])) {
|
||||||
if (!isset($settings['old_session_passcode'])) $settings['old_session_passcode'] = '';
|
$settings['old_session_key'] = 'data';
|
||||||
|
}
|
||||||
|
if (!isset($settings['old_session_passcode'])) {
|
||||||
|
$settings['old_session_passcode'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
if (basename($session) !== 'tdata') $session .= '/tdata';
|
if (basename($session) !== 'tdata') {
|
||||||
|
$session .= '/tdata';
|
||||||
|
}
|
||||||
|
|
||||||
list($part_one_md5, $part_two_md5) = str_split(self::tdesktop_md5($settings['old_session_key']), 16);
|
list($part_one_md5, $part_two_md5) = str_split(self::tdesktop_md5($settings['old_session_key']), 16);
|
||||||
self::$tdesktop_base_path = $session.'/';
|
self::$tdesktop_base_path = $session.'/';
|
||||||
@ -413,7 +434,7 @@ class Conversion
|
|||||||
$MadelineProto = new \danog\MadelineProto\API($new_session, $settings);
|
$MadelineProto = new \danog\MadelineProto\API($new_session, $settings);
|
||||||
foreach ($auth_keys as $dc => $auth_key) {
|
foreach ($auth_keys as $dc => $auth_key) {
|
||||||
$MadelineProto->API->datacenter->sockets[$dc]->auth_key = ['server_salt' => '', 'connection_inited' => true, 'id' => substr(sha1($auth_key, true), -8), 'auth_key' => $auth_key];
|
$MadelineProto->API->datacenter->sockets[$dc]->auth_key = ['server_salt' => '', 'connection_inited' => true, 'id' => substr(sha1($auth_key, true), -8), 'auth_key' => $auth_key];
|
||||||
$MadelineProto->API->datacenter->sockets[$dc]->temp_auth_key = NULL;
|
$MadelineProto->API->datacenter->sockets[$dc]->temp_auth_key = null;
|
||||||
$MadelineProto->API->datacenter->sockets[$dc]->authorized = true;
|
$MadelineProto->API->datacenter->sockets[$dc]->authorized = true;
|
||||||
$MadelineProto->API->datacenter->sockets[$dc]->session_id = $MadelineProto->random(8);
|
$MadelineProto->API->datacenter->sockets[$dc]->session_id = $MadelineProto->random(8);
|
||||||
$MadelineProto->API->datacenter->sockets[$dc]->session_in_seq_no = 0;
|
$MadelineProto->API->datacenter->sockets[$dc]->session_in_seq_no = 0;
|
||||||
@ -426,6 +447,7 @@ class Conversion
|
|||||||
$MadelineProto->API->authorized = MTProto::LOGGED_IN;
|
$MadelineProto->API->authorized = MTProto::LOGGED_IN;
|
||||||
$MadelineProto->API->authorized_dc = $main_dc_id;
|
$MadelineProto->API->authorized_dc = $main_dc_id;
|
||||||
$MadelineProto->API->init_authorization();
|
$MadelineProto->API->init_authorization();
|
||||||
|
|
||||||
return $MadelineProto;
|
return $MadelineProto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user