diff --git a/client/session.go b/client/session.go index 554d3a55..3e1180e3 100644 --- a/client/session.go +++ b/client/session.go @@ -3,11 +3,14 @@ package client import ( "context" "crypto/ecdsa" + "fmt" "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc" "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) @@ -33,6 +36,30 @@ func (x *PrmSessionCreate) UseKey(key ecdsa.PrivateKey) { x.key = key } +func (x *PrmSessionCreate) buildRequest(c *Client) (*v2session.CreateRequest, error) { + ownerKey := c.prm.key.PublicKey + if x.keySet { + ownerKey = x.key.PublicKey + } + var ownerID user.ID + user.IDFromKey(&ownerID, ownerKey) + + var ownerIDV2 refs.OwnerID + ownerID.WriteToV2(&ownerIDV2) + + reqBody := new(v2session.CreateRequestBody) + reqBody.SetOwnerID(&ownerIDV2) + reqBody.SetExpiration(x.exp) + + var meta v2session.RequestMetaHeader + writeXHeadersToMeta(x.xHeaders, &meta) + + var req v2session.CreateRequest + req.SetBody(reqBody) + c.prepareRequest(&req, &meta) + return &req, nil +} + // ResSessionCreate groups resulting values of SessionCreate operation. type ResSessionCreate struct { statusRes @@ -42,10 +69,6 @@ type ResSessionCreate struct { sessionKey []byte } -func (x *ResSessionCreate) setID(id []byte) { - x.id = id -} - // ID returns identifier of the opened session in a binary FrostFS API protocol format. // // Client doesn't retain value so modification is safe. @@ -53,10 +76,6 @@ func (x ResSessionCreate) ID() []byte { return x.id } -func (x *ResSessionCreate) setSessionKey(key []byte) { - x.sessionKey = key -} - // PublicKey returns public key of the opened session in a binary FrostFS API protocol format. func (x ResSessionCreate) PublicKey() []byte { return x.sessionKey @@ -78,57 +97,28 @@ func (x ResSessionCreate) PublicKey() []byte { // Return statuses: // - global (see Client docs). func (c *Client) SessionCreate(ctx context.Context, prm PrmSessionCreate) (*ResSessionCreate, error) { - ownerKey := c.prm.key.PublicKey - if prm.keySet { - ownerKey = prm.key.PublicKey - } - var ownerID user.ID - user.IDFromKey(&ownerID, ownerKey) - - var ownerIDV2 refs.OwnerID - ownerID.WriteToV2(&ownerIDV2) - - // form request body - reqBody := new(v2session.CreateRequestBody) - reqBody.SetOwnerID(&ownerIDV2) - reqBody.SetExpiration(prm.exp) - - // for request - var req v2session.CreateRequest - - req.SetBody(reqBody) - - // init call context - - var ( - cc contextCall - res ResSessionCreate - ) - - c.initCallContext(&cc) - if prm.keySet { - cc.key = prm.key + req, err := prm.buildRequest(c) + if err != nil { + return nil, err } - cc.meta = prm.prmCommonMeta - cc.req = &req - cc.statusRes = &res - cc.call = func() (responseV2, error) { - return rpcapi.CreateSession(&c.c, &req, client.WithContext(ctx)) - } - cc.result = func(r responseV2) { - resp := r.(*v2session.CreateResponse) - - body := resp.GetBody() - - res.setID(body.GetID()) - res.setSessionKey(body.GetSessionKey()) + if err := signature.SignServiceMessage(&c.prm.key, req); err != nil { + return nil, fmt.Errorf("sign request: %w", err) } - // process call - if !cc.processCall() { - return nil, cc.err + resp, err := rpcapi.CreateSession(&c.c, req, client.WithContext(ctx)) + if err != nil { + return nil, err } + var res ResSessionCreate + res.st, err = c.processResponse(resp) + if err != nil || !apistatus.IsSuccessful(res.st) { + return &res, err + } + + body := resp.GetBody() + res.id = body.GetID() + res.sessionKey = body.GetSessionKey() return &res, nil }