Fix null pointer exception on SendPing for non-JWT users
This commit is contained in:
parent
dd951ba69d
commit
b884a81bba
|
@ -8,18 +8,22 @@ import (
|
||||||
// SendPing delivers the Ping message to connected subscribers.
|
// SendPing delivers the Ping message to connected subscribers.
|
||||||
func (sub *Subscriber) SendPing() {
|
func (sub *Subscriber) SendPing() {
|
||||||
// Send a ping, and a refreshed JWT token if the user sent one.
|
// 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 sub.JWTClaims != nil {
|
||||||
if jwt, err := sub.JWTClaims.ReSign(); err != nil {
|
if jwt, err := sub.JWTClaims.ReSign(); err != nil {
|
||||||
log.Error("ReSign JWT token for %s#%d: %s", sub.Username, sub.ID, err)
|
log.Error("ReSign JWT token for %s#%d: %s", sub.Username, sub.ID, err)
|
||||||
} else {
|
} else {
|
||||||
token = jwt
|
token = jwt
|
||||||
|
rules = sub.JWTClaims.Rules.ToDict()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sub.SendJSON(messages.Message{
|
sub.SendJSON(messages.Message{
|
||||||
Action: messages.ActionPing,
|
Action: messages.ActionPing,
|
||||||
JWTToken: token,
|
JWTToken: token,
|
||||||
JWTRules: sub.JWTClaims.Rules.ToDict(),
|
JWTRules: rules,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user