Merge pull request #201 from mem/master

Make sure the session expiration information is present in the cookie

session.go

@@ -55,6 +55,8 @@ func getSessionExpiration() time.Time {
 // Returns an http.Cookie containing the signed session.
 func (s Session) cookie() *http.Cookie {
 	var sessionValue string
+	ts := getSessionExpiration()
+	s[TS_KEY] = getSessionExpirationCookie(ts)
 	for key, value := range s {
 		if strings.ContainsAny(key, ":\x00") {
 			panic("Session keys may not have colons or null bytes")
@@ -70,7 +72,7 @@ func (s Session) cookie() *http.Cookie {
 		Name:    CookiePrefix + "_SESSION",
 		Value:   Sign(sessionData) + "-" + sessionData,
 		Path:    "/",
-		Expires: getSessionExpiration().UTC(),
+		Expires: ts.UTC(),
 	}
 }
 
@@ -105,9 +107,8 @@ func getSessionFromCookie(cookie *http.Cookie) Session {
 	})
 
 	if sessionTimeoutExpiredOrMissing(session) {
-		session = make(map[string]string)
+		session = make(Session)
 	}
-	session[TS_KEY] = strconv.FormatInt(getSessionExpiration().Unix(), 10)
 
 	return session
 }
@@ -122,12 +123,15 @@ func SessionFilter(c *Controller, fc []Filter) {
 }
 
 func restoreSession(req *http.Request) Session {
-	session := make(map[string]string)
+	session := make(Session)
 	cookie, err := req.Cookie(CookiePrefix + "_SESSION")
 	if err != nil {
-		session[TS_KEY] = strconv.FormatInt(getSessionExpiration().Unix(), 10)
-		return Session(session)
+		return session
 	}
 
 	return getSessionFromCookie(cookie)
 }
+
+func getSessionExpirationCookie(t time.Time) string {
+	return strconv.FormatInt(t.Unix(), 10)
+}