Enable regex matches for provider IDs

cs3org · May 12, 2022 · 8b3f759 · 8b3f759
1 parent 0b46cb4
commit 8b3f759
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go
@@ -1293,7 +1293,7 @@ func unwrapProviderIDAndPath(ref *provider.Reference, mountPath string) string {
 	}
 
 	// Trim the mount path of the storage provider if the request was for an absolute reference
-	if !utils.IsRelativeReference(ref) {
+	if ref != nil && !utils.IsRelativeReference(ref) {
 		ref.Path = strings.TrimPrefix(ref.Path, mountPath)
 	}
 
@@ -1306,7 +1306,7 @@ func rewrapProviderIDAndPath(ref *provider.Reference, spid, mountPath string) {
 	}
 
 	// Prepend the mount path of the storage provider if the request was for an absolute reference
-	if !utils.IsRelativeReference(ref) {
+	if ref != nil && !utils.IsRelativeReference(ref) {
 		ref.Path = path.Join(mountPath, ref.Path)
 	}
 }
diff --git a/pkg/storage/registry/spaces/spaces.go b/pkg/storage/registry/spaces/spaces.go
@@ -374,10 +374,14 @@ func (r *registry) findProvidersForResource(ctx context.Context, id string, find
 
 	for address, provider := range r.c.Providers {
 		// try to find provider based on storageproviderid prefix
-		if provider.ProviderID != "" && sdid != "" && provider.ProviderID != sdid {
+		if provider.ProviderID != "" && sdid != "" {
 			// skip mismatching storageproviders
-			continue
+			match, err := regexp.MatchString("^"+provider.ProviderID+"$", sdid)
+			if err != nil || !match {
+				continue
+			}
 		}
+
 		p := &registrypb.ProviderInfo{
 			Address:    address,
 			ProviderId: id,