github
/
Cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: lock conflict while changing view / fix: sign out not blocking refresh tokens

pull/2224/merge
Aaron Liu 2025-06-12 09:47:01 +08:00
parent e2dbb0404a
commit 3ab86e9b1d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 6dc29be623b80495cb5ee9f0bdca2db42b2a3b3e Subproject commit cdbc2861f9b8d13ec311fd4ee394a3987a604640

2
pkg/filemanager/fs/dbfs/props.go
View File

@ -28,7 +28,7 @@ func (f *DBFS) PatchProps(ctx context.Context, uri *fs.URI, props *types.FilePro
// Lock target // Lock target
lr := &LockByPath{target.Uri(true), target, target.Type(), ""} lr := &LockByPath{target.Uri(true), target, target.Type(), ""}
ls, err := f.acquireByPath(ctx, -1, f.user, false, fs.LockApp(fs.ApplicationUpdateMetadata), lr) ls, err := f.acquireByPath(ctx, -1, f.user, true, fs.LockApp(fs.ApplicationUpdateMetadata), lr)
defer func() { _ = f.Release(ctx, ls) }() defer func() { _ = f.Release(ctx, ls) }()
if err != nil { if err != nil {
return err return err

2
service/user/login.go
View File

@ -198,7 +198,7 @@ func (s *RefreshTokenService) Delete(c *gin.Context) (string, error) {
// Block root token // Block root token
if claims.RootTokenID != nil { if claims.RootTokenID != nil {
tokenSettings := dep.SettingProvider().TokenAuth(c) tokenSettings := dep.SettingProvider().TokenAuth(c)
dep.KV().Set(fmt.Sprintf("%s%s", auth.RevokeTokenPrefix, claims.RootTokenID.String()), true, int(tokenSettings.AccessTokenTTL.Seconds()+10)) dep.KV().Set(fmt.Sprintf("%s%s", auth.RevokeTokenPrefix, claims.RootTokenID.String()), true, int(tokenSettings.RefreshTokenTTL.Seconds()+10))
} }
return "", nil return "", nil