mirror of https://github.com/cloudreve/Cloudreve
fix: lock conflict while changing view / fix: sign out not blocking refresh tokens
parent
e2dbb0404a
commit
3ab86e9b1d
2
assets
2
assets
|
@ -1 +1 @@
|
|||
Subproject commit 6dc29be623b80495cb5ee9f0bdca2db42b2a3b3e
|
||||
Subproject commit cdbc2861f9b8d13ec311fd4ee394a3987a604640
|
|
@ -28,7 +28,7 @@ func (f *DBFS) PatchProps(ctx context.Context, uri *fs.URI, props *types.FilePro
|
|||
|
||||
// Lock target
|
||||
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) }()
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
@ -198,7 +198,7 @@ func (s *RefreshTokenService) Delete(c *gin.Context) (string, error) {
|
|||
// Block root token
|
||||
if claims.RootTokenID != nil {
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue