TrueCloudLab/frostfs-node
19
1
Fork 27
Code Issues 91 Pull requests 8 Projects Releases 1 Activity Actions

[#1454] container: Fix reading session token from request origin

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-05-31 17:13:34 +03:00 committed by LeL
parent 1c30414a6c
commit ff576d125d
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkg/services/container/executor.go
View file

@ -31,7 +31,12 @@ func NewExecutionService(exec ServiceExecutor) Server {
} }
func (s *executorSvc) Put(ctx context.Context, req *container.PutRequest) (*container.PutResponse, error) { func (s *executorSvc) Put(ctx context.Context, req *container.PutRequest) (*container.PutResponse, error) {
respBody, err := s.exec.Put(ctx, req.GetMetaHeader().GetOrigin().GetSessionToken(), req.GetBody()) meta := req.GetMetaHeader()
for origin := meta.GetOrigin(); origin != nil; origin = meta.GetOrigin() {
meta = origin
}
respBody, err := s.exec.Put(ctx, meta.GetSessionToken(), req.GetBody())
if err != nil { if err != nil {
return nil, fmt.Errorf("could not execute Put request: %w", err) return nil, fmt.Errorf("could not execute Put request: %w", err)
} }
@ -43,7 +48,12 @@ func (s *executorSvc) Put(ctx context.Context, req *container.PutRequest) (*cont
} }
func (s *executorSvc) Delete(ctx context.Context, req *container.DeleteRequest) (*container.DeleteResponse, error) { func (s *executorSvc) Delete(ctx context.Context, req *container.DeleteRequest) (*container.DeleteResponse, error) {
respBody, err := s.exec.Delete(ctx, req.GetMetaHeader().GetOrigin().GetSessionToken(), req.GetBody()) meta := req.GetMetaHeader()
for origin := meta.GetOrigin(); origin != nil; origin = meta.GetOrigin() {
meta = origin
}
respBody, err := s.exec.Delete(ctx, meta.GetSessionToken(), req.GetBody())
if err != nil { if err != nil {
return nil, fmt.Errorf("could not execute Delete request: %w", err) return nil, fmt.Errorf("could not execute Delete request: %w", err)
} }
@ -79,7 +89,12 @@ func (s *executorSvc) List(ctx context.Context, req *container.ListRequest) (*co
} }
func (s *executorSvc) SetExtendedACL(ctx context.Context, req *container.SetExtendedACLRequest) (*container.SetExtendedACLResponse, error) { func (s *executorSvc) SetExtendedACL(ctx context.Context, req *container.SetExtendedACLRequest) (*container.SetExtendedACLResponse, error) {
respBody, err := s.exec.SetExtendedACL(ctx, req.GetMetaHeader().GetOrigin().GetSessionToken(), req.GetBody()) meta := req.GetMetaHeader()
for origin := meta.GetOrigin(); origin != nil; origin = meta.GetOrigin() {
meta = origin
}
respBody, err := s.exec.SetExtendedACL(ctx, meta.GetSessionToken(), req.GetBody())
if err != nil { if err != nil {
return nil, fmt.Errorf("could not execute SetEACL request: %w", err) return nil, fmt.Errorf("could not execute SetEACL request: %w", err)
} }