Skip to content

Commit 72a8d09

Browse files
committed
Fix code review remarks
1 parent bf66261 commit 72a8d09

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

models/asymkey/ssh_key_commit_verification.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
user_model "code.gitea.io/gitea/models/user"
1414
"code.gitea.io/gitea/modules/git"
1515
"code.gitea.io/gitea/modules/log"
16+
1617
"github.com/42wim/sshsig"
1718
)
1819

@@ -30,7 +31,11 @@ func ParseCommitWithSSHSignature(c *git.Commit, committer *user_model.User) *Com
3031
}
3132
}
3233

33-
committerEmailAddresses, _ := user_model.GetEmailAddresses(committer.ID)
34+
committerEmailAddresses, err := user_model.GetEmailAddresses(committer.ID)
35+
if err != nil {
36+
log.Error("GetEmailAddresses: %v", err)
37+
}
38+
3439
activated := false
3540
for _, e := range committerEmailAddresses {
3641
if e.IsActivated && strings.EqualFold(e.Email, c.Committer.Email) {

models/asymkey/ssh_key_verify.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func VerifySSHKey(ownerID int64, fingerprint, token, signature string) (string,
3737
}
3838

3939
key.Verified = true
40-
if _, err := db.GetEngine(ctx).ID(key.ID).SetExpr("verified", true).Update(new(PublicKey)); err != nil {
40+
if _, err := db.GetEngine(ctx).ID(key.ID).Cols("verified").Update(key); err != nil {
4141
return "", err
4242
}
4343

0 commit comments

Comments
 (0)