tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add checks for error code and message.

Browse Source
This commit is contained in:
levlam 2021-07-26 20:04:43 +03:00
parent 40cb97841a
commit ff02c55075
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/mtproto/SessionConnection.cpp
View File

@ -304,8 +304,8 @@ Status SessionConnection::on_packet(const MsgInfo &info, uint64 req_msg_id, cons
if (req_msg_id != 0) { if (req_msg_id != 0) {
callback_->on_message_result_error(req_msg_id, rpc_error.error_code_, rpc_error.error_message_.str()); callback_->on_message_result_error(req_msg_id, rpc_error.error_code_, rpc_error.error_message_.str());
} else { } else {
LOG(WARNING) << "Receive rpc_error as update: [" << rpc_error.error_code_ << "][" << rpc_error.error_message_ LOG(ERROR) << "Receive rpc_error as update: [" << rpc_error.error_code_ << "][" << rpc_error.error_message_
<< "]"; << "]";
} }
return Status::OK(); return Status::OK();
} }

14
td/telegram/net/Session.cpp
View File

@ -39,6 +39,7 @@
#include "td/utils/Time.h" #include "td/utils/Time.h"
#include "td/utils/Timer.h" #include "td/utils/Timer.h"
#include "td/utils/tl_parsers.h" #include "td/utils/tl_parsers.h"
#include "td/utils/utf8.h"
#include <tuple> #include <tuple>
#include <utility> #include <utility>
@ -769,8 +770,17 @@ Status Session::on_message_result_ok(uint64 id, BufferSlice packet, size_t origi
} }
void Session::on_message_result_error(uint64 id, int error_code, string message) { void Session::on_message_result_error(uint64 id, int error_code, string message) {
if (!check_utf8(message)) {
LOG(ERROR) << "Receive invalid error message \"" << message << '"';
message = "INVALID_UTF8_ERROR_MESSAGE";
}
if (error_code <= -10000 || error_code >= 10000 || error_code == 0) {
LOG(ERROR) << "Receive invalid error code " << error_code << " with message \"" << message << '"';
error_code = 500;
}
// UNAUTHORIZED // UNAUTHORIZED
if (error_code == 401 && message != CSlice("SESSION_PASSWORD_NEEDED")) { if (error_code == 401 && message != "SESSION_PASSWORD_NEEDED") {
if (auth_data_.use_pfs() && message == CSlice("AUTH_KEY_PERM_EMPTY")) { if (auth_data_.use_pfs() && message == CSlice("AUTH_KEY_PERM_EMPTY")) {
LOG(INFO) << "Receive AUTH_KEY_PERM_EMPTY in session " << auth_data_.get_session_id() << " for auth key " LOG(INFO) << "Receive AUTH_KEY_PERM_EMPTY in session " << auth_data_.get_session_id() << " for auth key "
<< auth_data_.get_tmp_auth_key().id(); << auth_data_.get_tmp_auth_key().id();
@ -778,7 +788,7 @@ void Session::on_message_result_error(uint64 id, int error_code, string message)
on_tmp_auth_key_updated(); on_tmp_auth_key_updated();
error_code = 500; error_code = 500;
} else { } else {
if (message == CSlice("USER_DEACTIVATED_BAN")) { if (message == "USER_DEACTIVATED_BAN") {
LOG(PLAIN) << "Your account was suspended for suspicious activity. If you think that this is a mistake, please " LOG(PLAIN) << "Your account was suspended for suspicious activity. If you think that this is a mistake, please "
"write to recover@telegram.org your phone number and other details to recover the account."; "write to recover@telegram.org your phone number and other details to recover the account.";
} }