test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Sign: Handle ErrTwoFactorNotEnrolled correctly (#10008)

This commit is contained in:
zeripath 2020-01-26 23:44:12 +00:00 committed by GitHub
parent 20d637a0f8
commit d087f4fb73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull_sign.go
View File

@ -43,7 +43,7 @@ func (pr *PullRequest) SignMerge(u *User, tmpBasePath, baseCommit, headCommit st
} }
case twofa: case twofa:
twofaModel, err := GetTwoFactorByUID(u.ID) twofaModel, err := GetTwoFactorByUID(u.ID)
if err != nil { if err != nil && !IsErrTwoFactorNotEnrolled(err) {
return false, "", err return false, "", err
} }
if twofaModel == nil { if twofaModel == nil {

6
models/repo_sign.go
View File

@ -119,7 +119,7 @@ func SignInitialCommit(repoPath string, u *User) (bool, string, error) {
} }
case twofa: case twofa:
twofaModel, err := GetTwoFactorByUID(u.ID) twofaModel, err := GetTwoFactorByUID(u.ID)
if err != nil { if err != nil && !IsErrTwoFactorNotEnrolled(err) {
return false, "", err return false, "", err
} }
if twofaModel == nil { if twofaModel == nil {
@ -154,7 +154,7 @@ func (repo *Repository) SignWikiCommit(u *User) (bool, string, error) {
} }
case twofa: case twofa:
twofaModel, err := GetTwoFactorByUID(u.ID) twofaModel, err := GetTwoFactorByUID(u.ID)
if err != nil { if err != nil && !IsErrTwoFactorNotEnrolled(err) {
return false, "", err return false, "", err
} }
if twofaModel == nil { if twofaModel == nil {
@ -206,7 +206,7 @@ func (repo *Repository) SignCRUDAction(u *User, tmpBasePath, parentCommit string
} }
case twofa: case twofa:
twofaModel, err := GetTwoFactorByUID(u.ID) twofaModel, err := GetTwoFactorByUID(u.ID)
if err != nil { if err != nil && !IsErrTwoFactorNotEnrolled(err) {
return false, "", err return false, "", err
} }
if twofaModel == nil { if twofaModel == nil {