summaryrefslogtreecommitdiffstats
path: root/models/user.go
diff options
context:
space:
mode:
authorChris Shyi <chrisshyi13@gmail.com>2020-11-15 00:53:43 +0800
committerGitHub <noreply@github.com>2020-11-14 11:53:43 -0500
commitd025d84d91a43a691d748323cd74d0fdc5ecc9bf (patch)
tree37b2954066d4a3bce3eb4e79598bc37e14d3e8ea /models/user.go
parent7d2700c8be5da8f2073a576dae209ae07ac6ed22 (diff)
downloadgitea-d025d84d91a43a691d748323cd74d0fdc5ecc9bf.tar.gz
gitea-d025d84d91a43a691d748323cd74d0fdc5ecc9bf.zip
Add email validity check (#13475)
* Improve error feedback for duplicate deploy keys Instead of a generic HTTP 500 error page, a flash message is rendered with the deploy key page template so inform the user that a key with the intended title already exists. * API returns 422 error when key with name exists * Add email validity checking Add email validity checking for the following routes: [Web interface] 1. User registration 2. User creation by admin 3. Adding an email through user settings [API] 1. POST /admin/users 2. PATCH /admin/users/:username 3. POST /user/emails * Add further tests * Add signup email tests * Add email validity check for linking existing account * Address PR comments * Remove unneeded DB session * Move email check to updateUser Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'models/user.go')
-rw-r--r--models/user.go13
1 files changed, 12 insertions, 1 deletions
diff --git a/models/user.go b/models/user.go
index 42f70b4666..9489ff4e8b 100644
--- a/models/user.go
+++ b/models/user.go
@@ -14,6 +14,7 @@ import (
"errors"
"fmt"
_ "image/jpeg" // Needed for jpeg support
+ "net/mail"
"os"
"path/filepath"
"regexp"
@@ -808,6 +809,11 @@ func CreateUser(u *User) (err error) {
return ErrEmailAlreadyUsed{u.Email}
}
+ _, err = mail.ParseAddress(u.Email)
+ if err != nil {
+ return ErrEmailInvalid{u.Email}
+ }
+
isExist, err = isEmailUsed(sess, u.Email)
if err != nil {
return err
@@ -951,7 +957,12 @@ func checkDupEmail(e Engine, u *User) error {
}
func updateUser(e Engine, u *User) error {
- _, err := e.ID(u.ID).AllCols().Update(u)
+ u.Email = strings.ToLower(u.Email)
+ _, err := mail.ParseAddress(u.Email)
+ if err != nil {
+ return ErrEmailInvalid{u.Email}
+ }
+ _, err = e.ID(u.ID).AllCols().Update(u)
return err
}