Merge branch 'v4.4.x'

pkg/middleware/auth_proxy_test.go

@@ -106,6 +106,10 @@ func (s *mockSession) Destory(c *Context) error {
 	return nil
 }
 
+func (s *mockSession) RegenerateId(c *Context) error {
+	return nil
+}
+
 type mockLdapAuthenticator struct {
 	syncSignedInUserCalled bool
 }

pkg/middleware/session.go

@@ -103,6 +103,8 @@ type SessionStore interface {
 	Destory(*Context) error
 	// init
 	Start(*Context) error
+	// RegenerateId regenerates the session id
+	RegenerateId(*Context) error
 }
 
 type SessionWrapper struct {
@@ -116,6 +118,12 @@ func (s *SessionWrapper) Start(c *Context) error {
 	return err
 }
 
+func (s *SessionWrapper) RegenerateId(c *Context) error {
+	var err error
+	s.session, err = s.manager.RegenerateId(c.Context)
+	return err
+}
+
 func (s *SessionWrapper) Set(k interface{}, v interface{}) error {
 	if s.session != nil {
 		return s.session.Set(k, v)