TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#57] services/object: Add session token to common parameters

Browse source 
Add session token field to CommonPrm. Remove session token field from Put
parameters.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-09-29 18:08:16 +03:00 • committed by Alex Vanin
parent 39c17253be
commit 2da323c4b9
3 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkg/services/object/put/streamer.go
View file

@ -48,7 +48,9 @@ func (p *Streamer) initTarget(prm *PutInitPrm) error {
return errors.Wrapf(err, "(%T) could not prepare put parameters", p)
}
if prm.token == nil {
sToken := prm.common.SessionToken()
if sToken == nil {
// prepare untrusted-Put object target
p.target = &validatingTarget{
nextTarget: p.newCommonTarget(prm),
@ -61,7 +63,7 @@ func (p *Streamer) initTarget(prm *PutInitPrm) error {
// prepare trusted-Put object target
// get private token from local storage
pToken := p.tokenStore.Get(prm.token.OwnerID(), prm.token.ID())
pToken := p.tokenStore.Get(sToken.OwnerID(), sToken.ID())
if pToken == nil {
return errPrivateTokenNotFound
}
@ -69,7 +71,7 @@ func (p *Streamer) initTarget(prm *PutInitPrm) error {
p.target = transformer.NewPayloadSizeLimiter(
p.maxSizeSrc.MaxObjectSize(),
func() transformer.ObjectTarget {
return transformer.NewFormatTarget(pToken.SessionKey(), p.newCommonTarget(prm), prm.token)
return transformer.NewFormatTarget(pToken.SessionKey(), p.newCommonTarget(prm), sToken)
},
)