mirror of
https://github.com/go-vikunja/vikunja.git
synced 2026-03-25 16:01:22 -05:00
39acdac531
checkUserCaldavTokens called user.GetCaldavTokens which creates its own db.NewSession(), while the caller (BasicAuth) already holds an open session. With SQLite this caused a deadlock because the second session blocks on the write lock held by the first session in the same goroutine. Add GetCaldavTokensWithSession that accepts an existing session and use it from checkUserCaldavTokens.
68 lines
1.9 KiB
Go
68 lines
1.9 KiB
Go
// Vikunja is a to-do list application to facilitate your life.
|
|
// Copyright 2018-present Vikunja and contributors. All rights reserved.
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
package user
|
|
|
|
import (
|
|
"code.vikunja.io/api/pkg/db"
|
|
|
|
"xorm.io/xorm"
|
|
)
|
|
|
|
func GenerateNewCaldavToken(u *User) (token *Token, err error) {
|
|
s := db.NewSession()
|
|
defer s.Close()
|
|
|
|
token, err = generateHashedToken(s, u, TokenCaldavAuth)
|
|
if err != nil {
|
|
_ = s.Rollback()
|
|
return nil, err
|
|
}
|
|
|
|
if err = s.Commit(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return token, nil
|
|
}
|
|
|
|
func GetCaldavTokens(u *User) (tokens []*Token, err error) {
|
|
s := db.NewSession()
|
|
defer s.Close()
|
|
|
|
return getTokensForKind(s, u, TokenCaldavAuth)
|
|
}
|
|
|
|
// GetCaldavTokensWithSession is like GetCaldavTokens but uses an existing
|
|
// database session instead of creating a new one. This avoids nested sessions
|
|
// which cause deadlocks with SQLite's single-writer model.
|
|
func GetCaldavTokensWithSession(s *xorm.Session, u *User) (tokens []*Token, err error) {
|
|
return getTokensForKind(s, u, TokenCaldavAuth)
|
|
}
|
|
|
|
func DeleteCaldavTokenByID(u *User, id int64) error {
|
|
s := db.NewSession()
|
|
defer s.Close()
|
|
|
|
err := removeTokenByID(s, u, TokenCaldavAuth, id)
|
|
if err != nil {
|
|
_ = s.Rollback()
|
|
return err
|
|
}
|
|
|
|
return s.Commit()
|
|
}
|