From 6fa7082833812c734aeef8ad24477823ee766f1b Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Wed, 26 Apr 2017 23:11:32 +0900 Subject: fix reaction's name validation with + sign in it (#6221) --- model/reaction.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'model/reaction.go') diff --git a/model/reaction.go b/model/reaction.go index 5dbf07152..3d334c214 100644 --- a/model/reaction.go +++ b/model/reaction.go @@ -6,6 +6,7 @@ package model import ( "encoding/json" "io" + "regexp" ) type Reaction struct { @@ -60,7 +61,9 @@ func (o *Reaction) IsValid() *AppError { return NewLocAppError("Reaction.IsValid", "model.reaction.is_valid.post_id.app_error", nil, "post_id="+o.PostId) } - if len(o.EmojiName) == 0 || len(o.EmojiName) > 64 || !IsValidAlphaNumHyphenUnderscore(o.EmojiName, false) { + validName := regexp.MustCompile(`^[a-zA-Z0-9\-\+_]+$`) + + if len(o.EmojiName) == 0 || len(o.EmojiName) > 64 || !validName.MatchString(o.EmojiName) { return NewLocAppError("Reaction.IsValid", "model.reaction.is_valid.emoji_name.app_error", nil, "emoji_name="+o.EmojiName) } -- cgit v1.2.3-1-g7c22