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

validate text

This commit is contained in:
Andrea Maria Piana 2021-06-25 12:15:37 +02:00
parent 29deacc2df
commit e68fad2788
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
protocol/message_validator.go
View File

@ -153,6 +153,18 @@ func ValidateReceivedDeclineRequestTransaction(message *protobuf.DeclineRequestT
return nil
}
func ValidateText(text string) error {
if len(strings.TrimSpace(text)) == 0 {
return errors.New("text can't be empty")
}
if len([]rune(text)) > maxChatMessageTextLength {
return fmt.Errorf("text shouldn't be longer than %d", maxChatMessageTextLength)
}
return nil
}
func ValidateReceivedChatMessage(message *protobuf.ChatMessage, whisperTimestamp uint64) error {
if err := validateClockValue(message.Clock, whisperTimestamp); err != nil {
return err
@ -162,12 +174,8 @@ func ValidateReceivedChatMessage(message *protobuf.ChatMessage, whisperTimestamp
return errors.New("timestamp can't be 0")
}
if len(strings.TrimSpace(message.Text)) == 0 {
return errors.New("text can't be empty")
}
if len([]rune(message.Text)) > maxChatMessageTextLength {
return fmt.Errorf("text shouldn't be longer than %d", maxChatMessageTextLength)
if err := ValidateText(message.Text); err != nil {
return err
}
if len(message.ChatId) == 0 {

3
protocol/messenger_messages.go
View File

@ -82,6 +82,9 @@ func (m *Messenger) EditMessage(ctx context.Context, request *requests.EditMessa
}
func (m *Messenger) applyEditMessage(editMessage *protobuf.EditMessage, message *common.Message) error {
if err := ValidateText(editMessage.Text); err != nil {
return err
}
message.Text = editMessage.Text
message.EditedAt = editMessage.Clock