[#525] ir/container: Simplify the approach to verify token signature
In recent change of API Go library `Token.Verify` signature was implemented. Replace previous version-casting approach with new method call in token signature check stage. Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
23c5277014
commit
937171911a
1 changed files with 1 additions and 16 deletions
|
@ -11,8 +11,6 @@ import (
|
||||||
cid "github.com/nspcc-dev/neofs-api-go/pkg/container/id"
|
cid "github.com/nspcc-dev/neofs-api-go/pkg/container/id"
|
||||||
"github.com/nspcc-dev/neofs-api-go/pkg/owner"
|
"github.com/nspcc-dev/neofs-api-go/pkg/owner"
|
||||||
"github.com/nspcc-dev/neofs-api-go/pkg/session"
|
"github.com/nspcc-dev/neofs-api-go/pkg/session"
|
||||||
"github.com/nspcc-dev/neofs-api-go/util/signature"
|
|
||||||
signature2 "github.com/nspcc-dev/neofs-api-go/v2/signature"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -106,20 +104,7 @@ func (cp *Processor) checkKeyOwnershipWithToken(ownerIDSrc ownerIDSource, key *k
|
||||||
|
|
||||||
func (cp *Processor) checkSessionToken(token *session.Token) error {
|
func (cp *Processor) checkSessionToken(token *session.Token) error {
|
||||||
// verify signature
|
// verify signature
|
||||||
|
if !token.VerifySignature() {
|
||||||
// TODO: need more convenient way to do this
|
|
||||||
// e.g. provide VerifySignature method from Token
|
|
||||||
|
|
||||||
// FIXME: do all so as not to deepen in the version
|
|
||||||
tokenV2 := token.ToV2()
|
|
||||||
|
|
||||||
signWrapper := signature2.StableMarshalerWrapper{
|
|
||||||
SM: tokenV2.GetBody(),
|
|
||||||
}
|
|
||||||
if err := signature.VerifyDataWithSource(signWrapper, func() (key, sig []byte) {
|
|
||||||
tokenSignature := tokenV2.GetSignature()
|
|
||||||
return tokenSignature.GetKey(), tokenSignature.GetSign()
|
|
||||||
}); err != nil {
|
|
||||||
return errors.New("invalid signature")
|
return errors.New("invalid signature")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue