Commit fa8f6e5a authored by astaxie's avatar astaxie

session destroy

parent 6e987bfd
......@@ -568,6 +568,7 @@ func (c *Controller) SessionRegenerateID() {
// DestroySession cleans session data and session cookie.
func (c *Controller) DestroySession() {
c.Ctx.Input.CruSession.Flush()
c.Ctx.Input.CruSession = nil
GlobalSessions.SessionDestroy(c.Ctx.ResponseWriter, c.Ctx.Request)
}
......
......@@ -650,7 +650,9 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
return
}
defer func() {
context.Input.CruSession.SessionRelease(rw)
if context.Input.CruSession != nil {
context.Input.CruSession.SessionRelease(rw)
}
}()
}
......
......@@ -98,18 +98,13 @@ func (rs *SessionStore) SessionID() string {
// SessionRelease save session values to redis
func (rs *SessionStore) SessionRelease(w http.ResponseWriter) {
b, err := session.EncodeGob(rs.values)
if err != nil {
return
}
c := rs.p.Get()
defer c.Close()
// Update session value if exists or error.
if existed, err := redis.Bool(c.Do("EXISTS", rs.sid)); existed || err != nil {
c.Do("SETEX", rs.sid, rs.maxlifetime, string(b))
}
c.Do("SETEX", rs.sid, rs.maxlifetime, string(b))
}
// Provider redis session provider
......
// Copyright 2016 beego Author. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package redis
import (
"testing"
)
func TestSessionRelease(t *testing.T) {
provider := Provider{}
if err := provider.SessionInit(3, "127.0.0.1:6379"); err != nil {
t.Fatal("init session err,", err)
}
sessionID := "beegosessionid_00001"
session, err := provider.SessionRegenerate("", sessionID)
if err != nil {
t.Fatal("new session error,", err)
}
// set item.
session.Set("k1", "v1")
// update.
session.SessionRelease(nil)
session, err = provider.SessionRead(sessionID)
if err != nil {
t.Fatal("read session error,", err)
}
if v1 := session.Get("k1"); v1 == nil {
t.Fatal("want v1 got nil")
} else if v, _ := v1.(string); v != "v1" {
t.Fatalf("want v1 got %s", v)
}
// delete
provider.SessionDestroy(sessionID)
session.Set("k2", "v2")
session.SessionRelease(nil)
session, err = provider.SessionRead(sessionID)
if err != nil {
t.Fatal("read session error,", err)
}
if session.Get("k1") != nil || session.Get("k2") != nil {
t.Fatalf("want emtpy session value,got %s,%s", session.Get("k1"), session.Get("k2"))
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment