LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-13 04:56:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use autogen code on the authenticator instead hardcoding requests

Browse Source
This commit is contained in:
Lonami Exo 2017-09-28 11:36:51 +02:00
parent 4bedbfe945
commit fe30f63d5d
4 changed files with 125 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
telethon/crypto/auth_key.py
View File

@ -18,5 +18,6 @@ class AuthKey:
"""Calculates the new nonce hash based on """Calculates the new nonce hash based on
the current class fields' values the current class fields' values
""" """
new_nonce = new_nonce.to_bytes(32, 'little', signed=True)
data = new_nonce + struct.pack('<BQ', number, self.aux_hash) data = new_nonce + struct.pack('<BQ', number, self.aux_hash)
return utils.calc_msg_key(data) return utils.calc_msg_key(data)

3
telethon/crypto/rsa.py
View File

@ -1,4 +1,5 @@
import os import os
import struct
from hashlib import sha1 from hashlib import sha1
try: try:
import rsa import rsa
@ -37,7 +38,7 @@ def _compute_fingerprint(key):
n = TLObject.serialize_bytes(get_byte_array(key.n)) n = TLObject.serialize_bytes(get_byte_array(key.n))
e = TLObject.serialize_bytes(get_byte_array(key.e)) e = TLObject.serialize_bytes(get_byte_array(key.e))
# Telegram uses the last 8 bytes as the fingerprint # Telegram uses the last 8 bytes as the fingerprint
return sha1(n + e).digest()[-8:] return struct.unpack('<q', sha1(n + e).digest()[-8:])[0]
def add_key(pub): def add_key(pub):

8
telethon/helpers.py
View File

@ -47,9 +47,11 @@ def calc_msg_key(data):
def generate_key_data_from_nonce(server_nonce, new_nonce): def generate_key_data_from_nonce(server_nonce, new_nonce):
"""Generates the key data corresponding to the given nonce""" """Generates the key data corresponding to the given nonce"""
hash1 = sha1(bytes(new_nonce + server_nonce)).digest() server_nonce = server_nonce.to_bytes(16, 'little', signed=True)
hash2 = sha1(bytes(server_nonce + new_nonce)).digest() new_nonce = new_nonce.to_bytes(32, 'little', signed=True)
hash3 = sha1(bytes(new_nonce + new_nonce)).digest() hash1 = sha1(new_nonce + server_nonce).digest()
hash2 = sha1(server_nonce + new_nonce).digest()
hash3 = sha1(new_nonce + new_nonce).digest()
key = hash1 + hash2[:12] key = hash1 + hash2[:12]
iv = hash2[12:20] + hash3 + new_nonce[:4] iv = hash2[12:20] + hash3 + new_nonce[:4]

269
telethon/network/authenticator.py
View File

