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

opt: ensure the type of signature data #330

Merged
merged 1 commit into from
May 24, 2023
Merged

opt: ensure the type of signature data #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions storageprovider/deal_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ func (storageDealPorcess *StorageDealProcessImpl) SendSignedResponse(ctx context

respEx := &types.SignInfo{
Data: resp,
Type: vTypes.MTUnknown,
Type: vTypes.MTNetWorkResponse,
Addr: mAddr,
}
sig, err := storageDealPorcess.spn.Sign(ctx, respEx)
Expand All @@ -591,7 +591,7 @@ func (storageDealPorcess *StorageDealProcessImpl) SendSignedResponse(ctx context
Signature: sig,
}

err = s.WriteDealResponse(signedResponse, storageDealPorcess.spn.SignWithGivenMiner(mAddr))
err = s.WriteDealResponse(signedResponse, nil)
if err != nil {
// Assume client disconnected
_ = storageDealPorcess.conns.Disconnect(resp.Proposal)
Expand Down
12 changes: 12 additions & 0 deletions storageprovider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,18 @@ func (pna *ProviderNodeAdapter) Sign(ctx context.Context, data interface{}) (*cr

func (pna *ProviderNodeAdapter) SignWithGivenMiner(mAddr address.Address) network.ResigningFunc {
return func(ctx context.Context, data interface{}) (*crypto.Signature, error) {
//mt := types.MTUnknown
//switch data.(type) {
//case *migrations.StorageAsk0:
//
//case *migrations.ProviderDealState0:
//
//case *migrations.Response0:
//
//default:
// return nil, fmt.Errorf("not supported signature data")
//}

msgBytes, err := cborutil.Dump(data)
if err != nil {
return nil, fmt.Errorf("serializing: %w", err)
Expand Down
11 changes: 6 additions & 5 deletions storageprovider/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ func (storageDealStream *StorageDealStream) HandleAskStream(s network.StorageAsk
Ask: ask.ToChainAsk(),
}

if err := s.WriteAskResponse(resp, storageDealStream.spn.SignWithGivenMiner(ar.Miner)); err != nil {
// if err := s.WriteAskResponse(resp, storageDealStream.spn.SignWithGivenMiner(ar.Miner)); err != nil {
if err := s.WriteAskResponse(resp, nil); err != nil {
log.Errorf("failed to write ask response: %s", err)
return
}
Expand Down Expand Up @@ -229,7 +230,7 @@ func (storageDealStream *StorageDealStream) HandleDealStatusStream(s network.Dea

signature, err := storageDealStream.spn.Sign(ctx, &types.SignInfo{
Data: dealState,
Type: vTypes.MTUnknown,
Type: vTypes.MTProviderDealState,
Addr: mAddr,
})
if err != nil {
Expand All @@ -242,7 +243,7 @@ func (storageDealStream *StorageDealStream) HandleDealStatusStream(s network.Dea
Signature: *signature,
}

if err := s.WriteDealStatusResponse(response, storageDealStream.spn.SignWithGivenMiner(mAddr)); err != nil {
if err := s.WriteDealStatusResponse(response, nil); err != nil {
log.Warnf("failed to write deal status response: %s", err)
return
}
Expand All @@ -252,15 +253,15 @@ func (storageDealStream *StorageDealStream) resendProposalResponse(s network.Sto
resp := &network.Response{State: md.State, Message: md.Message, Proposal: md.ProposalCid}
sig, err := storageDealStream.spn.Sign(context.TODO(), &types.SignInfo{
Data: resp,
Type: vTypes.MTUnknown,
Type: vTypes.MTNetWorkResponse,
Addr: md.Proposal.Provider,
})
if err != nil {
storageDealStream.eventPublisher.Publish(storagemarket.ProviderEventNodeErrored, md)
return fmt.Errorf("failed to sign response message: %w", err)
}

return s.WriteDealResponse(network.SignedResponse{Response: *resp, Signature: sig}, storageDealStream.spn.SignWithGivenMiner(md.Proposal.Provider))
return s.WriteDealResponse(network.SignedResponse{Response: *resp, Signature: sig}, nil)
}

func (storageDealStream *StorageDealStream) processDealStatusRequest(ctx context.Context, request *network.DealStatusRequest) (*storagemarket.ProviderDealState, address.Address, error) {
Expand Down