seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add better logs for decode errors

Browse source
This commit is contained in:
Tulir Asokan 2023-07-31 19:44:13 +03:00
parent 8a8410cd89
commit 8b8ac305bb
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libgm/event_handler.go
View file

@ -47,13 +47,19 @@ func (c *Client) decryptInternalMessage(data *gmproto.IncomingRPCMessage) (*Inco
msg.Pair = &gmproto.RPCPairData{} msg.Pair = &gmproto.RPCPairData{}
err := proto.Unmarshal(data.GetMessageData(), msg.Pair) err := proto.Unmarshal(data.GetMessageData(), msg.Pair)
if err != nil { if err != nil {
return nil, err c.Logger.Trace().
Str("data", base64.StdEncoding.EncodeToString(msg.GetMessageData())).
Msg("Errored pair event content")
return nil, fmt.Errorf("failed to decode pair event: %w", err)
} }
case gmproto.BugleRoute_DataEvent: case gmproto.BugleRoute_DataEvent:
msg.Message = &gmproto.RPCMessageData{} msg.Message = &gmproto.RPCMessageData{}
err := proto.Unmarshal(data.GetMessageData(), msg.Message) err := proto.Unmarshal(data.GetMessageData(), msg.Message)
if err != nil { if err != nil {
return nil, err c.Logger.Trace().
Str("data", base64.StdEncoding.EncodeToString(msg.GetMessageData())).
Msg("Errored data event content")
return nil, fmt.Errorf("failed to decode data event: %w", err)
} }
responseStruct, ok := responseType[msg.Message.GetAction()] responseStruct, ok := responseType[msg.Message.GetAction()]
if ok { if ok {
@ -62,12 +68,15 @@ func (c *Client) decryptInternalMessage(data *gmproto.IncomingRPCMessage) (*Inco
if msg.Message.EncryptedData != nil { if msg.Message.EncryptedData != nil {
msg.DecryptedData, err = c.AuthData.RequestCrypto.Decrypt(msg.Message.EncryptedData) msg.DecryptedData, err = c.AuthData.RequestCrypto.Decrypt(msg.Message.EncryptedData)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to decrypt data event: %w", err)
} }
if msg.DecryptedMessage != nil { if msg.DecryptedMessage != nil {
err = proto.Unmarshal(msg.DecryptedData, msg.DecryptedMessage) err = proto.Unmarshal(msg.DecryptedData, msg.DecryptedMessage)
if err != nil { if err != nil {
return nil, err c.Logger.Trace().
Str("data", base64.StdEncoding.EncodeToString(msg.DecryptedData)).
Msg("Errored decrypted data event content")
return nil, fmt.Errorf("failed to decode decrypted data event: %w", err)
} }
} }
} }