diff --git a/channels/eventModel.go b/channels/eventModel.go
index 26db7539a4b8b5635b7dbfdb39b1714fa180199d..d9413357729861ed889d0665f81546a2567fecda 100644
--- a/channels/eventModel.go
+++ b/channels/eventModel.go
@@ -8,6 +8,7 @@
package channels
import (
+ "crypto/ed25519"
"errors"
"fmt"
"github.com/golang/protobuf/proto"
@@ -35,6 +36,8 @@ const (
Failed
)
+var AdminFakePubkey = ed25519.PublicKey{}
+
// EventModel is an interface which an external party which uses the channels
// system passed an object which adheres to in order to get events on the
// channel.
@@ -62,7 +65,7 @@ type EventModel interface {
// Message type is included in the call, it will always be Text (1)
// for this call, but it may be required in downstream databases
ReceiveMessage(channelID *id.ID, messageID cryptoChannel.MessageID,
- nickname, text string, identity cryptoChannel.Identity,
+ nickname, text string, pubkey ed25519.PublicKey, codeset uint8,
timestamp time.Time, lease time.Duration, round rounds.Round,
mType MessageType, status SentStatus) uint64
@@ -87,7 +90,7 @@ type EventModel interface {
// this call, but it may be required in downstream databases
ReceiveReply(channelID *id.ID, messageID cryptoChannel.MessageID,
reactionTo cryptoChannel.MessageID, nickname, text string,
- identity cryptoChannel.Identity, timestamp time.Time,
+ pubkey ed25519.PublicKey, codeset uint8, timestamp time.Time,
lease time.Duration, round rounds.Round, mType MessageType,
status SentStatus) uint64
@@ -114,7 +117,7 @@ type EventModel interface {
// this call, but it may be required in downstream databases
ReceiveReaction(channelID *id.ID, messageID cryptoChannel.MessageID,
reactionTo cryptoChannel.MessageID, nickname, reaction string,
- identity cryptoChannel.Identity, timestamp time.Time,
+ ipubkey ed25519.PublicKey, codeset uint8, timestamp time.Time,
lease time.Duration, round rounds.Round, mType MessageType,
status SentStatus) uint64
@@ -142,7 +145,7 @@ type EventModel interface {
// later
type MessageTypeReceiveMessage func(channelID *id.ID,
messageID cryptoChannel.MessageID, messageType MessageType,
- nickname string, content []byte, identity cryptoChannel.Identity,
+ nickname string, content []byte, pubkey ed25519.PublicKey, codeset uint8,
timestamp time.Time, lease time.Duration, round rounds.Round,
status SentStatus) uint64
@@ -212,24 +215,23 @@ func (e *events) triggerEvent(chID *id.ID, umi *userMessageInternal, ts time.Tim
cm := umi.GetChannelMessage()
messageType := MessageType(cm.PayloadType)
- identity := cryptoChannel.ConstructIdentity(um.ECCPublicKey)
-
// Check if the type is already registered
e.mux.RLock()
listener, exists := e.registered[messageType]
e.mux.RUnlock()
if !exists {
- errStr := fmt.Sprintf("Received message from %s on channel %s in "+
+ errStr := fmt.Sprintf("Received message from %x on channel %s in "+
"round %d which could not be handled due to unregistered message "+
- "type %s; Contents: %v", identity.Codename, chID, round.ID, messageType,
+ "type %s; Contents: %v", um.ECCPublicKey, chID, round.ID, messageType,
cm.Payload)
jww.WARN.Printf(errStr)
return 0, errors.New(errStr)
}
// Call the listener. This is already in an instanced event, no new thread needed.
- uuid := listener(chID, umi.GetMessageID(), messageType, cm.Nickname, cm.Payload, identity,
- ts, time.Duration(cm.Lease), round, status)
+ uuid := listener(chID, umi.GetMessageID(), messageType, cm.Nickname, cm.Payload,
+ um.ECCPublicKey, 0, ts, time.Duration(cm.Lease),
+ round, status)
return uuid, nil
}
@@ -262,7 +264,7 @@ func (e *events) triggerAdminEvent(chID *id.ID, cm *ChannelMessage,
// Call the listener. This is already in an instanced event, no new thread needed.
uuid := listener(chID, messageID, messageType, AdminUsername, cm.Payload,
- cryptoChannel.Identity{Codename: AdminUsername}, ts,
+ AdminFakePubkey, 0, ts,
time.Duration(cm.Lease), round, status)
return uuid, nil
}
@@ -275,15 +277,15 @@ func (e *events) triggerAdminEvent(chID *id.ID, cm *ChannelMessage,
// write to the log.
func (e *events) receiveTextMessage(channelID *id.ID,
messageID cryptoChannel.MessageID, messageType MessageType,
- nickname string, content []byte, identity cryptoChannel.Identity,
+ nickname string, content []byte, pubkey ed25519.PublicKey, codeset uint8,
timestamp time.Time, lease time.Duration, round rounds.Round,
status SentStatus) uint64 {
txt := &CMIXChannelText{}
if err := proto.Unmarshal(content, txt); err != nil {
- jww.ERROR.Printf("Failed to text unmarshal message %s from %s on "+
+ jww.ERROR.Printf("Failed to text unmarshal message %s from %x on "+
"channel %s, type %s, ts: %s, lease: %s, round: %d: %+v",
- messageID, identity.Codename, channelID, messageType, timestamp, lease,
+ messageID, pubkey, channelID, messageType, timestamp, lease,
round.ID, err)
return 0
}
@@ -294,20 +296,20 @@ func (e *events) receiveTextMessage(channelID *id.ID,
var replyTo cryptoChannel.MessageID
copy(replyTo[:], txt.ReplyMessageID)
return e.model.ReceiveReply(channelID, messageID, replyTo,
- nickname, txt.Text, identity, timestamp, lease, round, Text, status)
+ nickname, txt.Text, pubkey, codeset, timestamp, lease, round, Text, status)
} else {
jww.ERROR.Printf("Failed process reply to for message %s from %s on "+
"channel %s, type %s, ts: %s, lease: %s, round: %d, returning "+
"without reply",
- messageID, identity.Codename, channelID, messageType, timestamp, lease,
+ messageID, pubkey, codeset, channelID, messageType, timestamp, lease,
round.ID)
// Still process the message, but drop the reply because it is
// malformed
}
}
- return e.model.ReceiveMessage(channelID, messageID, nickname, txt.Text, identity,
+ return e.model.ReceiveMessage(channelID, messageID, nickname, txt.Text, pubkey, codeset,
timestamp, lease, round, Text, status)
}
@@ -320,24 +322,24 @@ func (e *events) receiveTextMessage(channelID *id.ID,
// reaction is dropped.
func (e *events) receiveReaction(channelID *id.ID,
messageID cryptoChannel.MessageID, messageType MessageType,
- nickname string, content []byte, identity cryptoChannel.Identity,
+ nickname string, content []byte, pubkey ed25519.PublicKey, codeset uint8,
timestamp time.Time, lease time.Duration, round rounds.Round,
status SentStatus) uint64 {
react := &CMIXChannelReaction{}
if err := proto.Unmarshal(content, react); err != nil {
- jww.ERROR.Printf("Failed to text unmarshal message %s from %s on "+
+ jww.ERROR.Printf("Failed to text unmarshal message %s from %x on "+
"channel %s, type %s, ts: %s, lease: %s, round: %d: %+v",
- messageID, identity.Codename, channelID, messageType, timestamp, lease,
+ messageID, pubkey, channelID, messageType, timestamp, lease,
round.ID, err)
return 0
}
// check that the reaction is a single emoji and ignore if it isn't
if err := ValidateReaction(react.Reaction); err != nil {
- jww.ERROR.Printf("Failed process reaction %s from %s on channel "+
+ jww.ERROR.Printf("Failed process reaction %s from %x on channel "+
"%s, type %s, ts: %s, lease: %s, round: %d, due to malformed "+
"reaction (%s), ignoring reaction",
- messageID, identity.Codename, channelID, messageType, timestamp, lease,
+ messageID, pubkey, channelID, messageType, timestamp, lease,
round.ID, err)
return 0
}
@@ -346,12 +348,12 @@ func (e *events) receiveReaction(channelID *id.ID,
var reactTo cryptoChannel.MessageID
copy(reactTo[:], react.ReactionMessageID)
return e.model.ReceiveReaction(channelID, messageID, reactTo, nickname,
- react.Reaction, identity, timestamp, lease, round, Reaction, status)
+ react.Reaction, pubkey, codeset, timestamp, lease, round, Reaction, status)
} else {
jww.ERROR.Printf("Failed process reaction %s from %s on channel "+
"%s, type %s, ts: %s, lease: %s, round: %d, reacting to "+
"invalid message, ignoring reaction",
- messageID, identity.Codename, channelID, messageType, timestamp, lease,
+ messageID, pubkey, codeset, channelID, messageType, timestamp, lease,
round.ID)
}
return 0