Skip to content

Commit e9ee69a

Browse files
committed
orchestrator: accept either expiration metadata copy
1 parent 8973351 commit e9ee69a

2 files changed

Lines changed: 57 additions & 3 deletions

File tree

‎orchestrator/payment_engine.go‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,16 +354,24 @@ func (e *PaymentEngine) ChallengePrice(runner, manifest string) (int64, string,
354354
// using the recipient HMAC.
355355
func (e *PaymentEngine) authenticatePayment(payment wire.Payment, auth wire.AuthToken) (pm.TicketParams, *big.Int, error) {
356356
p := payment.TicketParams
357+
// Accept either complete expiration copy; if both are supplied they must match.
358+
expiration := payment.Expiration
359+
if expiration.CreationRound == 0 && len(expiration.CreationRoundBlockHash) == 0 {
360+
expiration = p.Expiration
361+
}
357362
if len(payment.PayerAddress) != 20 || len(p.Recipient) != 20 || ethcommon.BytesToAddress(p.Recipient) != e.recipient ||
358363
len(p.FaceValue) == 0 || len(p.FaceValue) > 32 || len(p.WinProb) == 0 || len(p.WinProb) > 32 ||
359364
len(p.Seed) == 0 || len(p.Seed) > 32 || len(p.ExpirationBlock) == 0 || len(p.ExpirationBlock) > 32 || len(p.RecipientRandHash) != 32 ||
360-
payment.Expiration.CreationRound <= 0 || len(payment.Expiration.CreationRoundBlockHash) != 32 ||
361-
payment.Expiration.CreationRound != p.Expiration.CreationRound || !bytes.Equal(payment.Expiration.CreationRoundBlockHash, p.Expiration.CreationRoundBlockHash) ||
365+
expiration.CreationRound <= 0 || len(expiration.CreationRoundBlockHash) != 32 ||
362366
payment.ExpectedPrice.PricePerUnit <= 0 || payment.ExpectedPrice.UnitsPerPrice <= 0 || auth.SessionID == "" || time.Now().Unix() > auth.Expiration ||
363367
!hmac.Equal(auth.Token, e.authToken(auth.SessionID, auth.Expiration).Token) {
364368
return pm.TicketParams{}, nil, ErrInvalidPayment
365369
}
366-
params := pm.TicketParams{Recipient: e.recipient, FaceValue: new(big.Int).SetBytes(p.FaceValue), WinProb: new(big.Int).SetBytes(p.WinProb), RecipientRandHash: ethcommon.BytesToHash(p.RecipientRandHash), Seed: new(big.Int).SetBytes(p.Seed), ExpirationBlock: new(big.Int).SetBytes(p.ExpirationBlock), ExpirationParams: &pm.TicketExpirationParams{CreationRound: payment.Expiration.CreationRound, CreationRoundBlockHash: ethcommon.BytesToHash(payment.Expiration.CreationRoundBlockHash)}}
370+
if (p.Expiration.CreationRound != 0 || len(p.Expiration.CreationRoundBlockHash) != 0) &&
371+
(expiration.CreationRound != p.Expiration.CreationRound || !bytes.Equal(expiration.CreationRoundBlockHash, p.Expiration.CreationRoundBlockHash)) {
372+
return pm.TicketParams{}, nil, ErrInvalidPayment
373+
}
374+
params := pm.TicketParams{Recipient: e.recipient, FaceValue: new(big.Int).SetBytes(p.FaceValue), WinProb: new(big.Int).SetBytes(p.WinProb), RecipientRandHash: ethcommon.BytesToHash(p.RecipientRandHash), Seed: new(big.Int).SetBytes(p.Seed), ExpirationBlock: new(big.Int).SetBytes(p.ExpirationBlock), ExpirationParams: &pm.TicketExpirationParams{CreationRound: expiration.CreationRound, CreationRoundBlockHash: ethcommon.BytesToHash(expiration.CreationRoundBlockHash)}}
367375
if params.FaceValue.Sign() <= 0 || params.WinProb.Sign() <= 0 || params.WinProb.Cmp(maxWinProb) >= 0 {
368376
return pm.TicketParams{}, nil, ErrInvalidPayment
369377
}

‎orchestrator/payment_recipient_test.go‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,36 @@ func receiveRecipientPayment(t *testing.T, e *PaymentEngine, key *ecdsa.PrivateK
135135
return receive()
136136
}
137137

138+
func TestRecipientHMACExpirationCopies(t *testing.T) {
139+
e, _, key, _ := newRecipientTestEngine(t)
140+
info := issueRecipientParams(t, e, key)
141+
for _, copies := range []string{"both", "top-level", "nested"} {
142+
t.Run(copies, func(t *testing.T) {
143+
payment := wire.Payment{PayerAddress: crypto.PubkeyToAddress(key.PublicKey).Bytes(), TicketParams: info.TicketParams, Expiration: info.TicketParams.Expiration, ExpectedPrice: info.Price}
144+
if copies == "top-level" {
145+
// go-livepeer omits the nested copy.
146+
payment.TicketParams.Expiration = wire.ExpirationParams{}
147+
} else if copies == "nested" {
148+
payment.Expiration = wire.ExpirationParams{}
149+
}
150+
payment, err := wire.DecodePayment(wire.EncodePayment(payment))
151+
require.NoError(t, err)
152+
params, _, err := e.authenticatePayment(payment, info.Auth)
153+
require.NoError(t, err)
154+
require.Equal(t, info.TicketParams.Expiration.CreationRound, params.ExpirationParams.CreationRound)
155+
require.Equal(t, info.TicketParams.Expiration.CreationRoundBlockHash, params.ExpirationParams.CreationRoundBlockHash.Bytes())
156+
if copies != "nested" {
157+
payment.Expiration.CreationRound++
158+
}
159+
if copies != "top-level" {
160+
payment.TicketParams.Expiration.CreationRound++
161+
}
162+
_, _, err = e.authenticatePayment(payment, info.Auth)
163+
require.ErrorIs(t, err, ErrInvalidPayment, "the selected expiration must be bound by the HMAC")
164+
})
165+
}
166+
}
167+
138168
func TestRecipientHMACRejectsTamperedParameters(t *testing.T) {
139169
e, _, key, _ := newRecipientTestEngine(t)
140170
original := issueRecipientParams(t, e, key)
@@ -147,6 +177,22 @@ func TestRecipientHMACRejectsTamperedParameters(t *testing.T) {
147177
"expiry block": func(p *wire.Payment, _ *wire.AuthToken) { p.TicketParams.ExpirationBlock = big.NewInt(91).Bytes() },
148178
"price numerator": func(p *wire.Payment, _ *wire.AuthToken) { p.ExpectedPrice.PricePerUnit++ },
149179
"price denominator": func(p *wire.Payment, _ *wire.AuthToken) { p.ExpectedPrice.UnitsPerPrice++ },
180+
"no expiration": func(p *wire.Payment, _ *wire.AuthToken) {
181+
p.Expiration = wire.ExpirationParams{}
182+
p.TicketParams.Expiration = wire.ExpirationParams{}
183+
},
184+
"top round missing": func(p *wire.Payment, _ *wire.AuthToken) { p.Expiration.CreationRound = 0 },
185+
"top hash missing": func(p *wire.Payment, _ *wire.AuthToken) { p.Expiration.CreationRoundBlockHash = nil },
186+
"split expiration": func(p *wire.Payment, _ *wire.AuthToken) {
187+
p.Expiration.CreationRoundBlockHash = nil
188+
p.TicketParams.Expiration.CreationRound = 0
189+
},
190+
"round conflict": func(p *wire.Payment, _ *wire.AuthToken) { p.TicketParams.Expiration.CreationRound++ },
191+
"hash conflict": func(p *wire.Payment, _ *wire.AuthToken) {
192+
p.TicketParams.Expiration.CreationRoundBlockHash = ethcommon.HexToHash("0x4321").Bytes()
193+
},
194+
"round omitted": func(p *wire.Payment, _ *wire.AuthToken) { p.TicketParams.Expiration.CreationRound = 0 },
195+
"hash omitted": func(p *wire.Payment, _ *wire.AuthToken) { p.TicketParams.Expiration.CreationRoundBlockHash = nil },
150196
"round": func(p *wire.Payment, _ *wire.AuthToken) {
151197
p.Expiration.CreationRound++
152198
p.TicketParams.Expiration.CreationRound++

0 commit comments

Comments
 (0)