mirror of
https://github.com/nbd-wtf/go-nostr.git
synced 2025-07-03 03:55:51 +02:00
nip46: better error messages on decrypt failure.
This commit is contained in:
@ -23,15 +23,16 @@ type RelayReadWrite struct {
|
|||||||
func (s Session) ParseRequest(event *nostr.Event) (Request, error) {
|
func (s Session) ParseRequest(event *nostr.Event) (Request, error) {
|
||||||
var req Request
|
var req Request
|
||||||
|
|
||||||
plain, err := nip44.Decrypt(event.Content, s.ConversationKey)
|
plain, err1 := nip44.Decrypt(event.Content, s.ConversationKey)
|
||||||
if err != nil {
|
if err1 != nil {
|
||||||
plain, err = nip04.Decrypt(event.Content, s.SharedKey)
|
var err2 error
|
||||||
if err != nil {
|
plain, err2 = nip04.Decrypt(event.Content, s.SharedKey)
|
||||||
return req, fmt.Errorf("failed to decrypt event from %s: %w", event.PubKey, err)
|
if err2 != nil {
|
||||||
|
return req, fmt.Errorf("failed to decrypt event from %s: (nip44: %w, nip04: %w)", event.PubKey, err1, err2)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = json.Unmarshal([]byte(plain), &req)
|
err := json.Unmarshal([]byte(plain), &req)
|
||||||
return req, err
|
return req, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user