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

xdr: Sanity-check allocations when decoding #5116

Merged
merged 4 commits into from
Nov 23, 2023
Merged

xdr: Sanity-check allocations when decoding #5116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7db83fb
xdr: Enforce maximum decoding allocation size
2opremio Nov 15, 2023
8d65e21
Update code according to latest xdrgen changes
2opremio Nov 22, 2023
1c24472
Udpate dependencies
2opremio Nov 22, 2023
f3e9f3a
Address review feedback
2opremio Nov 23, 2023
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ xdr/Stellar-contract.x \
xdr/Stellar-internal.x \
xdr/Stellar-contract-config-setting.x

XDRGEN_COMMIT=a231a92475ac6154c0c2f46dc503809823985060
XDRGEN_COMMIT=bc3719f8954c0de37165a3e275a222fc9c5e1fd0
XDR_COMMIT=6a620d160aab22609c982d54578ff6a63bfcdc01

.PHONY: xdr xdr-clean xdr-update
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.3.2
github.com/stellar/go-xdr v0.0.0-20230919160922-6c7b68458206
github.com/stellar/go-xdr v0.0.0-20231115164933-30dd2ac849fd
github.com/stellar/throttled v2.2.3-0.20190823235211-89d75816f59d+incompatible
github.com/stretchr/testify v1.8.1
github.com/tyler-smith/go-bip39 v0.0.0-20180618194314-52158e4697b8
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
github.com/stellar/go-xdr v0.0.0-20230919160922-6c7b68458206 h1:UFuvvpbWL8+jqO1QmKYWSVhiMp4MRiIFd8/zQlUINH0=
github.com/stellar/go-xdr v0.0.0-20230919160922-6c7b68458206/go.mod h1:yoxyU/M8nl9LKeWIoBrbDPQ7Cy+4jxRcWcOayZ4BMps=
github.com/stellar/go-xdr v0.0.0-20231115164933-30dd2ac849fd h1:eLc2Csvf+GgY/l5t6cYJRsx+KSBbS3x/UM386DkB2N8=
github.com/stellar/go-xdr v0.0.0-20231115164933-30dd2ac849fd/go.mod h1:yoxyU/M8nl9LKeWIoBrbDPQ7Cy+4jxRcWcOayZ4BMps=
github.com/stellar/throttled v2.2.3-0.20190823235211-89d75816f59d+incompatible h1:jMXXAcz6xTarGDQ4VtVbtERogcmDQw4RaE85Cr9CgoQ=
github.com/stellar/throttled v2.2.3-0.20190823235211-89d75816f59d+incompatible/go.mod h1:7CJ23pXirXBJq45DqvO6clzTEGM/l1SfKrgrzLry8b4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down
70 changes: 0 additions & 70 deletions gxdr/validator.go
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions gxdr/validator_test.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ingest/ledgerbackend/buffered_meta_pipe_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (b *bufferedLedgerMetaReader) readLedgerMetaFromPipe() (*xdr.LedgerCloseMet
}

var xlcm xdr.LedgerCloseMeta
_, err = xlcm.DecodeFrom(b.decoder, xdr3.DecodeDefaultMaxDepth)
_, err = xlcm.DecodeFrom(b.decoder, xdr3.DecodeDefaultMaxDepth, 0)
if err != nil {
return nil, errors.Wrap(err, "unmarshaling framed LedgerCloseMeta")
}
Expand Down
17 changes: 7 additions & 10 deletions services/horizon/internal/actions/submit_transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"mime"
"net/http"

"github.com/stellar/go/gxdr"
"github.com/stellar/go/network"
"github.com/stellar/go/protocols/horizon"
hProblem "github.com/stellar/go/services/horizon/internal/render/problem"
Expand All @@ -23,9 +22,10 @@ type NetworkSubmitter interface {
}

type SubmitTransactionHandler struct {
Submitter NetworkSubmitter
NetworkPassphrase string
DisableTxSub bool
Submitter NetworkSubmitter
NetworkPassphrase string
DisableTxSub bool
MaxHTTPRequestSize uint
2opremio marked this conversation as resolved.
Show resolved Hide resolved
CoreStateGetter
}

Expand All @@ -36,12 +36,9 @@ type envelopeInfo struct {
parsed xdr.TransactionEnvelope
}