@ -2,14 +2,19 @@ import os
import time import time
from hashlib import sha1 from hashlib import sha1
import errno from ..tl.types import (
ResPQ, PQInnerData, ServerDHParamsFail, ServerDHParamsOk,
ServerDHInnerData, ClientDHInnerData, DhGenOk, DhGenRetry, DhGenFail
)
from .. import helpers as utils from .. import helpers as utils
from ..crypto import AES, AuthKey, Factorization from ..crypto import AES, AuthKey, Factorization
from ..crypto import rsa from ..crypto import rsa
from ..errors import SecurityError, TypeNotFoundError from ..errors import SecurityError, TypeNotFoundError
from ..extensions import BinaryReader, BinaryWriter from ..extensions import BinaryReader
from ..network import MtProtoPlainSender from ..network import MtProtoPlainSender
from ..tl.functions import (
ReqPqRequest, ReqDHParamsRequest, SetClientDHParamsRequest
)
def do_authentication(connection, retries=5): def do_authentication(connection, retries=5):
@ -33,197 +38,157 @@ def _do_authentication(connection):
""" """
sender = MtProtoPlainSender(connection) sender = MtProtoPlainSender(connection)
# Step 1 sending: PQ Request # Step 1 sending: PQ Request, endianness doesn't matter since it's random
nonce = os.urandom(16) req_pq_request = ReqPqRequest(
with BinaryWriter(known_length=20) as writer: nonce=int.from_bytes(os.urandom(16), 'big', signed=True)
writer.write_int(0x60469778, signed=False) # Constructor number )
writer.write(nonce) sender.send(req_pq_request.to_bytes())
sender.send(writer.get_bytes())
# Step 1 response: PQ Request
pq, pq_bytes, server_nonce, fingerprints = None, None, None, []
with BinaryReader(sender.receive()) as reader: with BinaryReader(sender.receive()) as reader:
response_code = reader.read_int(signed=False) req_pq_request.on_response(reader)
if response_code != 0x05162463:
raise TypeNotFoundError(response_code)
nonce_from_server = reader.read(16) res_pq = req_pq_request.result
if nonce_from_server != nonce: if not isinstance(res_pq, ResPQ):
raise SecurityError('Invalid nonce from server') raise TypeNotFoundError(type(res_pq).constructor_id)
server_nonce = reader.read(16) if res_pq.nonce != req_pq_request.nonce:
raise SecurityError('Invalid nonce from server')
pq_bytes = reader.tgread_bytes() pq = get_int(res_pq.pq)
pq = get_int(pq_bytes)
vector_id = reader.read_int()
if vector_id != 0x1cb5c415:
raise TypeNotFoundError(response_code)
fingerprints = []
fingerprint_count = reader.read_int()
for _ in range(fingerprint_count):
fingerprints.append(reader.read(8))
# Step 2 sending: DH Exchange # Step 2 sending: DH Exchange
new_nonce = os.urandom(32)
p, q = Factorization.factorize(pq) p, q = Factorization.factorize(pq)
with BinaryWriter() as pq_inner_data_writer: p, q = rsa.get_byte_array(min(p, q)), rsa.get_byte_array(max(p, q))
pq_inner_data_writer.write_int( new_nonce = int.from_bytes(os.urandom(32), 'little', signed=True)
0x83c95aec, signed=False) # PQ Inner Data
pq_inner_data_writer.tgwrite_bytes(rsa.get_byte_array(pq))
pq_inner_data_writer.tgwrite_bytes(rsa.get_byte_array(min(p, q)))
pq_inner_data_writer.tgwrite_bytes(rsa.get_byte_array(max(p, q)))
pq_inner_data_writer.write(nonce)
pq_inner_data_writer.write(server_nonce)
pq_inner_data_writer.write(new_nonce)
# sha_digest + data + random_bytes pq_inner_data = PQInnerData(
cipher_text, target_fingerprint = None, None pq=rsa.get_byte_array(pq), p=p, q=q,
for fingerprint in fingerprints: nonce=res_pq.nonce,
cipher_text = rsa.encrypt( server_nonce=res_pq.server_nonce,
fingerprint, new_nonce=new_nonce
pq_inner_data_writer.get_bytes() ).to_bytes()
# sha_digest + data + random_bytes
cipher_text, target_fingerprint = None, None
for fingerprint in res_pq.server_public_key_fingerprints:
cipher_text = rsa.encrypt(fingerprint, pq_inner_data)
if cipher_text is not None:
target_fingerprint = fingerprint
break
if cipher_text is None:
raise SecurityError(
'Could not find a valid key for fingerprints: {}'
.format(', '.join(
[str(f) for f in res_pq.server_public_key_fingerprints])
) )
)
if cipher_text is not None: req_dh_params = ReqDHParamsRequest(
target_fingerprint = fingerprint nonce=res_pq.nonce,
break server_nonce=res_pq.server_nonce,
p=p, q=q,
if cipher_text is None: public_key_fingerprint=target_fingerprint,
raise SecurityError( encrypted_data=cipher_text
'Could not find a valid key for fingerprints: {}' )
.format(', '.join([repr(f) for f in fingerprints])) sender.send(req_dh_params.to_bytes())
)
with BinaryWriter() as req_dh_params_writer:
req_dh_params_writer.write_int(
0xd712e4be, signed=False) # Req DH Params
req_dh_params_writer.write(nonce)
req_dh_params_writer.write(server_nonce)
req_dh_params_writer.tgwrite_bytes(rsa.get_byte_array(min(p, q)))
req_dh_params_writer.tgwrite_bytes(rsa.get_byte_array(max(p, q)))
req_dh_params_writer.write(target_fingerprint)
req_dh_params_writer.tgwrite_bytes(cipher_text)
req_dh_params_bytes = req_dh_params_writer.get_bytes()
sender.send(req_dh_params_bytes)
# Step 2 response: DH Exchange # Step 2 response: DH Exchange
encrypted_answer = None
with BinaryReader(sender.receive()) as reader: with BinaryReader(sender.receive()) as reader:
response_code = reader.read_int(signed=False) req_dh_params.on_response(reader)
if response_code == 0x79cb045d: server_dh_params = req_dh_params.result
raise SecurityError('Server DH params fail: TODO') if isinstance(server_dh_params, ServerDHParamsFail):
raise SecurityError('Server DH params fail: TODO')
if response_code != 0xd0e8075c: if not isinstance(server_dh_params, ServerDHParamsOk):
raise TypeNotFoundError(response_code) raise TypeNotFoundError(type(server_dh_params).constructor_id)
nonce_from_server = reader.read(16) if server_dh_params.nonce != res_pq.nonce:
if nonce_from_server != nonce: raise SecurityError('Invalid nonce from server')
raise SecurityError('Invalid nonce from server')
server_nonce_from_server = reader.read(16) if server_dh_params.server_nonce != res_pq.server_nonce:
if server_nonce_from_server != server_nonce: raise SecurityError('Invalid server nonce from server')
raise SecurityError('Invalid server nonce from server')
encrypted_answer = reader.tgread_bytes()
# Step 3 sending: Complete DH Exchange # Step 3 sending: Complete DH Exchange
key, iv = utils.generate_key_data_from_nonce(server_nonce, new_nonce) key, iv = utils.generate_key_data_from_nonce(
plain_text_answer = AES.decrypt_ige(encrypted_answer, key, iv) res_pq.server_nonce, new_nonce
)
plain_text_answer = AES.decrypt_ige(
server_dh_params.encrypted_answer, key, iv
)
g, dh_prime, ga, time_offset = None, None, None, None with BinaryReader(plain_text_answer) as reader:
with BinaryReader(plain_text_answer) as dh_inner_data_reader: reader.read(20) # hash sum
dh_inner_data_reader.read(20) # hash sum server_dh_inner = reader.tgread_object()
code = dh_inner_data_reader.read_int(signed=False) if not isinstance(server_dh_inner, ServerDHInnerData):
if code != 0xb5890dba: raise TypeNotFoundError(server_dh_inner)
raise TypeNotFoundError(code)
nonce_from_server1 = dh_inner_data_reader.read(16) if server_dh_inner.nonce != res_pq.nonce:
if nonce_from_server1 != nonce: print(server_dh_inner.nonce, res_pq.nonce)
raise SecurityError('Invalid nonce in encrypted answer') raise SecurityError('Invalid nonce in encrypted answer')
server_nonce_from_server1 = dh_inner_data_reader.read(16) if server_dh_inner.server_nonce != res_pq.server_nonce:
if server_nonce_from_server1 != server_nonce: raise SecurityError('Invalid server nonce in encrypted answer')
raise SecurityError('Invalid server nonce in encrypted answer')
g = dh_inner_data_reader.read_int() dh_prime = get_int(server_dh_inner.dh_prime, signed=False)
dh_prime = get_int(dh_inner_data_reader.tgread_bytes(), signed=False) g_a = get_int(server_dh_inner.g_a, signed=False)
ga = get_int(dh_inner_data_reader.tgread_bytes(), signed=False) time_offset = server_dh_inner.server_time - int(time.time())
server_time = dh_inner_data_reader.read_int()
time_offset = server_time - int(time.time())
b = get_int(os.urandom(256), signed=False) b = get_int(os.urandom(256), signed=False)
gb = pow(g, b, dh_prime) gb = pow(server_dh_inner.g, b, dh_prime)
gab = pow(ga, b, dh_prime) gab = pow(g_a, b, dh_prime)
# Prepare client DH Inner Data # Prepare client DH Inner Data
with BinaryWriter() as client_dh_inner_data_writer: client_dh_inner = ClientDHInnerData(
client_dh_inner_data_writer.write_int( nonce=res_pq.nonce,
0x6643b654, signed=False) # Client DH Inner Data server_nonce=res_pq.server_nonce,
client_dh_inner_data_writer.write(nonce) retry_id=0, # TODO Actual retry ID
client_dh_inner_data_writer.write(server_nonce) g_b=rsa.get_byte_array(gb)
client_dh_inner_data_writer.write_long(0) # TODO retry_id ).to_bytes()
client_dh_inner_data_writer.tgwrite_bytes(rsa.get_byte_array(gb))
with BinaryWriter() as client_dh_inner_data_with_hash_writer: client_dh_inner_hashed = sha1(client_dh_inner).digest() + client_dh_inner
client_dh_inner_data_with_hash_writer.write(
sha1(client_dh_inner_data_writer.get_bytes()).digest())
client_dh_inner_data_with_hash_writer.write(
client_dh_inner_data_writer.get_bytes())
client_dh_inner_data_bytes = \
client_dh_inner_data_with_hash_writer.get_bytes()
# Encryption # Encryption
client_dh_inner_data_encrypted_bytes = AES.encrypt_ige( client_dh_encrypted = AES.encrypt_ige(client_dh_inner_hashed, key, iv)
client_dh_inner_data_bytes, key, iv)
# Prepare Set client DH params # Prepare Set client DH params
with BinaryWriter() as set_client_dh_params_writer: set_client_dh = SetClientDHParamsRequest(
set_client_dh_params_writer.write_int(0xf5045f1f, signed=False) nonce=res_pq.nonce,
set_client_dh_params_writer.write(nonce) server_nonce=res_pq.server_nonce,
set_client_dh_params_writer.write(server_nonce) encrypted_data=client_dh_encrypted,
set_client_dh_params_writer.tgwrite_bytes( )
client_dh_inner_data_encrypted_bytes) sender.send(set_client_dh.to_bytes())
set_client_dh_params_bytes = set_client_dh_params_writer.get_bytes()
sender.send(set_client_dh_params_bytes)
# Step 3 response: Complete DH Exchange # Step 3 response: Complete DH Exchange
with BinaryReader(sender.receive()) as reader: with BinaryReader(sender.receive()) as reader:
code = reader.read_int(signed=False) set_client_dh.on_response(reader)
if code == 0x3bcbf734: # DH Gen OK
nonce_from_server = reader.read(16)
if nonce_from_server != nonce:
raise SecurityError('Invalid nonce from server')
server_nonce_from_server = reader.read(16) dh_gen = set_client_dh.result
if server_nonce_from_server != server_nonce: if isinstance(dh_gen, DhGenOk):
raise SecurityError('Invalid server nonce from server') if dh_gen.nonce != res_pq.nonce:
raise SecurityError('Invalid nonce from server')
new_nonce_hash1 = reader.read(16) if dh_gen.server_nonce != res_pq.server_nonce:
auth_key = AuthKey(rsa.get_byte_array(gab)) raise SecurityError('Invalid server nonce from server')
new_nonce_hash_calculated = auth_key.calc_new_nonce_hash(new_nonce, auth_key = AuthKey(rsa.get_byte_array(gab))
1) new_nonce_hash = int.from_bytes(
if new_nonce_hash1 != new_nonce_hash_calculated: auth_key.calc_new_nonce_hash(new_nonce, 1), 'little', signed=True
raise SecurityError('Invalid new nonce hash') )
return auth_key, time_offset if dh_gen.new_nonce_hash1 != new_nonce_hash:
raise SecurityError('Invalid new nonce hash')
elif code == 0x46dc1fb9: # DH Gen Retry return auth_key, time_offset
raise NotImplementedError('dh_gen_retry')
elif code == 0xa69dae02: # DH Gen Fail elif isinstance(dh_gen, DhGenRetry):
raise NotImplementedError('dh_gen_fail') raise NotImplementedError('DhGenRetry')
else: elif isinstance(dh_gen, DhGenFail):
raise NotImplementedError('DH Gen unknown: {}'.format(hex(code))) raise NotImplementedError('DhGenFail')
else:
raise NotImplementedError('DH Gen unknown: {}'.format(dh_gen))
def get_int(byte_array, signed=True): def get_int(byte_array, signed=True):