1 files changed, 25 insertions, 33 deletions
diff --git a/models/asymkey/ssh_key_verify.go b/models/asymkey/ssh_key_verify.go
index 605ffe9096..04917239ee 100644
--- a/models/asymkey/ssh_key_verify.go
+++ b/models/asymkey/ssh_key_verify.go
@@ -15,41 +15,33 @@ import (
 
 // VerifySSHKey marks a SSH key as verified
 func VerifySSHKey(ctx context.Context, ownerID int64, fingerprint, token, signature string) (string, error) {
-	ctx, committer, err := db.TxContext(ctx)
-	if err != nil {
-		return "", err
-	}
-	defer committer.Close()
-
-	key := new(PublicKey)
-
-	has, err := db.GetEngine(ctx).Where("owner_id = ? AND fingerprint = ?", ownerID, fingerprint).Get(key)
-	if err != nil {
-		return "", err
-	} else if !has {
-		return "", ErrKeyNotExist{}
-	}
-
-	err = sshsig.Verify(strings.NewReader(token), []byte(signature), []byte(key.Content), "gitea")
-	if err != nil {
-		// edge case for Windows based shells that will add CR LF if piped to ssh-keygen command
-		// see https://github.com/PowerShell/PowerShell/issues/5974
-		if sshsig.Verify(strings.NewReader(token+"\r\n"), []byte(signature), []byte(key.Content), "gitea") != nil {
-			log.Error("Unable to validate token signature. Error: %v", err)
-			return "", ErrSSHInvalidTokenSignature{
-				Fingerprint: key.Fingerprint,
-			}
+	return db.WithTx2(ctx, func(ctx context.Context) (string, error) {
+		key := new(PublicKey)
+
+		has, err := db.GetEngine(ctx).Where("owner_id = ? AND fingerprint = ?", ownerID, fingerprint).Get(key)
+		if err != nil {
+			return "", err
+		} else if !has {
+			return "", ErrKeyNotExist{}
 		}
-	}
 
-	key.Verified = true
-	if _, err := db.GetEngine(ctx).ID(key.ID).Cols("verified").Update(key); err != nil {
-		return "", err
-	}
+		err = sshsig.Verify(strings.NewReader(token), []byte(signature), []byte(key.Content), "gitea")
+		if err != nil {
+			// edge case for Windows based shells that will add CR LF if piped to ssh-keygen command
+			// see https://github.com/PowerShell/PowerShell/issues/5974
+			if sshsig.Verify(strings.NewReader(token+"\r\n"), []byte(signature), []byte(key.Content), "gitea") != nil {
+				log.Debug("VerifySSHKey sshsig.Verify failed: %v", err)
+				return "", ErrSSHInvalidTokenSignature{
+					Fingerprint: key.Fingerprint,
+				}
+			}
+		}
 
-	if err := committer.Commit(); err != nil {
-		return "", err
-	}
+		key.Verified = true
+		if _, err := db.GetEngine(ctx).ID(key.ID).Cols("verified").Update(key); err != nil {
+			return "", err
+		}
 
-	return key.Fingerprint, nil
+		return key.Fingerprint, nil
+	})
 }