DarkGopher/session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add additional opts for session manager

Browse source
This commit is contained in:
DarkGopher 2025-06-12 13:20:18 +02:00
parent 99e26546d7
commit b751fc5eb4
2 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

49
session.go
View file

@ -79,30 +79,29 @@ func Register(name string, provide Provider) {
// Manager controls all sessions with registered storage provider // Manager controls all sessions with registered storage provider
type Manager struct { type Manager struct {
cookieName string provider Provider
provider Provider sessOpts *SessOpts
maxlifetime int64 addOpts any
secure bool
} }
// SessOpts set session options or NewManager // SessOpts set session options or NewManager
type SessOpts struct { type SessOpts struct {
ProviderName string CookieName string
CookieName string MaxLifetime int64
MaxLifetime int64 Ssl bool
Ssl bool
} }
// NewManager create new *Manager for provideName, cookieName and maxlifetime in seconds // NewManager create new *Manager using SesOpts and aditional any other opts
func NewManager(sopts SessOpts, adopts any) (*Manager, error) { func NewManager(providerName string, sopts *SessOpts, adopts any) (*Manager, error) {
var provider Provider var prv Provider
var ok bool var ok bool
if provider, ok = provides[sopts.ProviderName]; !ok { if prv, ok = provides[providerName]; !ok {
return nil, fmt.Errorf("session: Provider: %q not found (forgotten import?)", sopts.ProviderName) return nil, fmt.Errorf("session: Provider: %q not found (forgotten import?)", providerName)
} }
m := &Manager{ m := &Manager{
cookieName: sopts.CookieName, provider: provider, provider: prv,
maxlifetime: sopts.MaxLifetime, secure: sopts.Ssl, sessOpts: sopts,
addOpts: adopts,
} }
go m.GC() go m.GC()
return m, nil return m, nil
@ -121,7 +120,7 @@ func (manager *Manager) sessionID() (sid string, err error) {
func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (session Session, err error) { func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (session Session, err error) {
var cookie *http.Cookie var cookie *http.Cookie
var sid string var sid string
if cookie, err = r.Cookie(manager.cookieName); err != nil || cookie == nil { if cookie, err = r.Cookie(manager.sessOpts.CookieName); err != nil || cookie == nil {
if sid, err = manager.sessionID(); err != nil { if sid, err = manager.sessionID(); err != nil {
return nil, err return nil, err
} }
@ -129,9 +128,9 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se
return nil, fmt.Errorf("Session init failed: %w", err) return nil, fmt.Errorf("Session init failed: %w", err)
} }
cookie := http.Cookie{ cookie := http.Cookie{
Name: manager.cookieName, Value: url.QueryEscape(sid), Path: "/", Name: manager.sessOpts.CookieName, Value: url.QueryEscape(sid), Path: "/",
HttpOnly: true, MaxAge: int(manager.maxlifetime), HttpOnly: true, MaxAge: int(manager.sessOpts.MaxLifetime),
Secure: manager.secure, Secure: manager.sessOpts.Ssl,
} }
http.SetCookie(w, &cookie) http.SetCookie(w, &cookie)
} else { } else {
@ -148,14 +147,14 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se
// SessionDestroy end session and delete session data at the server // SessionDestroy end session and delete session data at the server
func (manager *Manager) SessionDestroy(w http.ResponseWriter, r *http.Request) (err error) { func (manager *Manager) SessionDestroy(w http.ResponseWriter, r *http.Request) (err error) {
var cookie *http.Cookie var cookie *http.Cookie
if cookie, err = r.Cookie(manager.cookieName); err != nil || cookie.Value == "" { if cookie, err = r.Cookie(manager.sessOpts.CookieName); err != nil || cookie.Value == "" {
return fmt.Errorf("Get cookie from request failed: %v", err) return fmt.Errorf("Get cookie from request failed: %v", err)
} }
manager.provider.Destroy(cookie.Value) manager.provider.Destroy(cookie.Value)
rmcookie := http.Cookie{ rmcookie := http.Cookie{
Name: manager.cookieName, Path: "/", HttpOnly: true, Name: manager.sessOpts.CookieName, Path: "/", HttpOnly: true,
Expires: time.Now(), MaxAge: -1, Secure: manager.secure, Expires: time.Now(), MaxAge: -1, Secure: manager.sessOpts.Ssl,
} }
http.SetCookie(w, &rmcookie) http.SetCookie(w, &rmcookie)
return nil return nil
@ -168,7 +167,7 @@ func (manager *Manager) Exists(sid string) bool {
// RegenerateID vhange sid and preserve all session data // RegenerateID vhange sid and preserve all session data
func (manager *Manager) RegenerateID(w http.ResponseWriter, r *http.Request) { func (manager *Manager) RegenerateID(w http.ResponseWriter, r *http.Request) {
if ck, err := r.Cookie(manager.cookieName); err == nil && ck.Value != "" { if ck, err := r.Cookie(manager.sessOpts.CookieName); err == nil && ck.Value != "" {
if newid, err := manager.sessionID(); err != nil { if newid, err := manager.sessionID(); err != nil {
manager.provider.RegenerateID(ck.Value, newid) manager.provider.RegenerateID(ck.Value, newid)
} }
@ -177,7 +176,7 @@ func (manager *Manager) RegenerateID(w http.ResponseWriter, r *http.Request) {
// GC remove sessions which exceeded manager.maxLifetime // GC remove sessions which exceeded manager.maxLifetime
func (manager *Manager) GC() { func (manager *Manager) GC() {
manager.provider.GC(manager.maxlifetime) manager.provider.GC(manager.sessOpts.MaxLifetime)
msec := milis * manager.maxlifetime msec := milis * manager.sessOpts.MaxLifetime
time.AfterFunc(time.Duration(msec), func() { manager.GC() }) time.AfterFunc(time.Duration(msec), func() { manager.GC() })
} }

6
tests/t_test.go
View file

@ -287,12 +287,12 @@ func TestRunAll(t *testing.T) {
var err error var err error
jar, _ := cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List}) jar, _ := cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List})
testclient.Jar = jar testclient.Jar = jar
sessopts := session.SessOpts{ sessopts := &session.SessOpts{
ProviderName: "memory", CookieName: sid, CookieName: sid,
MaxLifetime: 180, Ssl: true, MaxLifetime: 180, Ssl: true,
} }
if sm, err = session.NewManager(sessopts, nil); err != nil { if sm, err = session.NewManager(pn, sessopts, nil); err != nil {
t.Errorf("Session provider %s failed initialize err: %v", pn, err) t.Errorf("Session provider %s failed initialize err: %v", pn, err)
} }
fns := []func(t *testing.T){t1, t2, t3, t4, t5, t6, t7, t8, t9} fns := []func(t *testing.T){t1, t2, t3, t4, t5, t6, t7, t8, t9}