From 22bc39105d1b3db6c36919396abd1f9eece7f8e1 Mon Sep 17 00:00:00 2001 From: harshabose Date: Sat, 3 May 2025 19:29:23 +0530 Subject: [PATCH] changed Writer and Reader method on encryption interceptor --- pkg/middleware/encrypt/interceptor.go | 14 ++++++++------ .../encrypt/keyexchange/curve25519messages.go | 5 ++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkg/middleware/encrypt/interceptor.go b/pkg/middleware/encrypt/interceptor.go index aae8caa..1802bca 100644 --- a/pkg/middleware/encrypt/interceptor.go +++ b/pkg/middleware/encrypt/interceptor.go @@ -65,13 +65,15 @@ func (i *Interceptor) Init(connection interceptor.Connection) error { func (i *Interceptor) InterceptSocketWriter(writer interceptor.Writer) interceptor.Writer { return interceptor.WriterFunc(func(conn interceptor.Connection, msg message.Message) error { - if i.localMessageRegistry.Check(msg.GetProtocol()) { - return writer.Write(conn, msg) - } + var m *encryptor.EncryptedMessage - m, err := encryptor.NewEncryptedMessage(msg) - if err != nil { - return err + if !i.localMessageRegistry.Check(msg.GetProtocol()) { + m, err := encryptor.NewEncryptedMessage(msg) + if err != nil { + return err + } + + msg = m } if err := m.WriteProcess(i, conn); err != nil { diff --git a/pkg/middleware/encrypt/keyexchange/curve25519messages.go b/pkg/middleware/encrypt/keyexchange/curve25519messages.go index b840d74..ea0f6f6 100644 --- a/pkg/middleware/encrypt/keyexchange/curve25519messages.go +++ b/pkg/middleware/encrypt/keyexchange/curve25519messages.go @@ -263,7 +263,10 @@ func NewDoneResponse() (*DoneResponse, error) { return msg, nil } -func (m *DoneResponse) Process(protocol interfaces.Protocol, s interfaces.State) error { +// TODO: ADD WRITE OR READ PROCESS METHODS +// TODO: ADD PROTOCOLS + +func (m *DoneResponse) Process(protocol interfaces.Protocol, _ interfaces.State) error { p, ok := protocol.(*Curve25519Protocol) if !ok { return encryptionerr.ErrInvalidMessageType