11170835610

Committed 03 Oct 2024 10:41PM UTC coverage: 49.188% (-9.6%) from 58.738%

Build # 11170835610

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #9154 from ziggie1984/master

multi: bump btcd version.

Run Details

3 of 6 new or added lines in 6 files covered. (50.0%)

26110 existing lines in 428 files now uncovered.

97359 of 197934 relevant lines covered (49.19%)

1.04 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

76.6

/lnwire/extra_bytes.go

package lnwire

import (
        "bytes"
        "fmt"
        "io"

        "github.com/lightningnetwork/lnd/fn"
        "github.com/lightningnetwork/lnd/tlv"
)

// ExtraOpaqueData is the set of data that was appended to this message, some
// of which we may not actually know how to iterate or parse. By holding onto
// this data, we ensure that we're able to properly validate the set of
// signatures that cover these new fields, and ensure we're able to make
// upgrades to the network in a forwards compatible manner.
type ExtraOpaqueData []byte

// NewExtraOpaqueData creates a new ExtraOpaqueData instance from a tlv.TypeMap.
func NewExtraOpaqueData(tlvMap tlv.TypeMap) (ExtraOpaqueData, error) {
        // If the tlv map is empty, we'll want to mirror the behavior of
        // decoding an empty extra opaque data field (see Decode method).
        if len(tlvMap) == 0 {
                return make([]byte, 0), nil
        }

        // Convert the TLV map into a slice of records.
        records := TlvMapToRecords(tlvMap)

        // Encode the records into the extra data byte slice.
        return EncodeRecords(records)
}

// Encode attempts to encode the raw extra bytes into the passed io.Writer.
func (e *ExtraOpaqueData) Encode(w *bytes.Buffer) error {
        eBytes := []byte((*e)[:])
        if err := WriteBytes(w, eBytes); err != nil {
                return err
        }

        return nil
}

// Decode attempts to unpack the raw bytes encoded in the passed-in io.Reader as
// a set of extra opaque data.
func (e *ExtraOpaqueData) Decode(r io.Reader) error {
        // First, we'll attempt to read a set of bytes contained within the
        // passed io.Reader (if any exist).
        rawBytes, err := io.ReadAll(r)
        if err != nil {
                return err
        }

        // If we _do_ have some bytes, then we'll swap out our backing pointer.
        // This ensures that any struct that embeds this type will properly
        // store the bytes once this method exits.
        if len(rawBytes) > 0 {
                *e = rawBytes
        } else {
                *e = make([]byte, 0)
        }

        return nil
}

// PackRecords attempts to encode the set of tlv records into the target
// ExtraOpaqueData instance. The records will be encoded as a raw TLV stream
// and stored within the backing slice pointer.
func (e *ExtraOpaqueData) PackRecords(
        recordProducers ...tlv.RecordProducer) error {

        // Assemble all the records passed in series, then encode them.
        records := ProduceRecordsSorted(recordProducers...)
        encoded, err := EncodeRecords(records)
        if err != nil {
                return err
        }

        *e = encoded

        return nil
}

// ExtractRecords attempts to decode any types in the internal raw bytes as if
// it were a tlv stream. The set of raw parsed types is returned, and any
// passed records (if found in the stream) will be parsed into the proper
// tlv.Record.
func (e *ExtraOpaqueData) ExtractRecords(
        recordProducers ...tlv.RecordProducer) (tlv.TypeMap, error) {

        // First, assemble all the records passed in series.
        records := ProduceRecordsSorted(recordProducers...)
        extraBytesReader := bytes.NewReader(*e)

        // Since ExtraOpaqueData is provided by a potentially malicious peer,
        // pass it into the P2P decoding variant.
        return DecodeRecordsP2P(extraBytesReader, records...)
}