func extractEnvelopeInfo(raw string, passphrase string) (envelopeInfo, error) {
func (handler SubmitTransactionHandler) extractEnvelopeInfo(raw string, passphrase string) (envelopeInfo, error) {
result := envelopeInfo{raw: raw}
if err := gxdr.ValidateTransactionEnvelope(raw, gxdr.DefaultMaxDepth); err != nil {
return result, err
}
err := xdr.SafeUnmarshalBase64(raw, &result.parsed)
err := xdr.SafeUnmarshalBase64WithMaxAllocSize(raw, int(handler.MaxHTTPRequestSize), &result.parsed)
2opremio marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return result, err
}
Expand Down Expand Up @@ -149,7 +146,7 @@ func (handler SubmitTransactionHandler) GetResource(w HeaderWriter, r *http.Requ
return nil, err
}

info, err := extractEnvelopeInfo(raw, handler.NetworkPassphrase)
info, err := handler.extractEnvelopeInfo(raw, handler.NetworkPassphrase)
if err != nil {
return nil, &problem.P{
Type: "transaction_malformed",
Expand Down
9 changes: 5 additions & 4 deletions services/horizon/internal/httpx/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,11 @@ func (r *Router) addRoutes(config *RouterConfig, rateLimiter *throttled.HTTPRate

// Transaction submission API
r.Method(http.MethodPost, "/transactions", ObjectActionHandler{actions.SubmitTransactionHandler{
Submitter: config.TxSubmitter,
NetworkPassphrase: config.NetworkPassphrase,
DisableTxSub: config.DisableTxSub,
CoreStateGetter: config.CoreGetter,
MaxHTTPRequestSize: config.MaxHTTPRequestSize,
Submitter: config.TxSubmitter,
NetworkPassphrase: config.NetworkPassphrase,
DisableTxSub: config.DisableTxSub,
CoreStateGetter: config.CoreGetter,
}})

// Network state related endpoints
Expand Down
15 changes: 11 additions & 4 deletions xdr/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ var OperationTypeToStringMap = operationTypeMap

var LedgerEntryTypeMap = ledgerEntryTypeMap

func safeUnmarshalString(decoder func(reader io.Reader) io.Reader, data string, dest interface{}) error {
func safeUnmarshalString(decoder func(reader io.Reader) io.Reader, maxAllocSize int, data string, dest interface{}) error {
count := &countWriter{}
l := len(data)

_, err := Unmarshal(decoder(io.TeeReader(strings.NewReader(data), count)), dest)
_, err := UnmarshalWithMaxAllocSize(decoder(io.TeeReader(strings.NewReader(data), count)), dest, maxAllocSize)
if err != nil {
return err
}
Expand All @@ -56,10 +56,17 @@ func safeUnmarshalString(decoder func(reader io.Reader) io.Reader, data string,
// decoding the xdr into the provided destination. Also ensures that the reader
// is fully consumed.
func SafeUnmarshalBase64(data string, dest interface{}) error {
return SafeUnmarshalBase64WithMaxAllocSize(data, 0, dest)
}

// SafeUnmarshalBase64WithMaxAllocSize works just like SafeUnmarshalBase64, except a maximum
// allocation size is provided.
func SafeUnmarshalBase64WithMaxAllocSize(data string, maxAllocSize int, dest interface{}) error {
2opremio marked this conversation as resolved.
Show resolved Hide resolved
return safeUnmarshalString(
func(r io.Reader) io.Reader {
return base64.NewDecoder(base64.StdEncoding, r)
},
maxAllocSize,
data,
dest,
)
Expand All @@ -69,7 +76,7 @@ func SafeUnmarshalBase64(data string, dest interface{}) error {
// decoding the xdr into the provided destination. Also ensures that the reader
// is fully consumed.
func SafeUnmarshalHex(data string, dest interface{}) error {
return safeUnmarshalString(hex.NewDecoder, data, dest)
return safeUnmarshalString(hex.NewDecoder, 0, data, dest)
}

// SafeUnmarshal decodes the provided reader into the destination and verifies
Expand Down Expand Up @@ -112,7 +119,7 @@ func NewBytesDecoder() *BytesDecoder {

func (d *BytesDecoder) DecodeBytes(v DecoderFrom, b []byte) (int, error) {
d.reader.Reset(b)
return v.DecodeFrom(d.decoder, xdr.DecodeDefaultMaxDepth)
return v.DecodeFrom(d.decoder, xdr.DecodeDefaultMaxDepth, 0)
}

func marshalString(encoder func([]byte) string, v interface{}) (string, error) {
Expand Down
Loading