fix share jail

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Aug 24, 2023 · 157a6dc · 157a6dc
1 parent 1314c34
commit 157a6dc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/changelog/unreleased/fix-share-jail.md b/changelog/unreleased/fix-share-jail.md
@@ -0,0 +1,5 @@
+Bugfix: fix share jail
+
+Make matching mountpoints deterministic by comparing whole path segments of mountpoints
+
+https://github.com/cs3org/reva/pull/4134
diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go
@@ -1059,7 +1059,7 @@ func (s *service) resolveAcceptedShare(ctx context.Context, ref *provider.Refere
 			if receivedShare.State != collaboration.ShareState_SHARE_STATE_ACCEPTED {
 				continue
 			}
-			if strings.HasPrefix(strings.TrimPrefix(ref.Path, "./"), receivedShare.MountPoint.Path) {
+			if isMountPointForPath(receivedShare.MountPoint.Path, ref.Path) {
 				return receivedShare, lsRes.Status, nil
 			}
 		}
@@ -1069,6 +1069,17 @@ func (s *service) resolveAcceptedShare(ctx context.Context, ref *provider.Refere
 	return nil, status.NewNotFound(ctx, "sharesstorageprovider: not found "+ref.String()), nil
 }
 
+func isMountPointForPath(mountpoint, path string) bool {
+	requiredSegments := strings.Split(strings.TrimPrefix(mountpoint, "./"), "/")
+	pathSegments := strings.Split(strings.TrimPrefix(path, "./"), "/")
+	for i := range requiredSegments {
+		if pathSegments[i] != requiredSegments[i] {
+			return false
+		}
+	}
+	return true
+}
+
 func (s *service) rejectReceivedShare(ctx context.Context, receivedShare *collaboration.ReceivedShare) error {
 	receivedShare.State = collaboration.ShareState_SHARE_STATE_REJECTED
 	receivedShare.MountPoint = nil