fill in storage provider id if it is missing

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Jul 18, 2022 · 95ef49d · 95ef49d
1 parent caca92f
commit 95ef49d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go
@@ -264,6 +264,11 @@ func (s *service) InitiateFileDownload(ctx context.Context, req *provider.Initia
 
  protocol := &provider.FileDownloadProtocol{Expose: s.conf.ExposeDataServer}
 
+ // fill in storage provider id if it is missing
+ if req.GetRef().GetResourceId().GetStorageId() == "" {
+ req.GetRef().GetResourceId().StorageId = s.conf.MountID
+ }
+
  if utils.IsRelativeReference(req.Ref) {
  protocol.Protocol = "spaces"
  u.Path = path.Join(u.Path, "spaces", storagespace.FormatResourceID(*req.Ref.ResourceId), req.Ref.Path)

diff --git a/pkg/rhttp/datatx/utils/download/download.go b/pkg/rhttp/datatx/utils/download/download.go
@@ -80,6 +80,11 @@ func GetOrHeadFile(w http.ResponseWriter, r *http.Request, fs storage.FS, spaceI
  return
  }
 
+ // fill in storage provider id if it is missing
+ if spaceID != "" && md.GetId().GetStorageId() == "" {
+ md.Id.StorageId = ref.ResourceId.StorageId
+ }
+
  var ranges []HTTPRange
 
  if r.Header.Get("Range") != "" {