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.

Sign up for GitHub

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

rpc: Sanity-check allocations when decoding #1099

Merged
merged 1 commit into from
Nov 25, 2023
Merged

rpc: Sanity-check allocations when decoding #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions cmd/soroban-rpc/internal/methods/get_ledger_entries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"github.com/creachadair/jrpc2"
"github.com/creachadair/jrpc2/handler"
"github.com/stellar/go/gxdr"
"github.com/stellar/go/support/log"
"github.com/stellar/go/xdr"

Expand Down Expand Up @@ -51,14 +50,6 @@ func NewGetLedgerEntriesHandler(logger *log.Entry, ledgerEntryReader db.LedgerEn
var ledgerKeys []xdr.LedgerKey
for i, requestKey := range request.Keys {
var ledgerKey xdr.LedgerKey
if err := gxdr.ValidateLedgerKey(requestKey, gxdr.DefaultMaxDepth); err != nil {
logger.WithError(err).WithField("request", request).
Infof("could not validate ledgerKey at index %d from getLedgerEntries request", i)
return GetLedgerEntriesResponse{}, &jrpc2.Error{
Code: jrpc2.InvalidParams,
Message: fmt.Sprintf("cannot unmarshal key value %s at index %d", requestKey, i),
}
}
if err := xdr.SafeUnmarshalBase64(requestKey, &ledgerKey); err != nil {
logger.WithError(err).WithField("request", request).
Infof("could not unmarshal requestKey %s at index %d from getLedgerEntries request", requestKey, i)
Expand Down
16 changes: 4 additions & 12 deletions cmd/soroban-rpc/internal/methods/get_ledger_entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"github.com/creachadair/jrpc2"
"github.com/creachadair/jrpc2/handler"
"github.com/stellar/go/gxdr"

"github.com/stellar/go/support/log"
"github.com/stellar/go/xdr"
Expand All @@ -30,26 +29,19 @@ type GetLedgerEntryResponse struct {
LiveUntilLedgerSeq *uint32 `json:"LiveUntilLedgerSeq,string,omitempty"`
}

var invalidLedgerKeyXdrError = &jrpc2.Error{
Code: jrpc2.InvalidParams,
Message: "cannot unmarshal key value",
}

// NewGetLedgerEntryHandler returns a json rpc handler to retrieve the specified ledger entry from stellar core
// Deprecated. use NewGetLedgerEntriesHandler instead.
// TODO(https://github.com/stellar/soroban-tools/issues/374) remove after getLedgerEntries is deployed.
func NewGetLedgerEntryHandler(logger *log.Entry, ledgerEntryReader db.LedgerEntryReader) jrpc2.Handler {
return handler.New(func(ctx context.Context, request GetLedgerEntryRequest) (GetLedgerEntryResponse, error) {
if err := gxdr.ValidateLedgerKey(request.Key, gxdr.DefaultMaxDepth); err != nil {
logger.WithError(err).WithField("request", request).
Info("could not validate ledgerKey from getLedgerEntry request")
return GetLedgerEntryResponse{}, invalidLedgerKeyXdrError
}
var key xdr.LedgerKey
if err := xdr.SafeUnmarshalBase64(request.Key, &key); err != nil {
logger.WithError(err).WithField("request", request).
Info("could not unmarshal ledgerKey from getLedgerEntry request")
return GetLedgerEntryResponse{}, invalidLedgerKeyXdrError
return GetLedgerEntryResponse{}, &jrpc2.Error{
Code: jrpc2.InvalidParams,
Message: "cannot unmarshal key value",
2opremio marked this conversation as resolved.
Show resolved Hide resolved
}
}

if key.Type == xdr.LedgerEntryTypeTtl {
Expand Down
16 changes: 4 additions & 12 deletions cmd/soroban-rpc/internal/methods/send_transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"github.com/creachadair/jrpc2"
"github.com/creachadair/jrpc2/handler"
"github.com/stellar/go/gxdr"
"github.com/stellar/go/network"
proto "github.com/stellar/go/protocols/stellarcore"
"github.com/stellar/go/support/log"
Expand Down Expand Up @@ -49,24 +48,17 @@ type LatestLedgerStore interface {
GetLatestLedger() transactions.LedgerInfo
}

var invalidTransactionXdrError = &jrpc2.Error{
Code: jrpc2.InvalidParams,
Message: "invalid_xdr",
}

// NewSendTransactionHandler returns a submit transaction json rpc handler
func NewSendTransactionHandler(daemon interfaces.Daemon, logger *log.Entry, store LatestLedgerStore, passphrase string) jrpc2.Handler {
submitter := daemon.CoreClient()
return handler.New(func(ctx context.Context, request SendTransactionRequest) (SendTransactionResponse, error) {
if err := gxdr.ValidateTransactionEnvelope(request.Transaction, gxdr.DefaultMaxDepth); err != nil {
logger.WithError(err).WithField("request", request).
Info("could not validate send transaction envelope")
return SendTransactionResponse{}, invalidTransactionXdrError
}
var envelope xdr.TransactionEnvelope
err := xdr.SafeUnmarshalBase64(request.Transaction, &envelope)
if err != nil {
return SendTransactionResponse{}, invalidTransactionXdrError
return SendTransactionResponse{}, &jrpc2.Error{
Code: jrpc2.InvalidParams,
Message: "invalid_xdr",
2opremio marked this conversation as resolved.
Show resolved Hide resolved
}
}

var hash [32]byte
Expand Down
8 changes: 0 additions & 8 deletions cmd/soroban-rpc/internal/methods/simulate_transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (

"github.com/creachadair/jrpc2"
"github.com/creachadair/jrpc2/handler"
"github.com/stellar/go/gxdr"
"github.com/stellar/go/support/log"
"github.com/stellar/go/xdr"

Expand Down Expand Up @@ -54,13 +53,6 @@ type PreflightGetter interface {
func NewSimulateTransactionHandler(logger *log.Entry, ledgerEntryReader db.LedgerEntryReader, ledgerReader db.LedgerReader, getter PreflightGetter) jrpc2.Handler {

return handler.New(func(ctx context.Context, request SimulateTransactionRequest) SimulateTransactionResponse {
if err := gxdr.ValidateTransactionEnvelope(request.Transaction, gxdr.DefaultMaxDepth); err != nil {
logger.WithError(err).WithField("request", request).
Info("could not validate simulate transaction envelope")
return SimulateTransactionResponse{
Error: "Could not unmarshal transaction",
}
}
var txEnvelope xdr.TransactionEnvelope
if err := xdr.SafeUnmarshalBase64(request.Transaction, &txEnvelope); err != nil {
logger.WithError(err).WithField("request", request).
Expand Down
Loading