Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ToPeerID should validate []byte length #14181

Merged
merged 4 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tender-wombats-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#internal topeerid should validate []byte length
5 changes: 4 additions & 1 deletion core/capabilities/remote/target/request/client_request.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,10 @@ func (c *ClientRequest) OnMessage(_ context.Context, msg *types.MessageBody) err

c.lggr.Debugw("OnMessage called for client request", "messageID", msg.MessageId)

sender := remote.ToPeerID(msg.Sender)
sender, err := remote.ToPeerID(msg.Sender)
if err != nil {
return fmt.Errorf("failed to convert message sender to PeerID: %w", err)
}

received, expected := c.responseReceived[sender]
if !expected {
Expand Down
6 changes: 5 additions & 1 deletion core/capabilities/remote/target/request/server_request.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ func (e *ServerRequest) OnMessage(ctx context.Context, msg *types.MessageBody) e
return fmt.Errorf("sender missing from message")
}

requester := remote.ToPeerID(msg.Sender)
requester, err := remote.ToPeerID(msg.Sender)
if err != nil {
return fmt.Errorf("failed to convert message sender to PeerID: %w", err)
}

if err := e.addRequester(requester); err != nil {
return fmt.Errorf("failed to add requester to request: %w", err)
}
Expand Down
7 changes: 6 additions & 1 deletion core/capabilities/remote/trigger_publisher.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ func (p *triggerPublisher) Start(ctx context.Context) error {
}

func (p *triggerPublisher) Receive(_ context.Context, msg *types.MessageBody) {
sender := ToPeerID(msg.Sender)
sender, err := ToPeerID(msg.Sender)
if err != nil {
p.lggr.Errorw("failed to convert message sender to PeerID", "err", err)
return
}

if msg.Method == types.MethodRegisterTrigger {
req, err := pb.UnmarshalCapabilityRequest(msg.Payload)
if err != nil {
Expand Down
7 changes: 6 additions & 1 deletion core/capabilities/remote/trigger_subscriber.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,12 @@ func (s *triggerSubscriber) UnregisterTrigger(ctx context.Context, request commo
}

func (s *triggerSubscriber) Receive(_ context.Context, msg *types.MessageBody) {
sender := ToPeerID(msg.Sender)
sender, err := ToPeerID(msg.Sender)
if err != nil {
s.lggr.Errorw("failed to convert message sender to PeerID", "err", err)
return
}

if _, found := s.capDonMembers[sender]; !found {
s.lggr.Errorw("received message from unexpected node", "capabilityId", s.capInfo.ID, "sender", sender)
return
Expand Down
8 changes: 6 additions & 2 deletions core/capabilities/remote/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,14 @@ func ValidateMessage(msg p2ptypes.Message, expectedReceiver p2ptypes.PeerID) (*r
return &body, nil
}

func ToPeerID(peerID []byte) p2ptypes.PeerID {
func ToPeerID(peerID []byte) (p2ptypes.PeerID, error) {
if len(peerID) != p2ptypes.PeerIDLength {
return p2ptypes.PeerID{}, fmt.Errorf("invalid peer ID length: %d", len(peerID))
}

var id p2ptypes.PeerID
copy(id[:], peerID)
return id
return id, nil
}

// Default MODE Aggregator needs a configurable number of identical responses for aggregation to succeed
Expand Down
3 changes: 2 additions & 1 deletion core/capabilities/remote/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ func encodeAndSign(t *testing.T, senderPrivKey ed25519.PrivateKey, senderId p2pt
}

func TestToPeerID(t *testing.T) {
id := remote.ToPeerID([]byte("12345678901234567890123456789012"))
id, err := remote.ToPeerID([]byte("12345678901234567890123456789012"))
require.NoError(t, err)
require.Equal(t, "12D3KooWD8QYTQVYjB6oog4Ej8PcPpqTrPRnxLQap8yY8KUQRVvq", id.String())
}

Expand Down
Loading