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

fix: resolve address before check permission #314

Merged
merged 2 commits into from
Feb 22, 2023
Merged

fix: resolve address before check permission #314

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3c9393
fix: resolve address before check permission
simlecode Feb 21, 2023
3d88ea3
chore: fix test
simlecode Feb 21, 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
28 changes: 28 additions & 0 deletions api/messager_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-jsonrpc/auth"
"github.com/filecoin-project/venus-messager/publisher/pubsub"
v1 "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
"github.com/filecoin-project/venus/venus-shared/api/messager"
venusTypes "github.com/filecoin-project/venus/venus-shared/types"
types "github.com/filecoin-project/venus/venus-shared/types/messager"
Expand All @@ -32,6 +33,7 @@ type ImplParams struct {
SharedParamsService *service.SharedParamsService
Net pubsub.INet
AuthClient jwtclient.IAuthClient
NodeClient v1.FullNode
}

func NewMessageImp(implParams ImplParams) *MessageImp {
Expand All @@ -42,6 +44,7 @@ func NewMessageImp(implParams ImplParams) *MessageImp {
ParamsSrv: implParams.SharedParamsService,
Net: implParams.Net,
AuthClient: implParams.AuthClient,
NodeClient: implParams.NodeClient,
}
}

Expand All @@ -52,6 +55,7 @@ type MessageImp struct {
ParamsSrv *service.SharedParamsService
Net pubsub.INet
AuthClient jwtclient.IAuthClient
NodeClient v1.FullNode
}

var _ messager.IMessager = (*MessageImp)(nil)
Expand All @@ -71,14 +75,38 @@ func (m MessageImp) WaitMessage(ctx context.Context, id string, confidence uint6
return m.MessageSrv.WaitMessage(ctx, id, confidence)
}

func (m MessageImp) resolveAddress(ctx context.Context, addr address.Address) (address.Address, error) {
if addr.Protocol() == address.ID {
addrTmp, err := m.NodeClient.StateAccountKey(ctx, addr, venusTypes.EmptyTSK)
if err != nil {
return address.Undef, fmt.Errorf("getting key address %s failed: %w", addr, err)
}
log.Infof("Push from ID address (%s), adjusting to %s", addr, addrTmp)

addr = addrTmp
}

return addr, nil
}

func (m MessageImp) PushMessage(ctx context.Context, msg *venusTypes.Message, meta *types.SendSpec) (string, error) {
var err error
msg.From, err = m.resolveAddress(ctx, msg.From)
if err != nil {
return "", err
}
if err := jwtclient.CheckPermissionBySigner(ctx, m.AuthClient, msg.From); err != nil {
return "", err
}
return m.MessageSrv.PushMessage(ctx, msg, meta)
}

func (m MessageImp) PushMessageWithId(ctx context.Context, id string, msg *venusTypes.Message, meta *types.SendSpec) (string, error) {
var err error
msg.From, err = m.resolveAddress(ctx, msg.From)
if err != nil {
return "", err
}
if err := jwtclient.CheckPermissionBySigner(ctx, m.AuthClient, msg.From); err != nil {
return "", err
}
Expand Down