thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions 4

Use Get/Set instead of Rename when Regenerate session id (#23975) (#23983)

Browse source 
Backport #23975 by @wxiaoguang

Do not use Rename here, because the old sid and new sid may be in
different redis cluster slot.

Fix #23869

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Giteabot 2023-04-07 15:21:20 -04:00 committed by GitHub
parent f317186aa6
commit 3a7cb1a83b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/session/redis.go
View file

@ -183,16 +183,21 @@ func (p *RedisProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err
} }
} }
if err = p.c.Rename(graceful.GetManager().HammerContext(), poldsid, psid).Err(); err != nil { // do not use Rename here, because the old sid and new sid may be in different redis cluster slot.
return nil, err kvs, err := p.c.Get(graceful.GetManager().HammerContext(), poldsid).Result()
}
var kv map[interface{}]interface{}
kvs, err := p.c.Get(graceful.GetManager().HammerContext(), psid).Result()
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err = p.c.Del(graceful.GetManager().HammerContext(), poldsid).Err(); err != nil {
return nil, err
}
if err = p.c.Set(graceful.GetManager().HammerContext(), psid, kvs, p.duration).Err(); err != nil {
return nil, err
}
var kv map[interface{}]interface{}
if len(kvs) == 0 { if len(kvs) == 0 {
kv = make(map[interface{}]interface{}) kv = make(map[interface{}]interface{})
} else { } else {