1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
|
package types
import (
"bytes"
"encoding/hex"
"fmt"
"io"
"strconv"
)
const (
// Delim is a key-value separator
Delim = "="
// EOL is a line sepator
EOL = "\n"
// NumField* is the number of unique keys in an incoming ASCII message
NumFieldLeaf = 4
NumFieldSignedTreeHead = 5
NumFieldConsistencyProof = 3
NumFieldInclusionProof = 3
NumFieldLeavesRequest = 2
NumFieldInclusionProofRequest = 2
NumFieldConsistencyProofRequest = 2
NumFieldLeafRequest = 5
NumFieldCosignatureRequest = 2
// New leaf keys
ShardHint = "shard_hint"
Checksum = "checksum"
SignatureOverMessage = "signature_over_message"
VerificationKey = "verification_key"
DomainHint = "domain_hint"
// Inclusion proof keys
LeafHash = "leaf_hash"
LeafIndex = "leaf_index"
InclusionPath = "inclusion_path"
// Consistency proof keys
NewSize = "new_size"
OldSize = "old_size"
ConsistencyPath = "consistency_path"
// Range of leaves keys
StartSize = "start_size"
EndSize = "end_size"
// Tree head keys
Timestamp = "timestamp"
TreeSize = "tree_size"
RootHash = "root_hash"
// Signature and signer-identity keys
Signature = "signature"
KeyHash = "key_hash"
)
// MessageASCI is a wrapper that manages ASCII key-value pairs
type MessageASCII struct {
m map[string][]string
}
// NewMessageASCII unpacks an incoming ASCII message
func NewMessageASCII(r io.Reader, numFieldExpected int) (*MessageASCII, error) {
buf, err := io.ReadAll(r)
if err != nil {
return nil, fmt.Errorf("ReadAll: %v", err)
}
lines := bytes.Split(buf, []byte(EOL))
if len(lines) <= 1 {
return nil, fmt.Errorf("Not enough lines: empty")
}
lines = lines[:len(lines)-1] // valid message => split gives empty last line
msg := MessageASCII{make(map[string][]string)}
for _, line := range lines {
split := bytes.Index(line, []byte(Delim))
if split == -1 {
return nil, fmt.Errorf("invalid line: %v", string(line))
}
key := string(line[:split])
value := string(line[split+len(Delim):])
values, ok := msg.m[key]
if !ok {
values = nil
msg.m[key] = values
}
msg.m[key] = append(values, value)
}
if msg.NumField() != numFieldExpected {
return nil, fmt.Errorf("Unexpected number of keys: %v", msg.NumField())
}
return &msg, nil
}
// NumField returns the number of unique keys
func (msg *MessageASCII) NumField() int {
return len(msg.m)
}
// GetStrings returns a list of strings
func (msg *MessageASCII) GetStrings(key string) []string {
strs, ok := msg.m[key]
if !ok {
return nil
}
return strs
}
// GetString unpacks a string
func (msg *MessageASCII) GetString(key string) (string, error) {
strs := msg.GetStrings(key)
if len(strs) != 1 {
return "", fmt.Errorf("expected one string: %v", strs)
}
return strs[0], nil
}
// GetUint64 unpacks an uint64
func (msg *MessageASCII) GetUint64(key string) (uint64, error) {
str, err := msg.GetString(key)
if err != nil {
return 0, fmt.Errorf("GetString: %v", err)
}
num, err := strconv.ParseUint(str, 10, 64)
if err != nil {
return 0, fmt.Errorf("ParseUint: %v", err)
}
return num, nil
}
// GetHash unpacks a hash
func (msg *MessageASCII) GetHash(key string) (*[HashSize]byte, error) {
str, err := msg.GetString(key)
if err != nil {
return nil, fmt.Errorf("GetString: %v", err)
}
var hash [HashSize]byte
if err := decodeHex(str, hash[:]); err != nil {
return nil, fmt.Errorf("decodeHex: %v", err)
}
return &hash, nil
}
// GetSignature unpacks a signature
func (msg *MessageASCII) GetSignature(key string) (*[SignatureSize]byte, error) {
str, err := msg.GetString(key)
if err != nil {
return nil, fmt.Errorf("GetString: %v", err)
}
var signature [SignatureSize]byte
if err := decodeHex(str, signature[:]); err != nil {
return nil, fmt.Errorf("decodeHex: %v", err)
}
return &signature, nil
}
// GetVerificationKey unpacks a verification key
func (msg *MessageASCII) GetVerificationKey(key string) (*[VerificationKeySize]byte, error) {
str, err := msg.GetString(key)
if err != nil {
return nil, fmt.Errorf("GetString: %v", err)
}
var vk [VerificationKeySize]byte
if err := decodeHex(str, vk[:]); err != nil {
return nil, fmt.Errorf("decodeHex: %v", err)
}
return &vk, nil
}
// decodeHex decodes a hex-encoded string into an already-sized byte slice
func decodeHex(str string, out []byte) error {
buf, err := hex.DecodeString(str)
if err != nil {
return fmt.Errorf("DecodeString: %v", err)
}
if len(buf) != len(out) {
return fmt.Errorf("invalid length: %v", len(buf))
}
copy(out, buf)
return nil
}
/*
*
* MarshalASCII wrappers for types that the log server outputs
*
*/
func (l *Leaf) MarshalASCII(w io.Writer) error {
if err := writeASCII(w, ShardHint, strconv.FormatUint(l.ShardHint, 10)); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
if err := writeASCII(w, Checksum, hex.EncodeToString(l.Checksum[:])); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
if err := writeASCII(w, Signature, hex.EncodeToString(l.Signature[:])); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
if err := writeASCII(w, KeyHash, hex.EncodeToString(l.KeyHash[:])); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
return nil
}
func (sth *SignedTreeHead) MarshalASCII(w io.Writer) error {
if err := writeASCII(w, Timestamp, strconv.FormatUint(sth.Timestamp, 10)); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
if err := writeASCII(w, TreeSize, strconv.FormatUint(sth.TreeSize, 10)); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
if err := writeASCII(w, RootHash, hex.EncodeToString(sth.RootHash[:])); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
for _, sigident := range sth.SigIdent {
if err := writeASCII(w, Signature, hex.EncodeToString(sigident.Signature[:])); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
if err := writeASCII(w, KeyHash, hex.EncodeToString(sigident.KeyHash[:])); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
}
return nil
}
func (p *ConsistencyProof) MarshalASCII(w io.Writer) error {
if err := writeASCII(w, NewSize, strconv.FormatUint(p.NewSize, 10)); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
if err := writeASCII(w, OldSize, strconv.FormatUint(p.OldSize, 10)); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
for _, hash := range p.Path {
if err := writeASCII(w, ConsistencyPath, hex.EncodeToString(hash[:])); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
}
return nil
}
func (p *InclusionProof) MarshalASCII(w io.Writer) error {
if err := writeASCII(w, TreeSize, strconv.FormatUint(p.TreeSize, 10)); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
if err := writeASCII(w, LeafIndex, strconv.FormatUint(p.LeafIndex, 10)); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
for _, hash := range p.Path {
if err := writeASCII(w, InclusionPath, hex.EncodeToString(hash[:])); err != nil {
return fmt.Errorf("writeASCII: %v", err)
}
}
return nil
}
func writeASCII(w io.Writer, key, value string) error {
if _, err := fmt.Fprintf(w, "%s%s%s%s", key, Delim, value, EOL); err != nil {
return fmt.Errorf("Fprintf: %v", err)
}
return nil
}
/*
*
* Unmarshal ASCII wrappers that the log server and/or log clients receive.
*
*/
func (ll *LeafList) UnmarshalASCII(r io.Reader) error {
return nil
}
func (sth *SignedTreeHead) UnmarshalASCII(r io.Reader) error {
msg, err := NewMessageASCII(r, NumFieldSignedTreeHead)
if err != nil {
return fmt.Errorf("NewMessageASCII: %v", err)
}
// TreeHead
if sth.Timestamp, err = msg.GetUint64(Timestamp); err != nil {
return fmt.Errorf("GetUint64(Timestamp): %v", err)
}
if sth.TreeSize, err = msg.GetUint64(TreeSize); err != nil {
return fmt.Errorf("GetUint64(TreeSize): %v", err)
}
if sth.RootHash, err = msg.GetHash(RootHash); err != nil {
return fmt.Errorf("GetHash(RootHash): %v", err)
}
// SigIdent
signatures := msg.GetStrings(Signature)
if len(signatures) == 0 {
return fmt.Errorf("no signer")
}
keyHashes := msg.GetStrings(KeyHash)
if len(signatures) != len(keyHashes) {
return fmt.Errorf("mismatched signature-signer count")
}
sth.SigIdent = make([]*SigIdent, 0, len(signatures))
for i, n := 0, len(signatures); i < n; i++ {
var signature [SignatureSize]byte
if err := decodeHex(signatures[i], signature[:]); err != nil {
return fmt.Errorf("decodeHex: %v", err)
}
var hash [HashSize]byte
if err := decodeHex(keyHashes[i], hash[:]); err != nil {
return fmt.Errorf("decodeHex: %v", err)
}
sth.SigIdent = append(sth.SigIdent, &SigIdent{
Signature: &signature,
KeyHash: &hash,
})
}
return nil
}
func (p *InclusionProof) UnmarshalASCII(r io.Reader) error {
return nil
}
func (p *ConsistencyProof) UnmarshalASCII(r io.Reader) error {
return nil
}
func (req *InclusionProofRequest) UnmarshalASCII(r io.Reader) error {
msg, err := NewMessageASCII(r, NumFieldInclusionProofRequest)
if err != nil {
return fmt.Errorf("NewMessageASCII: %v", err)
}
if req.LeafHash, err = msg.GetHash(LeafHash); err != nil {
return fmt.Errorf("GetHash(LeafHash): %v", err)
}
if req.TreeSize, err = msg.GetUint64(TreeSize); err != nil {
return fmt.Errorf("GetUint64(TreeSize): %v", err)
}
return nil
}
func (req *ConsistencyProofRequest) UnmarshalASCII(r io.Reader) error {
msg, err := NewMessageASCII(r, NumFieldConsistencyProofRequest)
if err != nil {
return fmt.Errorf("NewMessageASCII: %v", err)
}
if req.NewSize, err = msg.GetUint64(NewSize); err != nil {
return fmt.Errorf("GetUint64(NewSize): %v", err)
}
if req.OldSize, err = msg.GetUint64(OldSize); err != nil {
return fmt.Errorf("GetUint64(OldSize): %v", err)
}
return nil
}
func (req *LeavesRequest) UnmarshalASCII(r io.Reader) error {
msg, err := NewMessageASCII(r, NumFieldLeavesRequest)
if err != nil {
return fmt.Errorf("NewMessageASCII: %v", err)
}
if req.StartSize, err = msg.GetUint64(StartSize); err != nil {
return fmt.Errorf("GetUint64(StartSize): %v", err)
}
if req.EndSize, err = msg.GetUint64(EndSize); err != nil {
return fmt.Errorf("GetUint64(EndSize): %v", err)
}
return nil
}
func (req *LeafRequest) UnmarshalASCII(r io.Reader) error {
msg, err := NewMessageASCII(r, NumFieldLeafRequest)
if err != nil {
return fmt.Errorf("NewMessageASCII: %v", err)
}
if req.ShardHint, err = msg.GetUint64(ShardHint); err != nil {
return fmt.Errorf("GetUint64(ShardHint): %v", err)
}
if req.Checksum, err = msg.GetHash(Checksum); err != nil {
return fmt.Errorf("GetHash(Checksum): %v", err)
}
if req.Signature, err = msg.GetSignature(Signature); err != nil {
return fmt.Errorf("GetSignature: %v", err)
}
if req.VerificationKey, err = msg.GetVerificationKey(VerificationKey); err != nil {
return fmt.Errorf("GetVerificationKey: %v", err)
}
if req.DomainHint, err = msg.GetString(DomainHint); err != nil {
return fmt.Errorf("GetString(DomainHint): %v", err)
}
return nil
}
func (req *CosignatureRequest) UnmarshalASCII(r io.Reader) error {
msg, err := NewMessageASCII(r, NumFieldCosignatureRequest)
if err != nil {
return fmt.Errorf("NewMessageASCII: %v", err)
}
if req.Signature, err = msg.GetSignature(Signature); err != nil {
return fmt.Errorf("GetSignature: %v", err)
}
if req.KeyHash, err = msg.GetHash(KeyHash); err != nil {
return fmt.Errorf("GetHash(KeyHash): %v", err)
}
return nil
}
|