new IsAbsolutePathReference check

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Jul 8, 2021 · 7058dd1 · 7058dd1
1 parent ce7845b
commit 7058dd1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go
@@ -1834,7 +1834,7 @@ func (s *svc) getPath(ctx context.Context, ref *provider.Reference, keys ...stri
 		return res.Info.Path, res.Status
 	}
 
-	if ref.ResourceId == nil && strings.HasPrefix(ref.Path, "/") {
+	if utils.IsAbsolutePathReference(ref) {
 		return ref.Path, &rpc.Status{Code: rpc.Code_CODE_OK}
 	}
 	return "", &rpc.Status{Code: rpc.Code_CODE_INTERNAL}

diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go
@@ -263,7 +263,6 @@ func (s *service) InitiateFileDownload(ctx context.Context, req *provider.Initia
 	// For example, https://data-server.example.org/home/docs/myfile.txt
 	// or ownclouds://data-server.example.org/home/docs/myfile.txt
 	log := appctx.GetLogger(ctx)
-
 	u := *s.dataServerURL
 	log.Info().Str("data-server", u.String()).Interface("ref", req.Ref).Msg("file download")
 

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -219,6 +219,12 @@ func IsAbsoluteReference(ref *provider.Reference) bool {
 	return (ref.ResourceId != nil && ref.Path == "") || (ref.ResourceId == nil) && strings.HasPrefix(ref.Path, "/")
 }
 
+// IsAbsolutePathReference returns true if the given reference qualifies as a global path
+// when only the path is set and starts with /
+func IsAbsolutePathReference(ref *provider.Reference) bool {
+	return ref.ResourceId == nil && strings.HasPrefix(ref.Path, "/")
+}
+
 // MakeRelativePath prefixes the path with a . to use it in a relative reference
 func MakeRelativePath(p string) string {
 	p = path.Join("/", p)