foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-29 09:31:11 -05:00
Code Issues Wiki Activity

Ensure only own addresses are updated (#10397)

Browse source
This commit is contained in:
guillep2k 2020-02-21 10:08:04 -03:00 committed by GitHub
parent ac18c3f6f2
commit cfcd8e4146
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/user.go
View file

@ -1025,7 +1025,7 @@ func VerifyActiveEmailCode(code, email string) *EmailAddress {
data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands
if base.VerifyTimeLimitCode(data, minutes, prefix) { if base.VerifyTimeLimitCode(data, minutes, prefix) {
emailAddress := &EmailAddress{Email: email} emailAddress := &EmailAddress{UID: user.ID, Email: email}
if has, _ := x.Get(emailAddress); has { if has, _ := x.Get(emailAddress); has {
return emailAddress return emailAddress
} }

2
models/user_mail.go
View file

@ -201,7 +201,7 @@ func MakeEmailPrimary(email *EmailAddress) error {
} }
// Make sure the former primary email doesn't disappear. // Make sure the former primary email doesn't disappear.
formerPrimaryEmail := &EmailAddress{Email: user.Email} formerPrimaryEmail := &EmailAddress{UID: user.ID, Email: user.Email}
has, err = x.Get(formerPrimaryEmail) has, err = x.Get(formerPrimaryEmail)
if err != nil { if err != nil {
return err return err