@@ -27,14 +27,8 @@ var _ sessions.SessionStore = &SessionStore{}
2727// SessionStore is an implementation of the sessions.SessionStore
2828// interface that stores sessions in client side cookies
2929type SessionStore struct {
30− CookieCipher *cookie.Cipher
31− CookieDomain string
32− CookieExpire time.Duration
33− CookieHTTPOnly bool
34− CookieName string
35− CookiePath string
36− CookieSecret string
37− CookieSecure bool
30+ CookieOptions *options.CookieOptions
31+ CookieCipher *cookie.Cipher
3832}
3933
4034// Save takes a sessions.SessionState and stores the information from it
@@ -54,12 +48,12 @@ func (s *SessionStore) Save(rw http.ResponseWriter, req *http.Request, ss *sessi
5448// Load reads sessions.SessionState information from Cookies within the
5549// HTTP request object
5650func (s *SessionStore) Load(req *http.Request) (*sessions.SessionState, error) {
57− c, err := loadCookie(req, s.CookieName)
51+ c, err := loadCookie(req, s.CookieOptions.CookieName)
5852 if err != nil {
5953 // always http.ErrNoCookie
60− return nil, fmt.Errorf("Cookie %q not present", s.CookieName)
54+ return nil, fmt.Errorf("Cookie %q not present", s.CookieOptions.CookieName)
6155 }
62− val, _, ok := cookie.Validate(c, s.CookieSecret, s.CookieExpire)
56+ val, _, ok := cookie.Validate(c, s.CookieOptions.CookieSecret, s.CookieOptions.CookieExpire)
6357 if !ok {
6458 return nil, errors.New("Cookie Signature not valid")
6559 }
@@ -77,7 +71,7 @@ func (s *SessionStore) Clear(rw http.ResponseWriter, req *http.Request) error {
7771 var cookies []*http.Cookie
7872
7973 // matches CookieName, CookieName_<number>
80− var cookieNameRegex = regexp.MustCompile(fmt.Sprintf("^%s(_\\d+)?$", s.CookieName))
74+ var cookieNameRegex = regexp.MustCompile(fmt.Sprintf("^%s(_\\d+)?$", s.CookieOptions.CookieName))
8175
8276 for _, c := range req.Cookies() {
8377 if cookieNameRegex.MatchString(c.Name) {
@@ -93,33 +87,30 @@ func (s *SessionStore) Clear(rw http.ResponseWriter, req *http.Request) error {
9387
9488// setSessionCookie adds the user's session cookie to the response
9589func (s *SessionStore) setSessionCookie(rw http.ResponseWriter, req *http.Request, val string, created time.Time) {
96− for _, c := range s.makeSessionCookie(req, val, s.CookieExpire, created) {
90+ for _, c := range s.makeSessionCookie(req, val, created) {
9791 http.SetCookie(rw, c)
9892 }
9993}
10094
10195// makeSessionCookie creates an http.Cookie containing the authenticated user's
10296// authentication details
103−func (s *SessionStore) makeSessionCookie(req *http.Request, value string, expiration time.Duration, now time.Time) []*http.Cookie {
97+func (s *SessionStore) makeSessionCookie(req *http.Request, value string, now time.Time) []*http.Cookie {
10498 if value != "" {
105− value = cookie.SignedValue(s.CookieSecret, s.CookieName, value, now)
99+ value = cookie.SignedValue(s.CookieOptions.CookieSecret, s.CookieOptions.CookieName, value, now)
106100 }
107− c := s.makeCookie(req, s.CookieName, value, expiration, now)
108− if len(c.Value) > 4096-len(s.CookieName) {
101+ c := s.makeCookie(req, s.CookieOptions.CookieName, value, s.CookieOptions.CookieExpire, now)
102+ if len(c.Value) > 4096-len(s.CookieOptions.CookieName) {
109103 return splitCookie(c)
110104 }
111105 return []*http.Cookie{c}
112106}
113107
114108func (s *SessionStore) makeCookie(req *http.Request, name string, value string, expiration time.Duration, now time.Time) *http.Cookie {
115− return cookies.MakeCookie(
109+ return cookies.MakeCookieFromOptions(
116110 req,
117111 name,
118112 value,
119− s.CookiePath,
120− s.CookieDomain,
121− s.CookieHTTPOnly,
122− s.CookieSecure,
113+ s.CookieOptions,
123114 expiration,
124115 now,
125116 )
@@ -138,14 +129,8 @@ func NewCookieSessionStore(opts options.CookieStoreOptions, cookieOpts *options.
138129 }
139130
140131 return &SessionStore{
141− CookieCipher: cipher,
142− CookieDomain: cookieOpts.CookieDomain,
143− CookieExpire: cookieOpts.CookieExpire,
144− CookieHTTPOnly: cookieOpts.CookieHTTPOnly,
145− CookieName: cookieOpts.CookieName,
146− CookiePath: cookieOpts.CookiePath,
147− CookieSecret: cookieOpts.CookieSecret,
148− CookieSecure: cookieOpts.CookieSecure,
132+ CookieCipher: cipher,
133+ CookieOptions: cookieOpts,
149134 }, nil
150135}
151136