✨ Transport: Added Padded Intermediate and Obfuscated Padded Intermediate
This commit is contained in:
parent
2a7b83d668
commit
0dfed0b2fa
@ -34,7 +34,9 @@ class Connection:
|
|||||||
1: TCPAbridged,
|
1: TCPAbridged,
|
||||||
2: TCPIntermediate,
|
2: TCPIntermediate,
|
||||||
3: TCPAbridgedO,
|
3: TCPAbridgedO,
|
||||||
4: TCPIntermediateO
|
4: TCPIntermediateO,
|
||||||
|
5: TCPPaddedIntermediate,
|
||||||
|
6: TCPPaddedIntermediateO
|
||||||
}
|
}
|
||||||
|
|
||||||
def __init__(self, dc_id: int, test_mode: bool, ipv6: bool, proxy: dict, media: bool = False, mode: int = 3):
|
def __init__(self, dc_id: int, test_mode: bool, ipv6: bool, proxy: dict, media: bool = False, mode: int = 3):
|
||||||
|
@ -21,4 +21,6 @@ from .tcp_abridged import TCPAbridged
|
|||||||
from .tcp_abridged_o import TCPAbridgedO
|
from .tcp_abridged_o import TCPAbridgedO
|
||||||
from .tcp_full import TCPFull
|
from .tcp_full import TCPFull
|
||||||
from .tcp_intermediate import TCPIntermediate
|
from .tcp_intermediate import TCPIntermediate
|
||||||
|
from .tcp_padded_intermediate import TCPPaddedIntermediate
|
||||||
from .tcp_intermediate_o import TCPIntermediateO
|
from .tcp_intermediate_o import TCPIntermediateO
|
||||||
|
from .tcp_padded_intermediate_o import TCPPaddedIntermediateO
|
||||||
|
45
pyrogram/connection/transport/tcp/tcp_padded_intermediate.py
Normal file
45
pyrogram/connection/transport/tcp/tcp_padded_intermediate.py
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
# Pyrogram - Telegram MTProto API Client Library for Python
|
||||||
|
# Copyright (C) 2017-present Dan <https://github.com/delivrance>
|
||||||
|
#
|
||||||
|
# This file is part of Pyrogram.
|
||||||
|
#
|
||||||
|
# Pyrogram is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Lesser General Public License as published
|
||||||
|
# by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Pyrogram 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 Lesser General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Lesser General Public License
|
||||||
|
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from struct import pack, unpack
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from .tcp import TCP
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class TCPPaddedIntermediate(TCP):
|
||||||
|
def __init__(self, ipv6: bool, proxy: dict):
|
||||||
|
super().__init__(ipv6, proxy)
|
||||||
|
|
||||||
|
async def connect(self, address: tuple):
|
||||||
|
await super().connect(address)
|
||||||
|
await super().send(b"\xdd" * 4)
|
||||||
|
|
||||||
|
async def send(self, data: bytes, *args):
|
||||||
|
await super().send(pack("<i", len(data)) + data)
|
||||||
|
|
||||||
|
async def recv(self, length: int = 0) -> Optional[bytes]:
|
||||||
|
length = await super().recv(4)
|
||||||
|
|
||||||
|
if length is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return await super().recv(unpack("<i", length)[0])
|
@ -0,0 +1,79 @@
|
|||||||
|
# Pyrogram - Telegram MTProto API Client Library for Python
|
||||||
|
# Copyright (C) 2017-present Dan <https://github.com/delivrance>
|
||||||
|
#
|
||||||
|
# This file is part of Pyrogram.
|
||||||
|
#
|
||||||
|
# Pyrogram is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Lesser General Public License as published
|
||||||
|
# by the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Pyrogram 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 Lesser General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Lesser General Public License
|
||||||
|
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
from struct import pack, unpack
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from pyrogram.crypto import aes
|
||||||
|
from .tcp import TCP
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class TCPPaddedIntermediateO(TCP):
|
||||||
|
RESERVED = (b"HEAD", b"POST", b"GET ", b"OPTI", b"\xee" * 4)
|
||||||
|
|
||||||
|
def __init__(self, ipv6: bool, proxy: dict):
|
||||||
|
super().__init__(ipv6, proxy)
|
||||||
|
|
||||||
|
self.encrypt = None
|
||||||
|
self.decrypt = None
|
||||||
|
|
||||||
|
async def connect(self, address: tuple):
|
||||||
|
await super().connect(address)
|
||||||
|
|
||||||
|
while True:
|
||||||
|
nonce = bytearray(os.urandom(64))
|
||||||
|
|
||||||
|
if nonce[0] != b"\xef" and nonce[:4] not in self.RESERVED and nonce[4:4] != b"\x00" * 4:
|
||||||
|
nonce[56] = nonce[57] = nonce[58] = nonce[59] = 0xdd
|
||||||
|
break
|
||||||
|
|
||||||
|
temp = bytearray(nonce[55:7:-1])
|
||||||
|
|
||||||
|
self.encrypt = (nonce[8:40], nonce[40:56], bytearray(1))
|
||||||
|
self.decrypt = (temp[0:32], temp[32:48], bytearray(1))
|
||||||
|
|
||||||
|
nonce[56:64] = aes.ctr256_encrypt(nonce, *self.encrypt)[56:64]
|
||||||
|
|
||||||
|
await super().send(nonce)
|
||||||
|
|
||||||
|
async def send(self, data: bytes, *args):
|
||||||
|
await super().send(
|
||||||
|
aes.ctr256_encrypt(
|
||||||
|
pack("<i", len(data)) + data,
|
||||||
|
*self.encrypt
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
async def recv(self, length: int = 0) -> Optional[bytes]:
|
||||||
|
length = await super().recv(4)
|
||||||
|
|
||||||
|
if length is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
length = aes.ctr256_decrypt(length, *self.decrypt)
|
||||||
|
|
||||||
|
data = await super().recv(unpack("<i", length)[0])
|
||||||
|
|
||||||
|
if data is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return aes.ctr256_decrypt(data, *self.decrypt)
|
Loading…
Reference in New Issue
Block a user