// RecordProducers parses ExtraOpaqueData into a slice of TLV record producers
// by interpreting it as a TLV map.
func (e *ExtraOpaqueData) RecordProducers() ([]tlv.RecordProducer, error) {
        var recordProducers []tlv.RecordProducer

        // If the instance is nil or empty, return an empty slice.
        if e == nil || len(*e) == 0 {
                return recordProducers, nil
        }

        // Parse the extra opaque data as a TLV map.
        tlvMap, err := e.ExtractRecords()
        if err != nil {
                return nil, err
        }

        // Convert the TLV map into a slice of record producers.
        records := TlvMapToRecords(tlvMap)

        return RecordsAsProducers(records), nil
}

// EncodeMessageExtraData encodes the given recordProducers into the given
// extraData.
func EncodeMessageExtraData(extraData *ExtraOpaqueData,
        recordProducers ...tlv.RecordProducer) error {

        // Treat extraData as a mutable reference.
        if extraData == nil {
                return fmt.Errorf("extra data cannot be nil")
        }

        // Pack in the series of TLV records into this message. The order we
        // pass them in doesn't matter, as the method will ensure that things
        // are all properly sorted.
        return extraData.PackRecords(recordProducers...)
}

// ParseAndExtractCustomRecords parses the given extra data into the passed-in
// records, then returns any remaining records split into custom records and
// extra data.
func ParseAndExtractCustomRecords(allExtraData ExtraOpaqueData,
        knownRecords ...tlv.RecordProducer) (CustomRecords,
        fn.Set[tlv.Type], ExtraOpaqueData, error) {

        extraDataTlvMap, err := allExtraData.ExtractRecords(knownRecords...)
        if err != nil {
                return nil, nil, nil, err
        }

        // Remove the known and now extracted records from the leftover extra
        // data map.
        parsedKnownRecords := make(fn.Set[tlv.Type], len(knownRecords))
        for _, producer := range knownRecords {
                r := producer.Record()

                // Only remove the records if it was parsed (remainder is nil).
                // We'll just store the type so we can tell the caller which
                // records were actually parsed fully.
                val, ok := extraDataTlvMap[r.Type()]
                if ok && val == nil {
                        parsedKnownRecords.Add(r.Type())
                        delete(extraDataTlvMap, r.Type())
                }
        }

        // Any records from the extra data TLV map which are in the custom
        // records TLV type range will be included in the custom records field
        // and removed from the extra data field.
        customRecordsTlvMap := make(tlv.TypeMap, len(extraDataTlvMap))
        for k, v := range extraDataTlvMap {
                // Skip records that are not in the custom records TLV type
                // range.
                if k < MinCustomRecordsTlvType {
                        continue
                }

                // Include the record in the custom records map.
                customRecordsTlvMap[k] = v

                // Now that the record is included in the custom records map,
                // we can remove it from the extra data TLV map.
                delete(extraDataTlvMap, k)
        }

        // Set the custom records field to the custom records specific TLV
        // record map.
        customRecords, err := NewCustomRecords(customRecordsTlvMap)
        if err != nil {
                return nil, nil, nil, err
        }

        // Encode the remaining records back into the extra data field. These
        // records are not in the custom records TLV type range and do not
        // have associated fields in the struct that produced the records.
        extraData, err := NewExtraOpaqueData(extraDataTlvMap)
        if err != nil {
                return nil, nil, nil, err
        }

        // Help with unit testing where we might have the empty value (nil) for
        // the extra data instead of the default that's returned by the
        // constructor (empty slice).
        if len(extraData) == 0 {
                extraData = nil
        }

        return customRecords, parsedKnownRecords, extraData, nil
}

