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

broadcaster introspection: update verification sigverification #2844

Merged
merged 6 commits into from
Aug 23, 2023
Merged

broadcaster introspection: update verification sigverification #2844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b124c8
update verify.go sigVerification to return early if sess.Address() is…
ad-astra-video Aug 17, 2023
a69ff3b
update verify_test.go for change in early exit of sigVerification
ad-astra-video Aug 17, 2023
bb087b3
update test broadcastsession to add TicketParams.Recipient
ad-astra-video Aug 19, 2023
45547de
update sigVerification early exit per comment
ad-astra-video Aug 22, 2023
fa7e679
update tests for early exit change in sigVerification
ad-astra-video Aug 23, 2023
a7d76fe
Merge branch 'master' into av-public-logs-update-pr-verify
leszko Aug 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
5 changes: 3 additions & 2 deletions server/broadcast_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ func StubBroadcastSession(transcoder string) *BroadcastSession {
PricePerUnit: 1,
PixelsPerUnit: 1,
},
AuthToken: stubAuthToken,
AuthToken: stubAuthToken,
TicketParams: &net.TicketParams{Recipient: pm.RandAddress().Bytes()},
},
OrchestratorScore: common.Score_Trusted,
lock: &sync.RWMutex{},
Expand Down Expand Up @@ -1733,7 +1734,7 @@ func genBcastSess(ctx context.Context, t *testing.T, url string, os drivers.OSSe
Broadcaster: stubBroadcaster2(),
Params: &core.StreamParameters{ManifestID: mid, Profiles: []ffmpeg.VideoProfile{ffmpeg.P144p30fps16x9}, OS: os},
BroadcasterOS: os,
OrchestratorInfo: &net.OrchestratorInfo{Transcoder: transcoderURL, AuthToken: stubAuthToken},
OrchestratorInfo: &net.OrchestratorInfo{Transcoder: transcoderURL, AuthToken: stubAuthToken, TicketParams: &net.TicketParams{Recipient: pm.RandAddress().Bytes()}},
OrchestratorScore: common.Score_Trusted,
lock: &sync.RWMutex{},
}
Expand Down
2 changes: 1 addition & 1 deletion verification/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ func IsRetryable(err error) bool {
}

func (sv *SegmentVerifier) sigVerification(params *Params) error {
if params.Orchestrator == nil || params.Orchestrator.TicketParams == nil {
if params.Orchestrator == nil || params.Orchestrator.Address == nil || params.Orchestrator.TicketParams == nil {
return nil
}

Expand Down
12 changes: 7 additions & 5 deletions verification/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
ethcommon "github.com/ethereum/go-ethereum/common"

"github.com/livepeer/go-livepeer/net"
"github.com/livepeer/go-livepeer/pm"
"github.com/livepeer/go-tools/drivers"
"github.com/livepeer/lpms/ffmpeg"
)
Expand Down Expand Up @@ -166,14 +167,15 @@ func TestVerify(t *testing.T) {
{Url: "../server/test.flv", Pixels: pxls},
}}
renditions = [][]byte{}
res, err = sv.Verify(&Params{Results: data, Orchestrator: &net.OrchestratorInfo{TicketParams: &net.TicketParams{}}, Renditions: renditions})
res, err = sv.Verify(&Params{Results: data, Orchestrator: &net.OrchestratorInfo{Address: pm.RandAddress().Bytes(), TicketParams: &net.TicketParams{}}, Renditions: renditions})
assert.Equal(errPMCheckFailed, err)
assert.Nil(res)

// Check sig verifier passes when len(params.Results.Segments) == len(params.Renditions) and sig is valid
// We use this stubVerifier to make sure that ffmpeg doesnt try to read from a file
// Verify sig against ticket recipient address
recipientAddr := ethcommon.BytesToAddress([]byte("foo"))
orchAddr := ethcommon.Address{}
sv = &SegmentVerifier{policy: &Policy{Verifier: &stubVerifier{
results: nil,
err: nil,
Expand All @@ -188,12 +190,12 @@ func TestVerify(t *testing.T) {

renditions = [][]byte{{0}, {0}}
params := &net.TicketParams{Recipient: recipientAddr.Bytes()}
res, err = sv.Verify(&Params{Results: data, Orchestrator: &net.OrchestratorInfo{TicketParams: params}, Renditions: renditions})
res, err = sv.Verify(&Params{Results: data, Orchestrator: &net.OrchestratorInfo{Address: orchAddr.Bytes(), TicketParams: params}, Renditions: renditions})
assert.Nil(err)
assert.NotNil(res)

// Verify sig against orchestrator provided address
orchAddr := ethcommon.BytesToAddress([]byte("bar"))
orchAddr = ethcommon.BytesToAddress([]byte("bar"))
sv = &SegmentVerifier{
policy: &Policy{Verifier: &stubVerifier{}, Retries: 2},
verifySig: func(addr ethcommon.Address, msg []byte, sig []byte) bool { return addr == orchAddr },
Expand All @@ -212,13 +214,13 @@ func TestVerify(t *testing.T) {
{Url: "uvw", Pixels: pxls},
{Url: "xyz", Pixels: pxls},
}}
res, err = sv.Verify(&Params{Results: data, Orchestrator: &net.OrchestratorInfo{TicketParams: &net.TicketParams{}}, Renditions: renditions})
res, err = sv.Verify(&Params{Results: data, Orchestrator: &net.OrchestratorInfo{Address: []byte("bar"), TicketParams: params}, Renditions: renditions})
assert.Equal(errPMCheckFailed, err)
assert.Nil(res)

// Check sig verifier runs and fails (due to missing sig) even when policy is nil
sv = NewSegmentVerifier(nil)
res, err = sv.Verify(&Params{Results: data, Orchestrator: &net.OrchestratorInfo{TicketParams: &net.TicketParams{}}, Renditions: renditions})
res, err = sv.Verify(&Params{Results: data, Orchestrator: &net.OrchestratorInfo{Address: []byte("bar"), TicketParams: params}, Renditions: renditions})
assert.Equal(errPMCheckFailed, err)
assert.Nil(res)

Expand Down