forked from TrueCloudLab/frostfs-node
[#1423] session: Upgrade SDK package
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
dda56f1319
commit
4c8ec20e32
41 changed files with 740 additions and 663 deletions
|
@ -18,20 +18,19 @@ func Delete(c *Client, witness core.RemovalWitness) error {
|
|||
return errNilArgument
|
||||
}
|
||||
|
||||
binToken, err := witness.SessionToken().Marshal()
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not marshal session token: %w", err)
|
||||
}
|
||||
|
||||
binCnr := make([]byte, sha256.Size)
|
||||
id.Encode(binCnr)
|
||||
|
||||
return c.Delete(
|
||||
DeletePrm{
|
||||
cid: binCnr,
|
||||
signature: witness.Signature(),
|
||||
token: binToken,
|
||||
})
|
||||
var prm DeletePrm
|
||||
|
||||
prm.SetCID(binCnr)
|
||||
prm.SetSignature(witness.Signature())
|
||||
|
||||
if tok := witness.SessionToken(); tok != nil {
|
||||
prm.SetToken(tok.Marshal())
|
||||
}
|
||||
|
||||
return c.Delete(prm)
|
||||
}
|
||||
|
||||
// DeletePrm groups parameters of Delete client operation.
|
||||
|
|
|
@ -77,14 +77,14 @@ func (c *Client) GetEACL(cnr *cid.ID) (*eacl.Table, error) {
|
|||
}
|
||||
|
||||
if len(binToken) > 0 {
|
||||
tok := session.NewToken()
|
||||
var tok session.Container
|
||||
|
||||
err = tok.Unmarshal(binToken)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not unmarshal session token: %w", err)
|
||||
}
|
||||
|
||||
table.SetSessionToken(tok)
|
||||
table.SetSessionToken(&tok)
|
||||
}
|
||||
|
||||
// FIXME(@cthulhu-rider): #1387 temp solution, later table structure won't have a signature
|
||||
|
|
|
@ -24,14 +24,12 @@ func PutEACL(c *Client, table *eacl.Table) error {
|
|||
return fmt.Errorf("can't marshal eacl table: %w", err)
|
||||
}
|
||||
|
||||
binToken, err := table.SessionToken().Marshal()
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not marshal session token: %w", err)
|
||||
}
|
||||
|
||||
var prm PutEACLPrm
|
||||
prm.SetTable(data)
|
||||
prm.SetToken(binToken)
|
||||
|
||||
if tok := table.SessionToken(); tok != nil {
|
||||
prm.SetToken(tok.Marshal())
|
||||
}
|
||||
|
||||
if sig := table.Signature(); sig != nil {
|
||||
// TODO(@cthulhu-rider): #1387 implement and use another approach to avoid conversion
|
||||
|
|
|
@ -96,14 +96,14 @@ func (c *Client) Get(cid []byte) (*container.Container, error) {
|
|||
}
|
||||
|
||||
if len(tokBytes) > 0 {
|
||||
tok := session.NewToken()
|
||||
var tok session.Container
|
||||
|
||||
err = tok.Unmarshal(tokBytes)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not unmarshal session token: %w", err)
|
||||
}
|
||||
|
||||
cnr.SetSessionToken(tok)
|
||||
cnr.SetSessionToken(&tok)
|
||||
}
|
||||
|
||||
// FIXME(@cthulhu-rider): #1387 temp solution, later table structure won't have a signature
|
||||
|
|
|
@ -24,19 +24,17 @@ func Put(c *Client, cnr *container.Container) (*cid.ID, error) {
|
|||
return nil, fmt.Errorf("can't marshal container: %w", err)
|
||||
}
|
||||
|
||||
binToken, err := cnr.SessionToken().Marshal()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("could not marshal session token: %w", err)
|
||||
}
|
||||
|
||||
name, zone := container.GetNativeNameWithZone(cnr)
|
||||
|
||||
var prm PutPrm
|
||||
prm.SetContainer(data)
|
||||
prm.SetToken(binToken)
|
||||
prm.SetName(name)
|
||||
prm.SetZone(zone)
|
||||
|
||||
if tok := cnr.SessionToken(); tok != nil {
|
||||
prm.SetToken(tok.Marshal())
|
||||
}
|
||||
|
||||
if sig := cnr.Signature(); sig != nil {
|
||||
// TODO(@cthulhu-rider): #1387 implement and use another approach to avoid conversion
|
||||
var sigV2 refs.Signature
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue