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

Check message reply header in updates.

Browse Source 
GitOrigin-RevId: bb71f4cf73f104b6d2f9da18305007336b9397bf
This commit is contained in:
levlam 2020-09-10 16:28:25 +03:00
parent aa6c746e8d
commit 643371aa2f
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
td/telegram/UpdatesManager.cpp
View File

@ -393,20 +393,34 @@ bool UpdatesManager::is_acceptable_message_entities(
return true; return true;
} }
bool UpdatesManager::is_acceptable_message_reply_header(
const telegram_api::object_ptr<telegram_api::messageReplyHeader> &header) const {
if (header == nullptr) {
return true;
}
if (header->reply_to_peer_id_ != nullptr) {
DialogId dialog_id(header->reply_to_peer_id_);
if (!is_acceptable_dialog(dialog_id)) {
return false;
}
}
return true;
}
bool UpdatesManager::is_acceptable_message_forward_header( bool UpdatesManager::is_acceptable_message_forward_header(
const telegram_api::object_ptr<telegram_api::messageFwdHeader> &header) const { const telegram_api::object_ptr<telegram_api::messageFwdHeader> &header) const {
if (header == nullptr) { if (header == nullptr) {
return true; return true;
} }
auto flags = header->flags_; if (header->from_id_ != nullptr) {
if (flags & telegram_api::messageFwdHeader::FROM_ID_MASK) {
DialogId dialog_id(header->from_id_); DialogId dialog_id(header->from_id_);
if (!is_acceptable_dialog(dialog_id)) { if (!is_acceptable_dialog(dialog_id)) {
return false; return false;
} }
} }
if (flags & telegram_api::messageFwdHeader::SAVED_FROM_PEER_MASK) { if (header->saved_from_peer_ != nullptr) {
DialogId dialog_id(header->saved_from_peer_); DialogId dialog_id(header->saved_from_peer_);
if (!is_acceptable_dialog(dialog_id)) { if (!is_acceptable_dialog(dialog_id)) {
return false; return false;
@ -428,12 +442,13 @@ bool UpdatesManager::is_acceptable_message(const telegram_api::Message *message_
if (!is_acceptable_dialog(DialogId(message->peer_id_))) { if (!is_acceptable_dialog(DialogId(message->peer_id_))) {
return false; return false;
} }
if (message->flags_ & MessagesManager::MESSAGE_FLAG_HAS_FROM_ID) { if (message->from_id_ != nullptr && !is_acceptable_dialog(DialogId(message->from_id_))) {
if (!is_acceptable_dialog(DialogId(message->from_id_))) {
return false; return false;
} }
}
if (!is_acceptable_message_reply_header(message->reply_to_)) {
return false;
}
if (!is_acceptable_message_forward_header(message->fwd_from_)) { if (!is_acceptable_message_forward_header(message->fwd_from_)) {
return false; return false;
} }

3
td/telegram/UpdatesManager.h
View File

@ -190,6 +190,9 @@ class UpdatesManager : public Actor {
bool is_acceptable_message_entities(const vector<tl_object_ptr<telegram_api::MessageEntity>> &message_entities) const; bool is_acceptable_message_entities(const vector<tl_object_ptr<telegram_api::MessageEntity>> &message_entities) const;
bool is_acceptable_message_reply_header(
const telegram_api::object_ptr<telegram_api::messageReplyHeader> &header) const;
bool is_acceptable_message_forward_header( bool is_acceptable_message_forward_header(
const telegram_api::object_ptr<telegram_api::messageFwdHeader> &header) const; const telegram_api::object_ptr<telegram_api::messageFwdHeader> &header) const;