update

Author: number571

CHANGELOG.md

@@ -4,7 +4,13 @@
 
 ## v1.7.11~
 
-*April 30, 2025*
+*??? ??, ????*
+
+### IMPROVEMENTS
+
+- `pkg/anonymity/qb`: move from pkg/anonymity -> pkg/anonymity/qb
+- `pkg/anonymity/qb`: add WithDecryptors
+- `pkg/client`: DecryptMessage with static time
 
 ### CHANGES
 

pkg/anonymity/doc.go

@@ -1,4 +1,4 @@
-package anonymity
+package qb
 
 const (
 	cAction32bitMask = sAction(1 << 31)

pkg/anonymity/action.go renamed to pkg/anonymity/qb/action.go

@@ -1,4 +1,4 @@
-package anonymity
+package qb
 
 import (
 	"context"
@@ -7,8 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/number571/go-peer/pkg/anonymity/adapters"
-	"github.com/number571/go-peer/pkg/anonymity/queue"
+	"github.com/number571/go-peer/pkg/anonymity/qb/adapters"
+	"github.com/number571/go-peer/pkg/anonymity/qb/queue"
+	"github.com/number571/go-peer/pkg/client"
 	"github.com/number571/go-peer/pkg/crypto/asymmetric"
 	"github.com/number571/go-peer/pkg/crypto/hashing"
 	"github.com/number571/go-peer/pkg/crypto/random"
@@ -19,7 +20,7 @@ import (
 	"github.com/number571/go-peer/pkg/state"
 	"github.com/number571/go-peer/pkg/storage/database"
 
-	anon_logger "github.com/number571/go-peer/pkg/anonymity/logger"
+	anon_logger "github.com/number571/go-peer/pkg/anonymity/qb/logger"
 )
 
 var (
@@ -37,6 +38,7 @@ type sNode struct {
 	fMapPubKeys    asymmetric.IMapPubKeys
 	fHandleRoutes  map[uint32]IHandlerF
 	fHandleActions map[string]chan []byte
+	fDecryptors    []client.IDecryptor
 }
 
 func NewNode(
@@ -56,6 +58,7 @@ func NewNode(
 		fMapPubKeys:    asymmetric.NewMapPubKeys(),
 		fHandleRoutes:  make(map[uint32]IHandlerF, 64),
 		fHandleActions: make(map[string]chan []byte, 64),
+		fDecryptors:    []client.IDecryptor{pQBProcessor.GetClient()},
 	}
 }
 
@@ -97,6 +100,14 @@ func (p *sNode) Run(pCtx context.Context) error {
 	}
 }
 
+func (p *sNode) WithDecryptors(pDecryptors ...client.IDecryptor) INode {
+	decryptors := make([]client.IDecryptor, 0, 1+len(pDecryptors))
+	decryptors = append(decryptors, p.fQBProcessor.GetClient())
+	decryptors = append(decryptors, pDecryptors...)
+	p.fDecryptors = decryptors
+	return p
+}
+
 func (p *sNode) runProducer(pCtx context.Context) error {
 	for {
 		select {
@@ -225,6 +236,27 @@ func (p *sNode) recvResponse(pCtx context.Context, pActionKey string) ([]byte, e
 	}
 }
 
+func (p *sNode) tryDecryptMessage(pEncMsg []byte) (uint64, asymmetric.IPubKey, []byte, error) {
+	var (
+		id     uint64
+		pubKey asymmetric.IPubKey
+		decMsg []byte
+	)
+	for i, d := range p.fDecryptors {
+		pk, dm, err := d.DecryptMessage(p.fMapPubKeys, pEncMsg)
+		if err != nil {
+			continue
+		}
+		id = uint64(i) // nolint: gosec
+		pubKey = pk
+		decMsg = dm
+	}
+	if pubKey == nil {
+		return 0, nil, nil, ErrDecryptMessage
+	}
+	return id, pubKey, decMsg, nil
+}
+
 func (p *sNode) consumeMessage(pCtx context.Context, pNetMsg layer1.IMessage) error {
 	logBuilder := anon_logger.NewLogBuilder(p.fSettings.GetServiceName())
 
@@ -251,8 +283,8 @@ func (p *sNode) consumeMessage(pCtx context.Context, pNetMsg layer1.IMessage) er
 		return nil
 	}
 
-	// try decrypt message
-	pubKey, decMsg, err := client.DecryptMessage(p.fMapPubKeys, encMsg)
+	// try decrypt consumed message
+	id, pubKey, decMsg, err := p.tryDecryptMessage(encMsg)
 	if err != nil {
 		p.fLogger.PushInfo(logBuilder.WithType(anon_logger.CLogInfoUndecryptable))
 		return nil
@@ -270,12 +302,13 @@ func (p *sNode) consumeMessage(pCtx context.Context, pNetMsg layer1.IMessage) er
 	}
 
 	// do request or response action
-	return p.handleDoAction(pCtx, logBuilder, pubKey, pld)
+	return p.handleDoAction(pCtx, logBuilder, id, pubKey, pld)
 }
 
 func (p *sNode) handleDoAction(
 	pCtx context.Context,
 	pLogBuilder anon_logger.ILogBuilder,
+	pID uint64,
 	pSender asymmetric.IPubKey,
 	pPld payload.IPayload64,
 ) error {
@@ -288,7 +321,7 @@ func (p *sNode) handleDoAction(
 
 	if action.isRequest() {
 		// got request from another side (need generate response)
-		p.handleRequest(pCtx, pLogBuilder, pSender, head, body)
+		p.handleRequest(pCtx, pLogBuilder, pID, pSender, head, body)
 		return nil
 	}
 
@@ -319,6 +352,7 @@ func (p *sNode) handleResponse(
 func (p *sNode) handleRequest(
 	pCtx context.Context,
 	pLogBuilder anon_logger.ILogBuilder,
+	pID uint64,
 	pSender asymmetric.IPubKey,
 	pHead iHead,
 	pBody []byte,
@@ -331,7 +365,7 @@ func (p *sNode) handleRequest(
 	}
 
 	// response can be nil
-	resp, err := f(pCtx, p, pSender, pBody)
+	resp, err := f(pCtx, p, pID, pSender, pBody)
 	if err != nil {
 		p.fLogger.PushWarn(pLogBuilder.WithType(anon_logger.CLogWarnIncorrectResponse))
 		return

pkg/anonymity/adapters/adapter.go renamed to pkg/anonymity/qb/adapters/adapter.go

@@ -1,5 +1,5 @@
 // nolint: err113
-package anonymity
+package qb
 
 import (
 	"context"
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/number571/go-peer/pkg/anonymity/adapters"
-	"github.com/number571/go-peer/pkg/anonymity/queue"
+	"github.com/number571/go-peer/pkg/anonymity/qb/adapters"
+	"github.com/number571/go-peer/pkg/anonymity/qb/queue"
 	"github.com/number571/go-peer/pkg/client"
 	"github.com/number571/go-peer/pkg/crypto/asymmetric"
 	"github.com/number571/go-peer/pkg/crypto/hashing"
@@ -26,7 +26,7 @@ import (
 	"github.com/number571/go-peer/pkg/storage/database"
 	testutils "github.com/number571/go-peer/test/utils"
 
-	anon_logger "github.com/number571/go-peer/pkg/anonymity/logger"
+	anon_logger "github.com/number571/go-peer/pkg/anonymity/qb/logger"
 	"github.com/number571/go-peer/pkg/network/conn"
 )
 
@@ -189,7 +189,7 @@ func TestFetchPayload(t *testing.T) {
 
 	nodes[1].HandleFunc(
 		tcHead,
-		func(_ context.Context, _ INode, _ asymmetric.IPubKey, reqBytes []byte) ([]byte, error) {
+		func(_ context.Context, _ INode, _ uint64, _ asymmetric.IPubKey, reqBytes []byte) ([]byte, error) {
 			return []byte(fmt.Sprintf("echo: '%s'", string(reqBytes))), nil
 		},
 	)
@@ -238,7 +238,7 @@ func TestBroadcastPayload(t *testing.T) {
 	chResult := make(chan string)
 	nodes[1].HandleFunc(
 		tcHead,
-		func(_ context.Context, _ INode, _ asymmetric.IPubKey, reqBytes []byte) ([]byte, error) {
+		func(_ context.Context, _ INode, _ uint64, _ asymmetric.IPubKey, reqBytes []byte) ([]byte, error) {
 			res := fmt.Sprintf("echo: '%s'", string(reqBytes))
 			go func() { chResult <- res }()
 			return nil, nil
@@ -386,7 +386,7 @@ func TestHandleWrapper(t *testing.T) {
 
 	node.HandleFunc(
 		111,
-		func(_ context.Context, _ INode, _ asymmetric.IPubKey, _ []byte) ([]byte, error) {
+		func(_ context.Context, _ INode, _ uint64, _ asymmetric.IPubKey, _ []byte) ([]byte, error) {
 			return nil, errors.New("some error") //nolint:err113
 		},
 	)
@@ -600,7 +600,7 @@ func testRunNodes(ctx context.Context, t *testing.T, timeWait time.Duration, add
 	for _, node := range nodes {
 		node.HandleFunc(
 			tcHead,
-			func(_ context.Context, _ INode, _ asymmetric.IPubKey, reqBytes []byte) ([]byte, error) {
+			func(_ context.Context, _ INode, _ uint64, _ asymmetric.IPubKey, reqBytes []byte) ([]byte, error) {
 				// send response
 				return []byte(string(reqBytes) + " (response)"), nil
 			},

pkg/anonymity/adapters/adapters_test.go renamed to pkg/anonymity/qb/adapters/adapters_test.go

@@ -0,0 +1,5 @@
+// Package qb allows you to perform network operations on top of anonymizing traffic.
+//
+// The package basically uses the fifth^ stage of qb with a queue-based problem.
+// All applied connections use friend-to-friend (F2F) communications.
+package qb

pkg/anonymity/adapters/types.go renamed to pkg/anonymity/qb/adapters/types.go

@@ -1,7 +1,7 @@
-package anonymity
+package qb
 
 const (
-	errPrefix = "pkg/anonymity = "
+	errPrefix = "pkg/anonymity/qb = "
 )
 
 type SAnonymityError struct {
@@ -30,4 +30,5 @@ var (
 	ErrRunning               = &SAnonymityError{"node running"}
 	ErrProcessRun            = &SAnonymityError{"process run"}
 	ErrHashAlreadyExist      = &SAnonymityError{"hash already exist"}
+	ErrDecryptMessage        = &SAnonymityError{"decrypt message"}
 )