// MergeAndEncode merges the known records with the extra data and custom
// records, then encodes the merged records into raw bytes.
func MergeAndEncode(knownRecords []tlv.RecordProducer,
        extraData ExtraOpaqueData, customRecords CustomRecords) ([]byte,
        error) {

        // Construct a slice of all the records that we should include in the
        // message extra data field. We will start by including any records from
        // the extra data field.
        mergedRecords, err := extraData.RecordProducers()
        if err != nil {
                return nil, err
        }

        // Merge the known and extra data records.
        mergedRecords = append(mergedRecords, knownRecords...)

        // Include custom records in the extra data wire field if they are
        // present. Ensure that the custom records are validated before encoding
        // them.
        if err := customRecords.Validate(); err != nil {
                return nil, fmt.Errorf("custom records validation error: %w",
                        err)
        }

        // Extend the message extra data records slice with TLV records from the
        // custom records field.
        mergedRecords = append(
                mergedRecords, customRecords.RecordProducers()...,
        )

        // Now we can sort the records and make sure there are no records with
        // the same type that would collide when encoding.
        sortedRecords := ProduceRecordsSorted(mergedRecords...)
        if err := AssertUniqueTypes(sortedRecords); err != nil {
                return nil, err
        }

        return EncodeRecords(sortedRecords)
}

