gandc/mtprotoproxy
1
0
Fork 0
mirror of https://github.com/alexbers/mtprotoproxy.git synced 2026-03-14 07:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

add tls only mode

Browse Source
This commit is contained in:
Alexander Bersenev
2019-08-11 21:22:10 +05:00
parent 80062c95bc
commit d7c163c0dc
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.py
View File

@@ -10,5 +10,9 @@ USERS = {
# Can be incompatible with very old clients # Can be incompatible with very old clients
SECURE_ONLY = True SECURE_ONLY = True
# Makes the proxy even more hard to detect
# Compatible only with the recent clients
# TLS_ONLY = True
# Tag for advertising, obtainable from @MTProxybot # Tag for advertising, obtainable from @MTProxybot
# AD_TAG = "3c09c680b76ee91a4c25ad51f742267d" # AD_TAG = "3c09c680b76ee91a4c25ad51f742267d"

34
mtprotoproxy.py
View File

@@ -118,12 +118,12 @@ def init_config():
# doesn't allow to connect in not-secure mode # doesn't allow to connect in not-secure mode
conf_dict.setdefault("SECURE_ONLY", False) conf_dict.setdefault("SECURE_ONLY", False)
# allows to connect in tls mode only
conf_dict.setdefault("TLS_ONLY", False)
# set the tls domain for the proxy, has an influence only on starting message # set the tls domain for the proxy, has an influence only on starting message
conf_dict.setdefault("TLS_DOMAIN", "google.com") conf_dict.setdefault("TLS_DOMAIN", "google.com")
# disables the tls mode, actually there are no reasons for this
conf_dict.setdefault("DISABLE_TLS", False)
# user tcp connection limits, the mapping from name to the integer limit # user tcp connection limits, the mapping from name to the integer limit
# one client can create many tcp connections, up to 8 # one client can create many tcp connections, up to 8
conf_dict.setdefault("USER_MAX_TCP_CONNS", {}) conf_dict.setdefault("USER_MAX_TCP_CONNS", {})
@@ -808,7 +808,7 @@ async def handle_handshake(reader, writer):
handshake = await reader.readexactly(HANDSHAKE_LEN) handshake = await reader.readexactly(HANDSHAKE_LEN)
if handshake.startswith(TLS_START_BYTES) and not config.DISABLE_TLS: if handshake.startswith(TLS_START_BYTES):
handshake += await reader.readexactly(TLS_HANDSHAKE_LEN - HANDSHAKE_LEN) handshake += await reader.readexactly(TLS_HANDSHAKE_LEN - HANDSHAKE_LEN)
tls_handshake_result = await handle_pseudo_tls_handshake(handshake, reader, writer) tls_handshake_result = await handle_pseudo_tls_handshake(handshake, reader, writer)
@@ -817,6 +817,10 @@ async def handle_handshake(reader, writer):
return False return False
reader, writer = tls_handshake_result reader, writer = tls_handshake_result
handshake = await reader.readexactly(HANDSHAKE_LEN) handshake = await reader.readexactly(HANDSHAKE_LEN)
else:
if config.TLS_ONLY:
set_instant_rst(writer.get_extra_info("socket"))
return False
dec_prekey_and_iv = handshake[SKIP_LEN:SKIP_LEN+PREKEY_LEN+IV_LEN] dec_prekey_and_iv = handshake[SKIP_LEN:SKIP_LEN+PREKEY_LEN+IV_LEN]
dec_prekey, dec_iv = dec_prekey_and_iv[:PREKEY_LEN], dec_prekey_and_iv[PREKEY_LEN:] dec_prekey, dec_iv = dec_prekey_and_iv[:PREKEY_LEN], dec_prekey_and_iv[PREKEY_LEN:]
@@ -1409,21 +1413,21 @@ def print_tg_info():
for user, secret in sorted(config.USERS.items(), key=lambda x: x[0]): for user, secret in sorted(config.USERS.items(), key=lambda x: x[0]):
for ip in ip_addrs: for ip in ip_addrs:
if not config.SECURE_ONLY: if not config.TLS_ONLY:
params = {"server": ip, "port": config.PORT, "secret": secret} if not config.SECURE_ONLY:
params = {"server": ip, "port": config.PORT, "secret": secret}
params_encodeded = urllib.parse.urlencode(params, safe=':')
print("{}: tg://proxy?{}".format(user, params_encodeded), flush=True)
params = {"server": ip, "port": config.PORT, "secret": "dd" + secret}
params_encodeded = urllib.parse.urlencode(params, safe=':') params_encodeded = urllib.parse.urlencode(params, safe=':')
print("{}: tg://proxy?{}".format(user, params_encodeded), flush=True) print("{}: tg://proxy?{}".format(user, params_encodeded), flush=True)
params = {"server": ip, "port": config.PORT, "secret": "dd" + secret} tls_secret = bytes.fromhex("ee" + secret) + config.TLS_DOMAIN.encode()
tls_secret_base64 = base64.b64encode(tls_secret)
params = {"server": ip, "port": config.PORT, "secret": tls_secret_base64}
params_encodeded = urllib.parse.urlencode(params, safe=':') params_encodeded = urllib.parse.urlencode(params, safe=':')
print("{}: tg://proxy?{}".format(user, params_encodeded), flush=True) print("{}: tg://proxy?{} (experimental)".format(user, params_encodeded), flush=True)
if not config.DISABLE_TLS:
tls_secret = bytes.fromhex("ee" + secret) + config.TLS_DOMAIN.encode()
tls_secret_base64 = base64.b64encode(tls_secret)
params = {"server": ip, "port": config.PORT, "secret": tls_secret_base64}
params_encodeded = urllib.parse.urlencode(params, safe=':')
print("{}: tg://proxy?{} (experimental)".format(user, params_encodeded), flush=True)
if secret in ["00000000000000000000000000000000", "0123456789abcdef0123456789abcdef"]: if secret in ["00000000000000000000000000000000", "0123456789abcdef0123456789abcdef"]:
msg = "The default secret {} is used, this is not recommended".format(secret) msg = "The default secret {} is used, this is not recommended".format(secret)