status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added check emoji reaction retraction sender against current identity

This commit is contained in:
Samuel Hawksby-Robinson 2020-07-22 01:57:44 +01:00 committed by Andrea Maria Piana
parent 0a26d5a37d
commit 5ee3a0a1b5
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
protocol/messenger.go
View File

@ -3291,7 +3291,6 @@ func (m *Messenger) SendEmojiReaction(ctx context.Context, chatID, messageID str
} }
func (m *Messenger) SendEmojiReactionRetraction(ctx context.Context, emojiReactionID string) (*MessengerResponse, error) { func (m *Messenger) SendEmojiReactionRetraction(ctx context.Context, emojiReactionID string) (*MessengerResponse, error) {
// TODO check that the sender is the key owner
m.mutex.Lock() m.mutex.Lock()
defer m.mutex.Unlock() defer m.mutex.Unlock()
@ -3301,6 +3300,17 @@ func (m *Messenger) SendEmojiReactionRetraction(ctx context.Context, emojiReacti
return nil, err return nil, err
} }
// Check that the sender is the key owner
pk := types.EncodeHex(crypto.FromECDSAPub(&m.identity.PublicKey))
if emojiReaction.From != pk {
return nil, errors.Errorf("identity mismatch, " +
"emoji reactions can only be retracted by the reaction sender, " +
"emoji reaction sent by '%s', current identity '%s'",
emojiReaction.From, pk,
)
}
// Get chat and clock
chat, ok := m.allChats[emojiReaction.ChatID] chat, ok := m.allChats[emojiReaction.ChatID]
if !ok { if !ok {
return nil, ErrChatNotFound return nil, ErrChatNotFound
@ -3328,11 +3338,13 @@ func (m *Messenger) SendEmojiReactionRetraction(ctx context.Context, emojiReacti
return nil, err return nil, err
} }
// Update MessengerResponse
response := MessengerResponse{} response := MessengerResponse{}
emojiReaction.Retracted = true emojiReaction.Retracted = true
response.EmojiReactions = []*EmojiReaction{emojiReaction} response.EmojiReactions = []*EmojiReaction{emojiReaction}
response.Chats = []*Chat{chat} response.Chats = []*Chat{chat}
// Persist retraction state for emoji reaction
err = m.persistence.RetractEmojiReaction(emojiReactionID) err = m.persistence.RetractEmojiReaction(emojiReactionID)
if err != nil { if err != nil {
return nil, err return nil, err