wpetit
/
goweb
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Use store to define session default options

This commit is contained in:
wpetit 2019-05-13 09:09:28 +02:00
parent 7c00e0c8bf
commit 35c763a6c6
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
session/gorilla/cookie.go
View File

@ -9,16 +9,17 @@ import (
// CreateCookieSessionStore creates and returns a new cookie session store // CreateCookieSessionStore creates and returns a new cookie session store
// with random authentication and encryption keys // with random authentication and encryption keys
func CreateCookieSessionStore(authKeySize, encryptKeySize int) (sessions.Store, error) { func CreateCookieSessionStore(authKeySize, encryptKeySize int, defaultOptions *sessions.Options) (sessions.Store, error) {
authenticationKey, err := generateRandomBytes(64) authenticationKey, err := generateRandomBytes(authKeySize)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error while generating cookie authentication key") return nil, errors.Wrap(err, "error while generating cookie authentication key")
} }
encryptionKey, err := generateRandomBytes(32) encryptionKey, err := generateRandomBytes(encryptKeySize)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error while generating cookie encryption key") return nil, errors.Wrap(err, "error while generating cookie encryption key")
} }
store := sessions.NewCookieStore(authenticationKey, encryptionKey) store := sessions.NewCookieStore(authenticationKey, encryptionKey)
store.Options = defaultOptions
return store, nil return store, nil
} }

5
session/gorilla/provider.go
View File

@ -7,9 +7,8 @@ import (
// ServiceProvider returns a service.Provider for the // ServiceProvider returns a service.Provider for the
// the gorilla session service implementation // the gorilla session service implementation
func ServiceProvider(sessionName string, store sessions.Store, defaultOptions *sessions.Options) service.Provider { func ServiceProvider(sessionName string, store sessions.Store) service.Provider {
sessionService := NewSessionService(sessionName, store, defaultOptions) sessionService := NewSessionService(sessionName, store)
return func(container *service.Container) (interface{}, error) { return func(container *service.Container) (interface{}, error) {
return sessionService, nil return sessionService, nil
} }

15
session/gorilla/service.go
View File

@ -15,7 +15,6 @@ import (
type SessionService struct { type SessionService struct {
sessionName string sessionName string
store sessions.Store store sessions.Store
defaultOptions *sessions.Options
} }
// Get returns a Session associated with the given HTTP request // Get returns a Session associated with the given HTTP request
@ -27,26 +26,14 @@ func (s *SessionService) Get(w http.ResponseWriter, r *http.Request) (session.Se
return nil, errors.Wrap(err, "error while retrieving the session from the request") return nil, errors.Wrap(err, "error while retrieving the session from the request")
} }
} }
if err != nil {
defaultOptions := s.defaultOptionsCopy()
sess.Options = &defaultOptions
if err := sess.Save(r, w); err != nil {
return nil, errors.Wrap(err, "error while saving session")
}
}
return NewSession(sess), nil return NewSession(sess), nil
} }
func (s *SessionService) defaultOptionsCopy() sessions.Options {
return *s.defaultOptions
}
// NewSessionService returns a new SessionService backed // NewSessionService returns a new SessionService backed
// by the given Store // by the given Store
func NewSessionService(sessionName string, store sessions.Store, defaultOptions *sessions.Options) *SessionService { func NewSessionService(sessionName string, store sessions.Store) *SessionService {
return &SessionService{ return &SessionService{
sessionName: sessionName, sessionName: sessionName,
store: store, store: store,
defaultOptions: defaultOptions,
} }
} }