mirror of
https://github.com/astaxie/beego.git
synced 2025-06-26 00:20:19 +00:00
Revert "Merge pull request #4254 from astaxie/develop-2.0"
This reverts commite284b0ddae, reversing changes made to8ef8fd2606.
This commit is contained in:
Ming Deng
@ -1,191 +0,0 @@
|
||||
// Package ledis provide session Provider
|
||||
package ledis
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/ledisdb/ledisdb/config"
|
||||
"github.com/ledisdb/ledisdb/ledis"
|
||||
|
||||
"github.com/astaxie/beego/server/web/session"
|
||||
)
|
||||
|
||||
var (
|
||||
ledispder = &Provider{}
|
||||
c *ledis.DB
|
||||
)
|
||||
|
||||
// SessionStore ledis session store
|
||||
type SessionStore struct {
|
||||
sid string
|
||||
lock sync.RWMutex
|
||||
values map[interface{}]interface{}
|
||||
maxlifetime int64
|
||||
}
|
||||
|
||||
// Set value in ledis session
|
||||
func (ls *SessionStore) Set(ctx context.Context, key, value interface{}) error {
|
||||
ls.lock.Lock()
|
||||
defer ls.lock.Unlock()
|
||||
ls.values[key] = value
|
||||
return nil
|
||||
}
|
||||
|
||||
// Get value in ledis session
|
||||
func (ls *SessionStore) Get(ctx context.Context, key interface{}) interface{} {
|
||||
ls.lock.RLock()
|
||||
defer ls.lock.RUnlock()
|
||||
if v, ok := ls.values[key]; ok {
|
||||
return v
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Delete value in ledis session
|
||||
func (ls *SessionStore) Delete(ctx context.Context, key interface{}) error {
|
||||
ls.lock.Lock()
|
||||
defer ls.lock.Unlock()
|
||||
delete(ls.values, key)
|
||||
return nil
|
||||
}
|
||||
|
||||
// Flush clear all values in ledis session
|
||||
func (ls *SessionStore) Flush(context.Context) error {
|
||||
ls.lock.Lock()
|
||||
defer ls.lock.Unlock()
|
||||
ls.values = make(map[interface{}]interface{})
|
||||
return nil
|
||||
}
|
||||
|
||||
// SessionID get ledis session id
|
||||
func (ls *SessionStore) SessionID(context.Context) string {
|
||||
return ls.sid
|
||||
}
|
||||
|
||||
// SessionRelease save session values to ledis
|
||||
func (ls *SessionStore) SessionRelease(ctx context.Context, w http.ResponseWriter) {
|
||||
b, err := session.EncodeGob(ls.values)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
c.Set([]byte(ls.sid), b)
|
||||
c.Expire([]byte(ls.sid), ls.maxlifetime)
|
||||
}
|
||||
|
||||
// Provider ledis session provider
|
||||
type Provider struct {
|
||||
maxlifetime int64
|
||||
SavePath string `json:"save_path"`
|
||||
Db int `json:"db"`
|
||||
}
|
||||
|
||||
// SessionInit init ledis session
|
||||
// savepath like ledis server saveDataPath,pool size
|
||||
// v1.x e.g. 127.0.0.1:6379,100
|
||||
// v2.x you should pass a json string
|
||||
// e.g. { "save_path": "my save path", "db": 100}
|
||||
func (lp *Provider) SessionInit(ctx context.Context, maxlifetime int64, cfgStr string) error {
|
||||
var err error
|
||||
lp.maxlifetime = maxlifetime
|
||||
cfgStr = strings.TrimSpace(cfgStr)
|
||||
// we think cfgStr is v2.0, using json to init the session
|
||||
if strings.HasPrefix(cfgStr, "{") {
|
||||
err = json.Unmarshal([]byte(cfgStr), lp)
|
||||
} else {
|
||||
err = lp.initOldStyle(cfgStr)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
cfg := new(config.Config)
|
||||
cfg.DataDir = lp.SavePath
|
||||
|
||||
var ledisInstance *ledis.Ledis
|
||||
ledisInstance, err = ledis.Open(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
c, err = ledisInstance.Select(lp.Db)
|
||||
return err
|
||||
}
|
||||
|
||||
func (lp *Provider) initOldStyle(cfgStr string) error {
|
||||
var err error
|
||||
configs := strings.Split(cfgStr, ",")
|
||||
if len(configs) == 1 {
|
||||
lp.SavePath = configs[0]
|
||||
} else if len(configs) == 2 {
|
||||
lp.SavePath = configs[0]
|
||||
lp.Db, err = strconv.Atoi(configs[1])
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// SessionRead read ledis session by sid
|
||||
func (lp *Provider) SessionRead(ctx context.Context, sid string) (session.Store, error) {
|
||||
var (
|
||||
kv map[interface{}]interface{}
|
||||
err error
|
||||
)
|
||||
|
||||
kvs, _ := c.Get([]byte(sid))
|
||||
|
||||
if len(kvs) == 0 {
|
||||
kv = make(map[interface{}]interface{})
|
||||
} else {
|
||||
if kv, err = session.DecodeGob(kvs); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime}
|
||||
return ls, nil
|
||||
}
|
||||
|
||||
// SessionExist check ledis session exist by sid
|
||||
func (lp *Provider) SessionExist(ctx context.Context, sid string) (bool, error) {
|
||||
count, _ := c.Exists([]byte(sid))
|
||||
return count != 0, nil
|
||||
}
|
||||
|
||||
// SessionRegenerate generate new sid for ledis session
|
||||
func (lp *Provider) SessionRegenerate(ctx context.Context, oldsid, sid string) (session.Store, error) {
|
||||
count, _ := c.Exists([]byte(sid))
|
||||
if count == 0 {
|
||||
// oldsid doesn't exists, set the new sid directly
|
||||
// ignore error here, since if it return error
|
||||
// the existed value will be 0
|
||||
c.Set([]byte(sid), []byte(""))
|
||||
c.Expire([]byte(sid), lp.maxlifetime)
|
||||
} else {
|
||||
data, _ := c.Get([]byte(oldsid))
|
||||
c.Set([]byte(sid), data)
|
||||
c.Expire([]byte(sid), lp.maxlifetime)
|
||||
}
|
||||
return lp.SessionRead(context.Background(), sid)
|
||||
}
|
||||
|
||||
// SessionDestroy delete ledis session by id
|
||||
func (lp *Provider) SessionDestroy(ctx context.Context, sid string) error {
|
||||
c.Del([]byte(sid))
|
||||
return nil
|
||||
}
|
||||
|
||||
// SessionGC Impelment method, no used.
|
||||
func (lp *Provider) SessionGC(context.Context) {
|
||||
}
|
||||
|
||||
// SessionAll return all active session
|
||||
func (lp *Provider) SessionAll(context.Context) int {
|
||||
return 0
|
||||
}
|
||||
func init() {
|
||||
session.Register("ledis", ledispder)
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
// Copyright 2020
|
||||
//
|
||||
// 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 ledis
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestProvider_SessionInit(t *testing.T) {
|
||||
// using old style
|
||||
savePath := `http://host:port/,100`
|
||||
cp := &Provider{}
|
||||
cp.SessionInit(context.Background(), 12, savePath)
|
||||
assert.Equal(t, "http://host:port/", cp.SavePath)
|
||||
assert.Equal(t, 100, cp.Db)
|
||||
assert.Equal(t, int64(12), cp.maxlifetime)
|
||||
|
||||
savePath = `
|
||||
{ "save_path": "my save path", "db": 100}
|
||||
`
|
||||
cp = &Provider{}
|
||||
cp.SessionInit(context.Background(), 12, savePath)
|
||||
assert.Equal(t, "my save path", cp.SavePath)
|
||||
assert.Equal(t, 100, cp.Db)
|
||||
assert.Equal(t, int64(12), cp.maxlifetime)
|
||||
}
|
||||
Reference in New Issue
Block a user