Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent (caught) panic on login (#11590) #11598

Merged
merged 2 commits into from
May 27, 2020
Merged

Prevent (caught) panic on login (#11590) #11598

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c5ab39
Prevent (caught) panic on login (#11590)
zeripath May 23, 2020
27b6cc1
Merge branch 'release/v1.11' into backport-11590-1.11
zeripath May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions modules/session/virtual.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,11 @@ func init() {

// VirtualStore represents a virtual session store implementation.
type VirtualStore struct {
p *VirtualSessionProvider
sid string
lock sync.RWMutex
data map[interface{}]interface{}
p *VirtualSessionProvider
sid string
lock sync.RWMutex
data map[interface{}]interface{}
released bool
}

// NewVirtualStore creates and returns a virtual session store.
Expand Down Expand Up @@ -164,20 +165,27 @@ func (s *VirtualStore) Release() error {
// Now ensure that we don't exist!
realProvider := s.p.provider

if realProvider.Exist(s.sid) {
if !s.released && realProvider.Exist(s.sid) {
// This is an error!
return fmt.Errorf("new sid '%s' already exists", s.sid)
}
realStore, err := realProvider.Read(s.sid)
if err != nil {
return err
}
if err := realStore.Flush(); err != nil {
return err
}
for key, value := range s.data {
if err := realStore.Set(key, value); err != nil {
return err
}
}
return realStore.Release()
err = realStore.Release()
if err == nil {
s.released = true
}
return err
}
return nil
}
Expand Down