From b884a81bbae3eae9c475bb0f77429b6e9738e697 Mon Sep 17 00:00:00 2001 From: Noah Petherbridge Date: Wed, 28 May 2025 22:09:10 -0700 Subject: [PATCH] Fix null pointer exception on SendPing for non-JWT users --- pkg/ping.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/ping.go b/pkg/ping.go index 35a87ce..c45c84e 100644 --- a/pkg/ping.go +++ b/pkg/ping.go @@ -8,18 +8,22 @@ import ( // SendPing delivers the Ping message to connected subscribers. func (sub *Subscriber) SendPing() { // Send a ping, and a refreshed JWT token if the user sent one. - var token string + var ( + token string + rules map[string]bool + ) if sub.JWTClaims != nil { if jwt, err := sub.JWTClaims.ReSign(); err != nil { log.Error("ReSign JWT token for %s#%d: %s", sub.Username, sub.ID, err) } else { token = jwt + rules = sub.JWTClaims.Rules.ToDict() } } sub.SendJSON(messages.Message{ Action: messages.ActionPing, JWTToken: token, - JWTRules: sub.JWTClaims.Rules.ToDict(), + JWTRules: rules, }) }