diff --git a/examples/pingpong.nim b/examples/pingpong.nim index 75c8cf9..7dd497a 100644 --- a/examples/pingpong.nim +++ b/examples/pingpong.nim @@ -31,7 +31,10 @@ proc main() {.async.} = let sIdent = Identity(name: "saro", privateKey: sKey) # Create Clients + info "create saro client" var saro = newClient(cfg_saro, sIdent) + + info "create raya client" var raya = newClient(cfg_raya, Identity(name: "raya", privateKey: rKey)) var ri = 0 diff --git a/src/chat_sdk/conversations/private_v1.nim b/src/chat_sdk/conversations/private_v1.nim index 543704e..ec2e3de 100644 --- a/src/chat_sdk/conversations/private_v1.nim +++ b/src/chat_sdk/conversations/private_v1.nim @@ -72,8 +72,16 @@ proc calcMsgId(self: PrivateV1, msgBytes: seq[byte]): string = proc encrypt*(convo: PrivateV1, plaintext: var seq[byte]): EncryptedPayload = + info "encrypt metadata" + info "Doubleratchet DH Self: ", dhSelf = convo.doubleratchet.dhSelf + info "dh self public:" , dhSelfPub = convo.doubleratchet.dhSelf.public + info "dhRemote: ", dhRemote = convo.doubleratchet.dhRemote + let (header, ciphertext) = convo.doubleratchet.encrypt(plaintext) #TODO: Associated Data + info "encrypt done" + info "header dh public: ", dhPub = header.dhPublic + result = EncryptedPayload(doubleratchet: proto_types.DoubleRatchet( dh: toSeq(header.dhPublic), msgNum: header.msgNumber, @@ -93,6 +101,16 @@ proc decrypt*(convo: PrivateV1, enc: EncryptedPayload): Result[seq[byte], ChatEr prevChainLen: dr.prevChainLen ) copyMem(addr header.dhPublic[0], unsafeAddr dr.dh[0], dr.dh.len) # TODO: Avoid this copy + + info "decrypt metadata" + info "header dh public: ", dhPub = header.dhPublic + info "Doubleratchet DH Remote: ", dhRemote = convo.doubleratchet.dhRemote + info "dh self:", dhSelf = convo.doubleratchet.dhSelf + info "dh self public:" , dhSelfPub = convo.doubleratchet.dhSelf.public + + if convo.doubleratchet.dhSelf.public == header.dhPublic: + info "outgoing message, no need to decrypt" + return err(ChatError(code: errDecryptOutgoing, context: "Attempted to decrypt outgoing message")) convo.doubleratchet.decrypt(header, dr.ciphertext, @[]).mapErr(proc(e: NaxolotlError): ChatError = ChatError(code: errWrapped, context: repr(e) )) @@ -127,7 +145,7 @@ proc wireCallbacks(convo: PrivateV1, deliveryAckCb: proc( proc initPrivateV1*(owner: Identity, participant: PublicKey, seedKey: array[32, byte], - discriminator: string = "default", isSender: bool, deliveryAckCb: proc( + discriminator: string = "default", inviter: bool, deliveryAckCb: proc( conversation: Conversation, msgId: string): Future[void] {.async.} = nil): PrivateV1 = @@ -143,7 +161,7 @@ proc initPrivateV1*(owner: Identity, participant: PublicKey, seedKey: array[32, topic: derive_topic(participants, discriminator), participant: participant, discriminator: discriminator, - doubleratchet: initDoubleratchet(seedKey, owner.privateKey.bytes, participant.bytes, isSender) + doubleratchet: initDoubleratchet(seedKey, owner.privateKey.bytes, participant.bytes, inviter) ) result.wireCallbacks(deliveryAckCb) diff --git a/src/chat_sdk/crypto.nim b/src/chat_sdk/crypto.nim index 44e5aa3..d93a9d2 100644 --- a/src/chat_sdk/crypto.nim +++ b/src/chat_sdk/crypto.nim @@ -12,13 +12,13 @@ export PublicKey, PrivateKey, bytes, createRandomKey, loadPrivateKeyFromBytes, l proc encrypt_plain*[T: EncryptableTypes](frame: T): EncryptedPayload = return EncryptedPayload( - plaintext: Plaintext(payload: encode(frame)), + plaintext: Plaintext(payload: proto_types.encode(frame)), ) proc decrypt_plain*[T: EncryptableTypes](ciphertext: Plaintext, t: typedesc[ T]): Result[T, string] = - let obj = decode(ciphertext.payload, T) + let obj = proto_types.decode(ciphertext.payload, T) if obj.isErr: return err("Protobuf decode failed: " & obj.error) result = ok(obj.get()) diff --git a/src/chat_sdk/errors.nim b/src/chat_sdk/errors.nim index e7b8008..a838439 100644 --- a/src/chat_sdk/errors.nim +++ b/src/chat_sdk/errors.nim @@ -8,6 +8,7 @@ type ErrorCode* = enum errTypeError errWrapped + errDecryptOutgoing proc `$`*(x: ChatError): string = diff --git a/src/chat_sdk/inbox.nim b/src/chat_sdk/inbox.nim index 6ddff39..01d6846 100644 --- a/src/chat_sdk/inbox.nim +++ b/src/chat_sdk/inbox.nim @@ -14,6 +14,8 @@ import types, utils +import ../content_types + logScope: topics = "chat inbox" @@ -42,7 +44,7 @@ proc decrypt*(inbox: Inbox, encbytes: EncryptedPayload): Result[InboxV1Frame, st result = res_frame proc wrap_env*(payload: EncryptedPayload, convo_id: string): WapEnvelopeV1 = - let bytes = encode(payload) + let bytes = proto_types.encode(payload) let salt = generateSalt() return WapEnvelopeV1( @@ -87,12 +89,16 @@ proc createPrivateV1FromInvite*[T: ConversationStore](client: T, topic = convo.getConvoId() client.addConversation(convo) + # TODO send a control frame instead + discard convo.sendMessage(client.ds, initTextFrame("Hello").toContentFrame()) + + proc handleFrame*[T: ConversationStore](convo: Inbox, client: T, bytes: seq[ byte]) = ## Dispatcher for Incoming `InboxV1Frames`. ## Calls further processing depending on the kind of frame. - let enc = decode(bytes, EncryptedPayload).valueOr: + let enc = proto_types.decode(bytes, EncryptedPayload).valueOr: raise newException(ValueError, "Failed to decode payload") let frame = convo.decrypt(enc).valueOr: diff --git a/src/content_types/all.nim b/src/content_types/all.nim index 0772639..0a0dc28 100644 --- a/src/content_types/all.nim +++ b/src/content_types/all.nim @@ -55,7 +55,6 @@ proc toContentFrame*(frame: TextFrame): ContentFrame = proc initTextFrame*(text: string): TextFrame = result = TextFrame(encoding: ord(Utf8), text: text) - proc `$`*(frame: TextFrame): string = result = fmt"TextFrame(encoding:{TextEncoding(frame.encoding)} text:{frame.text})" diff --git a/src/naxolotl/naxolotl.nim b/src/naxolotl/naxolotl.nim index 553282c..fd460c2 100644 --- a/src/naxolotl/naxolotl.nim +++ b/src/naxolotl/naxolotl.nim @@ -16,8 +16,8 @@ const maxSkip = 10 type Doubleratchet* = object - dhSelf: PrivateKey - dhRemote: PublicKey + dhSelf*: PrivateKey + dhRemote*: PublicKey rootKey: RootKey chainKeySend: ChainKey @@ -73,8 +73,11 @@ func kdfChain(self: Doubleratchet, chainKey: ChainKey): (MessageKey, ChainKey) = return(msgKey, chainKey) -func dhRatchetSend(self: var Doubleratchet) = +proc dhRatchetSend(self: var Doubleratchet) = # Perform DH Ratchet step when receiving a new peer key. + info "dhRatchetSend DH Self: ", dhSelf = self.dhSelf + self.dhSelf = generateKeypair().get()[0] + info "dhRatchetSend new DH Self: ", dhSelf = self.dhSelf let dhOutput : DhDerivedKey = dhExchange(self.dhSelf, self.dhRemote).get() let (newRootKey, newChainKeySend) = kdfRoot(self, self.rootKey, dhOutput) self.rootKey = newRootKey @@ -82,6 +85,8 @@ func dhRatchetSend(self: var Doubleratchet) = self.msgCountSend = 0 proc dhRatchetRecv(self: var Doubleratchet, remotePublickey: PublicKey ) = + info "dh ratchet happens" + info "dhRatchetRecv DH Remote: ", dhRemote = remotePublickey self.prevChainLen = self.msgCountSend self.msgCountSend = 0 self.msgCountRecv = 0 @@ -96,7 +101,7 @@ proc dhRatchetRecv(self: var Doubleratchet, remotePublickey: PublicKey ) = self.dhSelf = generateKeypair().get()[0] let dhOutputPost = self.dhSelf.dhExchange(self.dhRemote).get() - (self.rootKey, self.chainKeyRecv) = kdfRoot(self, self.rootKey, dhOutputPost) + (self.rootKey, self.chainKeySend) = kdfRoot(self, self.rootKey, dhOutputPost) proc skipMessageKeys(self: var Doubleratchet, until: MsgCount): Result[(), string] = @@ -138,9 +143,15 @@ proc encrypt(self: var Doubleratchet, plaintext: var seq[byte], associatedData: proc decrypt*(self: var Doubleratchet, header: DrHeader, ciphertext: CipherText, associatedData: openArray[byte] ) : Result[seq[byte], NaxolotlError] = + info "double ratchet decrypt", header = $header + info "dhRemote: ", dhRemote = self.dhRemote + info "dhSelf: ", dhSelf = self.dhSelf + info "dhSelf public: ", dhSelf = self.dhSelf.public let peerPublic = header.dhPublic + info "peerPublic: ", peerPublic = peerPublic + var msgKey : MessageKey # Check Skipped Keys @@ -176,8 +187,12 @@ proc encrypt*(self: var Doubleratchet, plaintext: var seq[byte]) : (DrHeader, Ci encrypt(self, plaintext,@[]) -func initDoubleratchet*(sharedSecret: array[32, byte], dhSelf: PrivateKey, dhRemote: PublicKey, isSending: bool = true): Doubleratchet = +proc initDoubleratchet*(sharedSecret: array[32, byte], dhSelf: PrivateKey, dhRemote: PublicKey, inviter: bool = true): Doubleratchet = + info "Initializing Double Ratchet" + info "DH Self: ", dhSelf = dhSelf + info "DH Self public: ", dhSelf = dhSelf.public + info "DH Remote: ", dhRemote = dhRemote result = Doubleratchet( dhSelf: dhSelf, dhRemote: dhRemote, @@ -188,5 +203,5 @@ func initDoubleratchet*(sharedSecret: array[32, byte], dhSelf: PrivateKey, dhRem skippedMessageKeys: initTable[(PublicKey, MsgCount), MessageKey]() ) - if isSending: + if not inviter: result.dhRatchetSend()