TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 93 Pull requests 4 Projects Releases 1 Activity Actions

putSvc: Fix relay #1394

Merged
acid-ant merged 1 commit from dstepanov-yadro/frostfs-node:fix/put_relay into master 2024-09-25 15:34:18 +00:00
Conversation 0 Commits 1 Files changed 3 +7 -6
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a5e1aa22c9 - Show all commits

9
pkg/services/object/common/target/target.go
View file

@ -13,16 +13,16 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
) )
func New(prm *objectwriter.Params) (transformer.ChunkedObjectWriter, error) { func New(prm objectwriter.Params) (transformer.ChunkedObjectWriter, error) {
// prepare needed put parameters // prepare needed put parameters
if err := preparePrm(prm); err != nil { if err := preparePrm(&prm); err != nil {
return nil, fmt.Errorf("could not prepare put parameters: %w", err) return nil, fmt.Errorf("could not prepare put parameters: %w", err)
} }
if prm.Header.Signature() != nil { if prm.Header.Signature() != nil {
return newUntrustedTarget(prm) return newUntrustedTarget(&prm)
} }
return newTrustedTarget(prm) return newTrustedTarget(&prm)
} }
func newUntrustedTarget(prm *objectwriter.Params) (transformer.ChunkedObjectWriter, error) { func newUntrustedTarget(prm *objectwriter.Params) (transformer.ChunkedObjectWriter, error) {
@ -49,6 +49,7 @@ func newUntrustedTarget(prm *objectwriter.Params) (transformer.ChunkedObjectWrit
} }
func newTrustedTarget(prm *objectwriter.Params) (transformer.ChunkedObjectWriter, error) { func newTrustedTarget(prm *objectwriter.Params) (transformer.ChunkedObjectWriter, error) {
prm.Relay = nil // do not relay request without signature
maxPayloadSz := prm.Config.MaxSizeSrc.MaxObjectSize() maxPayloadSz := prm.Config.MaxSizeSrc.MaxObjectSize()
if maxPayloadSz == 0 { if maxPayloadSz == 0 {
return nil, errors.New("could not obtain max object size parameter") return nil, errors.New("could not obtain max object size parameter")

2
pkg/services/object/patch/streamer.go
View file

@ -112,7 +112,7 @@ func (s *Streamer) init(ctx context.Context, req *objectV2.PatchRequest) error {
} }
oV2.GetHeader().SetOwnerID(ownerID) oV2.GetHeader().SetOwnerID(ownerID)
target, err := target.New(&objectwriter.Params{ target, err := target.New(objectwriter.Params{
Config: s.Config, Config: s.Config,
Common: commonPrm, Common: commonPrm,
Header: objectSDK.NewFromV2(oV2), Header: objectSDK.NewFromV2(oV2),

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

@ -26,7 +26,7 @@ func (p *Streamer) Init(ctx context.Context, prm *PutInitPrm) error {
} }
// initialize destination target // initialize destination target
prmTarget := &objectwriter.Params{ prmTarget := objectwriter.Params{
Config: p.Config, Config: p.Config,
Common: prm.common, Common: prm.common,
Header: prm.hdr, Header: prm.hdr,