1	package lnwire
2
3	import (
4	"bytes"
5	"fmt"
6	"io"
7
8	"github.com/lightningnetwork/lnd/fn"
9	"github.com/lightningnetwork/lnd/tlv"
10	)
11
12	// ExtraOpaqueData is the set of data that was appended to this message, some
13	// of which we may not actually know how to iterate or parse. By holding onto
14	// this data, we ensure that we're able to properly validate the set of
15	// signatures that cover these new fields, and ensure we're able to make
16	// upgrades to the network in a forwards compatible manner.
17	type ExtraOpaqueData []byte
18
19	// NewExtraOpaqueData creates a new ExtraOpaqueData instance from a tlv.TypeMap.
20	func NewExtraOpaqueData(tlvMap tlv.TypeMap) (ExtraOpaqueData, error) {	2✔
21	// If the tlv map is empty, we'll want to mirror the behavior of	2✔
22	// decoding an empty extra opaque data field (see Decode method).	2✔
23	if len(tlvMap) == 0 {	4✔
24	return make([]byte, 0), nil	2✔
25	}	2✔
26
27	// Convert the TLV map into a slice of records.
UNCOV 28	records := TlvMapToRecords(tlvMap)	×
UNCOV 29		×
UNCOV 30	// Encode the records into the extra data byte slice.	×
UNCOV 31	return EncodeRecords(records)	×
32	}
33
34	// Encode attempts to encode the raw extra bytes into the passed io.Writer.
35	func (e ExtraOpaqueData) Encode(w bytes.Buffer) error {	2✔
36	eBytes := []byte((*e)[:])	2✔
37	if err := WriteBytes(w, eBytes); err != nil {	2✔
38	return err	×
39	}	×
40
41	return nil	2✔
42	}
43
44	// Decode attempts to unpack the raw bytes encoded in the passed-in io.Reader as
45	// a set of extra opaque data.
46	func (e *ExtraOpaqueData) Decode(r io.Reader) error {	2✔
47	// First, we'll attempt to read a set of bytes contained within the	2✔
48	// passed io.Reader (if any exist).	2✔
49	rawBytes, err := io.ReadAll(r)	2✔
50	if err != nil {	2✔
51	return err	×
52	}	×
53
54	// If we _do_ have some bytes, then we'll swap out our backing pointer.
55	// This ensures that any struct that embeds this type will properly
56	// store the bytes once this method exits.
57	if len(rawBytes) > 0 {	4✔
58	*e = rawBytes	2✔
59	} else {	4✔
60	*e = make([]byte, 0)	2✔
61	}	2✔
62
63	return nil	2✔
64	}
65
66	// PackRecords attempts to encode the set of tlv records into the target
67	// ExtraOpaqueData instance. The records will be encoded as a raw TLV stream
68	// and stored within the backing slice pointer.
69	func (e *ExtraOpaqueData) PackRecords(
70	recordProducers ...tlv.RecordProducer) error {	2✔
71		2✔
72	// Assemble all the records passed in series, then encode them.	2✔
73	records := ProduceRecordsSorted(recordProducers...)	2✔
74	encoded, err := EncodeRecords(records)	2✔
75	if err != nil {	2✔
76	return err	×
77	}	×
78
79	*e = encoded	2✔
80		2✔
81	return nil	2✔
82	}
83
84	// ExtractRecords attempts to decode any types in the internal raw bytes as if
85	// it were a tlv stream. The set of raw parsed types is returned, and any
86	// passed records (if found in the stream) will be parsed into the proper
87	// tlv.Record.
88	func (e *ExtraOpaqueData) ExtractRecords(
89	recordProducers ...tlv.RecordProducer) (tlv.TypeMap, error) {	2✔
90		2✔
91	// First, assemble all the records passed in series.	2✔
92	records := ProduceRecordsSorted(recordProducers...)	2✔
93	extraBytesReader := bytes.NewReader(*e)	2✔
94		2✔
95	// Since ExtraOpaqueData is provided by a potentially malicious peer,	2✔
96	// pass it into the P2P decoding variant.	2✔
97	return DecodeRecordsP2P(extraBytesReader, records...)	2✔
98	}	2✔
99
100	// RecordProducers parses ExtraOpaqueData into a slice of TLV record producers
101	// by interpreting it as a TLV map.
102	func (e *ExtraOpaqueData) RecordProducers() ([]tlv.RecordProducer, error) {	2✔
103	var recordProducers []tlv.RecordProducer	2✔
104		2✔
105	// If the instance is nil or empty, return an empty slice.	2✔
106	if e == nil \|\| len(*e) == 0 {	4✔
107	return recordProducers, nil	2✔
108	}	2✔
109
110	// Parse the extra opaque data as a TLV map.
UNCOV 111	tlvMap, err := e.ExtractRecords()	×
UNCOV 112	if err != nil {	×
113	return nil, err	×
114	}	×
115
116	// Convert the TLV map into a slice of record producers.
UNCOV 117	records := TlvMapToRecords(tlvMap)	×
UNCOV 118		×
UNCOV 119	return RecordsAsProducers(records), nil	×
120	}
121
122	// EncodeMessageExtraData encodes the given recordProducers into the given
123	// extraData.
124	func EncodeMessageExtraData(extraData *ExtraOpaqueData,
125	recordProducers ...tlv.RecordProducer) error {	2✔
126		2✔
127	// Treat extraData as a mutable reference.	2✔
128	if extraData == nil {	2✔
129	return fmt.Errorf("extra data cannot be nil")	×
130	}	×
131
132	// Pack in the series of TLV records into this message. The order we
133	// pass them in doesn't matter, as the method will ensure that things
134	// are all properly sorted.
135	return extraData.PackRecords(recordProducers...)	2✔
136	}
137
138	// ParseAndExtractCustomRecords parses the given extra data into the passed-in
139	// records, then returns any remaining records split into custom records and
140	// extra data.
141	func ParseAndExtractCustomRecords(allExtraData ExtraOpaqueData,
142	knownRecords ...tlv.RecordProducer) (CustomRecords,
143	fn.Set[tlv.Type], ExtraOpaqueData, error) {	2✔
144		2✔
145	extraDataTlvMap, err := allExtraData.ExtractRecords(knownRecords...)	2✔
146	if err != nil {	2✔
UNCOV 147	return nil, nil, nil, err	×
UNCOV 148	}	×
149
150	// Remove the known and now extracted records from the leftover extra
151	// data map.
152	parsedKnownRecords := make(fn.Set[tlv.Type], len(knownRecords))	2✔
153	for _, producer := range knownRecords {	4✔
154	r := producer.Record()	2✔
155		2✔
156	// Only remove the records if it was parsed (remainder is nil).	2✔
157	// We'll just store the type so we can tell the caller which	2✔
158	// records were actually parsed fully.	2✔
159	val, ok := extraDataTlvMap[r.Type()]	2✔
160	if ok && val == nil {	4✔
161	parsedKnownRecords.Add(r.Type())	2✔
162	delete(extraDataTlvMap, r.Type())	2✔
163	}	2✔
164	}
165
166	// Any records from the extra data TLV map which are in the custom
167	// records TLV type range will be included in the custom records field
168	// and removed from the extra data field.
169	customRecordsTlvMap := make(tlv.TypeMap, len(extraDataTlvMap))	2✔
170	for k, v := range extraDataTlvMap {	4✔
171	// Skip records that are not in the custom records TLV type	2✔
172	// range.	2✔
173	if k < MinCustomRecordsTlvType {	2✔
UNCOV 174	continue	×
175	}
176
177	// Include the record in the custom records map.
178	customRecordsTlvMap[k] = v	2✔
179		2✔
180	// Now that the record is included in the custom records map,	2✔
181	// we can remove it from the extra data TLV map.	2✔
182	delete(extraDataTlvMap, k)	2✔
183	}
184
185	// Set the custom records field to the custom records specific TLV
186	// record map.
187	customRecords, err := NewCustomRecords(customRecordsTlvMap)	2✔
188	if err != nil {	2✔
189	return nil, nil, nil, err	×
190	}	×
191
192	// Encode the remaining records back into the extra data field. These
193	// records are not in the custom records TLV type range and do not
194	// have associated fields in the struct that produced the records.
195	extraData, err := NewExtraOpaqueData(extraDataTlvMap)	2✔
196	if err != nil {	2✔
197	return nil, nil, nil, err	×
198	}	×
199
200	// Help with unit testing where we might have the empty value (nil) for
201	// the extra data instead of the default that's returned by the
202	// constructor (empty slice).
203	if len(extraData) == 0 {	4✔
204	extraData = nil	2✔
205	}	2✔
206
207	return customRecords, parsedKnownRecords, extraData, nil	2✔
208	}
209
210	// MergeAndEncode merges the known records with the extra data and custom
211	// records, then encodes the merged records into raw bytes.
212	func MergeAndEncode(knownRecords []tlv.RecordProducer,
213	extraData ExtraOpaqueData, customRecords CustomRecords) ([]byte,
214	error) {	2✔
215		2✔
216	// Construct a slice of all the records that we should include in the	2✔
217	// message extra data field. We will start by including any records from	2✔
218	// the extra data field.	2✔
219	mergedRecords, err := extraData.RecordProducers()	2✔
220	if err != nil {	2✔
221	return nil, err	×
222	}	×
223
224	// Merge the known and extra data records.
225	mergedRecords = append(mergedRecords, knownRecords...)	2✔
226		2✔
227	// Include custom records in the extra data wire field if they are	2✔
228	// present. Ensure that the custom records are validated before encoding	2✔
229	// them.	2✔
230	if err := customRecords.Validate(); err != nil {	2✔
UNCOV 231	return nil, fmt.Errorf("custom records validation error: %w",	×
UNCOV 232	err)	×
UNCOV 233	}	×
234
235	// Extend the message extra data records slice with TLV records from the
236	// custom records field.
237	mergedRecords = append(	2✔
238	mergedRecords, customRecords.RecordProducers()...,	2✔
239	)	2✔
240		2✔
241	// Now we can sort the records and make sure there are no records with	2✔
242	// the same type that would collide when encoding.	2✔
243	sortedRecords := ProduceRecordsSorted(mergedRecords...)	2✔
244	if err := AssertUniqueTypes(sortedRecords); err != nil {	2✔
UNCOV 245	return nil, err	×
UNCOV 246	}	×
247
248	return EncodeRecords(sortedRecords)	2✔
249	}

lightningnetwork / lnd / 11170835610

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous