fix the mount points naming

changelog/unreleased/fix-mount-points-naming.md

@@ -0,0 +1,6 @@
+Bugfix: Fix the mount points naming
+
+We fixed a bug that caused inconsistent naming when multiple users share the resource with same name to another user.
+
+https://github.com/owncloud/ocis/pull/8543
+https://github.com/owncloud/ocis/issues/8471

go.mod

@@ -357,6 +357,8 @@ replace github.com/studio-b12/gowebdav => github.com/aduffeck/gowebdav v0.0.0-20
 
 replace github.com/egirna/icap-client => github.com/fschade/icap-client v0.0.0-20240123094924-5af178158eaf
 
+replace github.com/cs3org/reva/v2 => github.com/2403905/reva/v2 v2.0.0-20240307154619-2818a1e94d53
+
 // exclude the v2 line of go-sqlite3 which was released accidentally and prevents pulling in newer versions of go-sqlite3
 // see https://github.com/mattn/go-sqlite3/issues/965 for more details
 exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible

go.sum

@@ -766,6 +766,8 @@ dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
+github.com/2403905/reva/v2 v2.0.0-20240307154619-2818a1e94d53 h1:aSk5WXhkmGTwtSw/J4a3FuRcpOwJFtf9asN6KVJRqpU=
+github.com/2403905/reva/v2 v2.0.0-20240307154619-2818a1e94d53/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
 github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
@@ -1019,8 +1021,6 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
 github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.19.2-0.20240307091744-fa2caba1f4e4 h1:dOApLUv2cYnWU1Z8pqEBk8a9BEGe6VRl/f0sFmwzLw4=
-github.com/cs3org/reva/v2 v2.19.2-0.20240307091744-fa2caba1f4e4/go.mod h1:GRUrOp5HbFVwZTgR9bVrMZ/MvVy+Jhxw1PdMmhhKP9E=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

services/frontend/pkg/command/events.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"path"
 	"path/filepath"
-	"sort"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -171,49 +171,53 @@ func getMountpoint(ctx context.Context, l log.Logger, itemid *provider.ResourceI
 	// we need to sort the received shares by mount point in order to make things easier to evaluate.
 	base := path.Base(info.GetPath())
 	mount := base
-	mountedShares := make([]*collaboration.ReceivedShare, 0, len(lrs.Shares))
+	mounts := make([]string, 0, len(lrs.Shares))
+	var exists bool
+
 	for _, s := range lrs.Shares {
 		if s.State != collaboration.ShareState_SHARE_STATE_ACCEPTED {
 			// we don't care about unaccepted shares
 			continue
 		}
 
-		if utils.ResourceIDEqual(s.Share.ResourceId, itemid) {
+		if utils.ResourceIDEqual(s.GetShare().GetResourceId(), itemid) {
 			// a share to the same resource already exists and is mounted
-			return s.MountPoint.Path, nil
+			return s.GetMountPoint().GetPath(), nil
 		}
 
-		mountedShares = append(mountedShares, s)
-	}
-
-	sort.Slice(mountedShares, func(i, j int) bool {
-		return mountedShares[i].MountPoint.Path > mountedShares[j].MountPoint.Path
-	})
-
-	// now we have a list of shares, we want to iterate over all of them and check for name collisions
-	for i, ms := range mountedShares {
-		if ms.MountPoint.Path == mount {
+		if s.GetMountPoint().GetPath() == mount {
 			// does the shared resource still exist?
 			gwc, err := gatewaySelector.Next()
 			if err != nil {
 				l.Error().Err(err).Msg("cannot get gateway client")
 				continue
 			}
-			_, err = utils.GetResourceByID(ctx, ms.Share.ResourceId, gwc)
+			_, err = utils.GetResourceByID(ctx, s.GetShare().GetResourceId(), gwc)
 			if err == nil {
-				// The mount point really already exists, we need to insert a number into the filename
-				ext := filepath.Ext(base)
-				name := strings.TrimSuffix(base, ext)
-				// be smart about .tar.(gz|bz) files
-				if strings.HasSuffix(name, ".tar") {
-					name = strings.TrimSuffix(name, ".tar")
-					ext = ".tar" + ext
-				}
-
-				mount = fmt.Sprintf("%s (%s)%s", name, strconv.Itoa(i+1), ext)
+				exists = true
 			}
 			// TODO we could delete shares here if the stat returns code NOT FOUND ... but listening for file deletes would be better
 		}
+		// collect all mount points
+		mounts = append(mounts, s.GetMountPoint().GetPath())
+	}
+
+	// If the mount point really already exists, we need to insert a number into the filename
+	if exists {
+		// now we have a list of shares, we want to iterate over all of them and check for name collisions agents a mount points list
+		for i := 1; i <= len(mounts)+1; i++ {
+			ext := filepath.Ext(base)
+			name := strings.TrimSuffix(base, ext)
+			// be smart about .tar.(gz|bz) files
+			if strings.HasSuffix(name, ".tar") {
+				name = strings.TrimSuffix(name, ".tar")
+				ext = ".tar" + ext
+			}
+			mount = name + " (" + strconv.Itoa(i) + ")" + ext
+			if !slices.Contains(mounts, mount) {
+				return mount, nil
+			}
+		}
 	}
 	return mount, nil
 }

vendor/modules.txt

@@ -359,7 +359,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
 github.com/cs3org/go-cs3apis/cs3/types/v1beta1
-# github.com/cs3org/reva/v2 v2.19.2-0.20240307091744-fa2caba1f4e4
+# github.com/cs3org/reva/v2 v2.19.2-0.20240307091744-fa2caba1f4e4 => github.com/2403905/reva/v2 v2.0.0-20240307154619-2818a1e94d53
 ## explicit; go 1.21
 github.com/cs3org/reva/v2/cmd/revad/internal/grace
 github.com/cs3org/reva/v2/cmd/revad/runtime
@@ -2339,3 +2339,4 @@ stash.kopano.io/kgol/rndm
 # github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20231207143248-4d424e3ae348
 # github.com/studio-b12/gowebdav => github.com/aduffeck/gowebdav v0.0.0-20231215102054-212d4a4374f6
 # github.com/egirna/icap-client => github.com/fschade/icap-client v0.0.0-20240123094924-5af178158eaf
+# github.com/cs3org/reva/v2 => github.com/2403905/reva/v2 v2.0.0-20240307154619-2818a1e94d53