From 76e8eec3d9b9289df33e1fa5c83dac22662029cf Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 13 Jun 2019 17:16:50 +0100 Subject: [PATCH] Detect noreply email address as user (#7133) (#7195) --- models/user.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/models/user.go b/models/user.go index bfbe9391b1..7aaf08f62a 100644 --- a/models/user.go +++ b/models/user.go @@ -1346,6 +1346,19 @@ func GetUserByEmail(email string) (*User, error) { return GetUserByID(emailAddress.UID) } + // Finally, if email address is the protected email address: + if strings.HasSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) { + username := strings.TrimSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) + user := &User{LowerName: username} + has, err := x.Get(user) + if err != nil { + return nil, err + } + if has { + return user, nil + } + } + return nil, ErrUserNotExist{0, email, 0} }