wiz0u/WTelegramClient
1
0
Fork 0
mirror of https://github.com/wiz0u/WTelegramClient.git synced 2025-12-06 06:52:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Monitor excessive salt changes in a better way

Browse source
This commit is contained in:
Wizou 2021-09-24 13:21:35 +02:00
parent c570f3d8d0
commit 0e88280d90
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Client.cs
View file

@ -38,7 +38,7 @@ namespace WTelegram
private long _lastRecvMsgId; private long _lastRecvMsgId;
private readonly List<long> _msgsToAck = new(); private readonly List<long> _msgsToAck = new();
private readonly Random _random = new(); private readonly Random _random = new();
private int _unexpectedSaltChange; private int _saltChangeCounter;
private Task _reactorTask; private Task _reactorTask;
private long _bareRequest; private long _bareRequest;
private readonly Dictionary<long, (Type type, TaskCompletionSource<object> tcs)> _pendingRequests = new(); private readonly Dictionary<long, (Type type, TaskCompletionSource<object> tcs)> _pendingRequests = new();
@ -128,6 +128,7 @@ namespace WTelegram
_networkStream = _tcpClient.GetStream(); _networkStream = _tcpClient.GetStream();
await _networkStream.WriteAsync(IntermediateHeader, 0, 4); await _networkStream.WriteAsync(IntermediateHeader, 0, 4);
_cts = new(); _cts = new();
_saltChangeCounter = 0;
_reactorTask = Reactor(_networkStream, _cts); _reactorTask = Reactor(_networkStream, _cts);
_sendSemaphore.Release(); _sendSemaphore.Release();
@ -146,6 +147,7 @@ namespace WTelegram
Config("lang_pack"), Config("lang_pack"),
Config("lang_code"), Config("lang_code"),
Schema.Help_GetConfig)); Schema.Help_GetConfig));
_saltChangeCounter = 0;
if (DCSession.DataCenter == null) if (DCSession.DataCenter == null)
{ {
DCSession.DataCenter = TLConfig.dc_options.Where(dc => dc.id == TLConfig.this_dc) DCSession.DataCenter = TLConfig.dc_options.Where(dc => dc.id == TLConfig.this_dc)
@ -197,6 +199,7 @@ namespace WTelegram
while (!ct.IsCancellationRequested) while (!ct.IsCancellationRequested)
{ {
await Task.Delay(60000, ct); await Task.Delay(60000, ct);
if (_saltChangeCounter > 0) --_saltChangeCounter;
await this.PingDelayDisconnect(ping_id++, 75); await this.PingDelayDisconnect(ping_id++, 75);
} }
} }
@ -295,12 +298,13 @@ namespace WTelegram
var length = reader.ReadInt32(); // int32 message_data_length var length = reader.ReadInt32(); // int32 message_data_length
var msgStamp = _session.MsgIdToStamp(msgId); var msgStamp = _session.MsgIdToStamp(msgId);
if (serverSalt != DCSession.Salt) if (serverSalt != DCSession.Salt) // salt change happens every 30 min
{ {
Helpers.Log(2, $"Server salt has changed: {DCSession.Salt:X} -> {serverSalt:X}"); Helpers.Log(2, $"Server salt has changed: {DCSession.Salt:X} -> {serverSalt:X}");
DCSession.Salt = serverSalt; DCSession.Salt = serverSalt;
if (++_unexpectedSaltChange >= 30) _saltChangeCounter += 20; // counter is decreased by KeepAlive every minute (we have margin of 10)
throw new ApplicationException($"Server salt changed unexpectedly more than 30 times during this session"); if (_saltChangeCounter >= 30)
throw new ApplicationException($"Server salt changed too often! Security issue?");
} }
if (sessionId != _session.Id) throw new ApplicationException($"Unexpected session ID {_session.Id} != {_session.Id}"); if (sessionId != _session.Id) throw new ApplicationException($"Unexpected session ID {_session.Id} != {_session.Id}");
if ((msgId & 1) == 0) throw new ApplicationException($"Invalid server msgId {msgId}"); if ((msgId & 1) == 0) throw new ApplicationException($"Invalid server msgId {msgId}");