handle zero-expiry session cookies in filters and display

Author: srlehn

cmd/kooky/kooky.go

@@ -100,7 +100,7 @@ func prCookieLine(w io.Writer, cookie *kooky.Cookie, trimLen int) {
 		trimStr(cookie.Name, trimLen),
 		// be careful about raw bytes
 		trimStr(strings.Trim(fmt.Sprintf(`%q`, cookie.Value), `"`), trimLen),
-		cookie.Expires.Format(`2006.01.02 15:04:05`),
+		prExpires(cookie),
 	)
 }
 
@@ -118,6 +118,13 @@ func prProfile(c *kooky.Cookie) string {
 	return c.Browser.Profile()
 }
 
+func prExpires(c *kooky.Cookie) string {
+	if c == nil || c.Expires.IsZero() {
+		return `-`
+	}
+	return c.Expires.Format(`2006.01.02 15:04:05`)
+}
+
 func prFilePath(c *kooky.Cookie) string {
 	if c == nil || c.Browser == nil {
 		return ``

filter.go

@@ -325,11 +325,11 @@ var HTTPOnly Filter = FilterFunc(func(cookie *Cookie) bool {
 // expires filters
 
 var Valid Filter = ValueFilterFunc(func(cookie *Cookie) bool {
-	return cookie != nil && cookie.Expires.After(time.Now()) && cookie.Cookie.Valid() == nil
+	return cookie != nil && (cookie.Expires.IsZero() || cookie.Expires.After(time.Now())) && cookie.Cookie.Valid() == nil
 })
 
 var Expired Filter = FilterFunc(func(cookie *Cookie) bool {
-	return cookie != nil && cookie.Expires.Before(time.Now())
+	return cookie != nil && !cookie.Expires.IsZero() && cookie.Expires.Before(time.Now())
 })
 
 func ExpiresAfter(u time.Time) Filter {