[pull] master from owncloud:master

.drone.star

@@ -1,6 +1,6 @@
 ATMOZ_SFTP = "atmoz/sftp"
 DRONE_CLI_ALPINE = "drone/cli:alpine"
-MAILHOG_MAILHOG = "mailhog/mailhog"
+INBUCKET_INBUCKET = "inbucket/inbucket"
 MINIO_MC_RELEASE_2020_VERSION = "minio/mc:RELEASE.2020-12-10T01-26-17Z"
 OC_CI_ALPINE = "owncloudci/alpine:latest"
 OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier"
@@ -1734,7 +1734,7 @@ def acceptance(ctx):
                                     makeParameter = "test-acceptance-cli"
 
                                 if params["emailNeeded"]:
-                                    environment["MAILHOG_HOST"] = "email"
+                                    environment["EMAIL_HOST"] = "email"
 
                                 if params["ldapNeeded"]:
                                     environment["TEST_WITH_LDAP"] = True
@@ -2134,7 +2134,7 @@ def emailService(emailNeeded):
     if emailNeeded:
         return [{
             "name": "email",
-            "image": MAILHOG_MAILHOG,
+            "image": INBUCKET_INBUCKET,
         }]
 
     return []
@@ -2145,7 +2145,7 @@ def waitForEmailService(emailNeeded):
             "name": "wait-for-email",
             "image": OC_CI_WAIT_FOR,
             "commands": [
-                "wait-for -it email:8025 -t 600",
+                "wait-for -it email:9000 -t 600",
             ],
         }]
 

CHANGELOG.html

@@ -6,6 +6,8 @@ <h2 id="unreleased" class="version"> Changelog for ownCloud Core [unreleased] (U
     </p>
     <h3 id="unreleased-summary">Summary</h3>
     <ul class="summary">
+        <li class="type-bugfix changelog-item">Bugfix - Properly remove file versions from the trashbin: <a href="https://github.com/owncloud/core/issues/40286">#40286</a></li>
+        <li class="type-bugfix changelog-item">Bugfix - "available for" in the mount point configuration will show displaynames: <a href="https://github.com/owncloud/core/pull/40412">#40412</a></li>
         <li class="type-bugfix changelog-item">Bugfix - Skip public links when updating permissions of share's children: <a href="https://github.com/owncloud/core/pull/40420">#40420</a></li>
         <li class="type-change changelog-item">Change - Allow specifying available space for objectstorages: <a href="https://github.com/owncloud/core/pull/40192">#40192</a></li>
         <li class="type-change changelog-item">Change - Drop PHP 7.3 support across the platform: <a href="https://github.com/owncloud/core/pull/40394">#40394</a></li>
@@ -17,6 +19,29 @@ <h3 id="unreleased-summary">Summary</h3>
     </ul>
     <h3 id="unreleased-details">Details</h3>
     <ul class="details">
+        <li class="type-bugfix changelog-item">
+            <p>Bugfix - Properly remove file versions from the trashbin: <a href="https://github.com/owncloud/core/issues/40286">#40286</a></p>
+            <p>Previously, restoring or removing a file from inside a folder that was deleted (so the folder
+   and the contents are in the trashbin) didn't remove the versions of the file. Those versions
+   were left in both the DB and the FS, taking space and degrading the performance.This is now being handled properly, so no additional resource is consumed due to the versions
+   being left stranded.
+            </p>
+            <p>https://github.com/owncloud/core/issues/40286<br>
+            </p>
+        </li>
+        <li class="type-bugfix changelog-item">
+            <p>Bugfix - "available for" in the mount point configuration will show displaynames: <a href="https://github.com/owncloud/core/pull/40412">#40412</a></p>
+            <p>The "available for" select of the mount configuration of external storages were using the
+   group id. This wasn't a problem because for local groups the group id matches the group
+   displayname, and for ldap groups the group id was the "cn" attribute. Due to recent changes, the
+   ldap group will now use the objectuid attribute (or a similar attribute) as group id by default.
+   This was causing the "available for" select to show that objectuid, so identifying the right
+   group was problematic.Now, the "available for" select will show the group displayname, which for ldap is the "cn"
+   attribute by default.Note that this happens on new installations. There is an automatic migration in place, so for
+   upgrades, the "cn" attribute will be set as groupname in order to keep the old behavior
+            </p>
+            <p>https://github.com/owncloud/core/pull/40412<br></p>
+        </li>
         <li class="type-bugfix changelog-item">
             <p>Bugfix - Skip public links when updating permissions of share's children: <a href="https://github.com/owncloud/core/pull/40420">#40420</a></p>
             <p>Currently, updates to permissions of a share are wrongly propagated to public links children.

CHANGELOG.md

@@ -8,6 +8,8 @@ ownCloud admins and users.
 Summary
 -------
 
+* Bugfix - Properly remove file versions from the trashbin: [#40286](https://github.com/owncloud/core/issues/40286)
+* Bugfix - "available for" in the mount point configuration will show displaynames: [#40412](https://github.com/owncloud/core/pull/40412)
 * Bugfix - Skip public links when updating permissions of share's children: [#40420](https://github.com/owncloud/core/pull/40420)
 * Change - Allow specifying available space for objectstorages: [#40192](https://github.com/owncloud/core/pull/40192)
 * Change - Drop PHP 7.3 support across the platform: [#40394](https://github.com/owncloud/core/pull/40394)
@@ -20,6 +22,34 @@ Summary
 Details
 -------
 
+* Bugfix - Properly remove file versions from the trashbin: [#40286](https://github.com/owncloud/core/issues/40286)
+
+   Previously, restoring or removing a file from inside a folder that was deleted (so the folder
+   and the contents are in the trashbin) didn't remove the versions of the file. Those versions
+   were left in both the DB and the FS, taking space and degrading the performance.
+
+   This is now being handled properly, so no additional resource is consumed due to the versions
+   being left stranded.
+
+   https://github.com/owncloud/core/issues/40286
+
+* Bugfix - "available for" in the mount point configuration will show displaynames: [#40412](https://github.com/owncloud/core/pull/40412)
+
+   The "available for" select of the mount configuration of external storages were using the
+   group id. This wasn't a problem because for local groups the group id matches the group
+   displayname, and for ldap groups the group id was the "cn" attribute. Due to recent changes, the
+   ldap group will now use the objectuid attribute (or a similar attribute) as group id by default.
+   This was causing the "available for" select to show that objectuid, so identifying the right
+   group was problematic.
+
+   Now, the "available for" select will show the group displayname, which for ldap is the "cn"
+   attribute by default.
+
+   Note that this happens on new installations. There is an automatic migration in place, so for
+   upgrades, the "cn" attribute will be set as groupname in order to keep the old behavior
+
+   https://github.com/owncloud/core/pull/40412
+
 * Bugfix - Skip public links when updating permissions of share's children: [#40420](https://github.com/owncloud/core/pull/40420)
 
    Currently, updates to permissions of a share are wrongly propagated to public links children.

apps/dav/lib/TrashBin/TrashBinManager.php

@@ -93,8 +93,6 @@ public function restore(string $user, AbstractTrashBinNode $trashItem, $targetLo
 		$path = \implode('/', $path);
 		return Trashbin::restore(
 			$path,
-			$trashItem->getOriginalFileName(),
-			$trashItem->getDeleteTimestamp(),
 			$targetLocation
 		);
 	}

apps/files_external/ajax/applicable.php

@@ -41,7 +41,7 @@
 
 $groups = [];
 foreach (\OC::$server->getGroupManager()->search($pattern, $limit, $offset) as $group) {
-	$groups[$group->getGID()] = $group->getGID();
+	$groups[$group->getGID()] = $group->getDisplayName();
 }
 
 $users = [];

apps/files_trashbin/ajax/delete.php

@@ -52,25 +52,20 @@
 
 $i = 0;
 foreach ($list as $file) {
-	if ($folder === '/') {
-		$file = \ltrim($file, '/');
-		$delimiter = \strrpos($file, '.d');
-		$filename = \substr($file, 0, $delimiter);
-		$timestamp =  \substr($file, $delimiter+2);
-	} else {
-		$filename = $folder . '/' . $file;
-		$timestamp = null;
-	}
+	$file = \ltrim($file, '/');
+	$filename = $folder . $file;  // folder already contains a trailing "/"
 
-	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
-	if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
+	// both "delete" and "file_exists" will require the whole path inside the trashbin
+	// including the deletion timestamp in the filename, such as "/file.txt.d12345"
+	// or "/folder.d12345/file.txt"
+	OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser());
+	if (OCA\Files_Trashbin\Trashbin::file_exists($filename)) {
 		$error[] = $filename;
 		\OCP\Util::writeLog('files_trashbin', 'can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR);
 	}
 	// only list deleted files if not deleting everything
 	elseif (!$deleteAll) {
 		$success[$i]['filename'] = $file;
-		$success[$i]['timestamp'] = $timestamp;
 		$i++;
 	}
 }

apps/files_trashbin/ajax/undelete.php

@@ -57,24 +57,17 @@
 
 $i = 0;
 foreach ($list as $file) {
-	$path = $dir . '/' . $file;
-	if ($dir === '/') {
-		$file = \ltrim($file, '/');
-		$delimiter = \strrpos($file, '.d');
-		$filename = \substr($file, 0, $delimiter);
-		$timestamp =  \substr($file, $delimiter+2);
-	} else {
-		$path_parts = \pathinfo($file);
-		$filename = $path_parts['basename'];
-		$timestamp = null;
-	}
+	$file = \ltrim($file, '/');
+	$filename = $dir . $file;  // dir already contains a trailing "/"
 
-	if (!OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp)) {
+	// "restore" will require the whole path inside the trashbin including
+	// the deletion timestamp in the filename, such as "/file.txt.d12345"
+	// or "/folder.d12345/file.txt"
+	if (!OCA\Files_Trashbin\Trashbin::restore($filename)) {
 		$error[] = $filename;
 		\OCP\Util::writeLog('files_trashbin', 'can\'t restore ' . $filename, \OCP\Util::DEBUG);
 	} else {
 		$success[$i]['filename'] = $file;
-		$success[$i]['timestamp'] = $timestamp;
 		$i++;
 	}
 }

apps/files_trashbin/lib/TrashExpiryManager.php

@@ -74,7 +74,9 @@ public function expireTrashByRetention(string $uid) {
 		$userTrashbinContent = Helper::getTrashFiles('/', $uid, 'mtime', false);
 		foreach ($userTrashbinContent as $key => $trashbinEntry) {
 			if ($this->expiration->isExpired($trashbinEntry->getMtime())) {
-				Trashbin::delete($trashbinEntry->getName(), $uid, $trashbinEntry->getMtime());
+				// Direct content of the trashbin's root folder will have the ".d[timestamp]" suffix
+				// The deletion timestamp is in the mtime of the trashbin entry
+				Trashbin::delete("{$trashbinEntry->getName()}.d{$trashbinEntry->getMtime()}", $uid);
 				$this->logger->info(
 					"Remove {$trashbinEntry->getName()} from {$uid} trashbin because it exceeds max retention obligation term.",
 					['app' => 'files_trashbin']
@@ -104,7 +106,9 @@ public function expireTrash(string $uid) {
 		for ($i = 0; $i < \count($remainingUserTrashbinContent); $i++) {
 			$trashbinEntry = $remainingUserTrashbinContent[$i];
 			if ($this->expiration->isExpired($trashbinEntry->getMtime())) {
-				$availableSpace += Trashbin::delete($trashbinEntry->getName(), $uid, $trashbinEntry->getMtime());
+				// Direct content of the trashbin's root folder will have the ".d[timestamp]" suffix
+				// The deletion timestamp is in the mtime of the trashbin entry
+				$availableSpace += Trashbin::delete("{$trashbinEntry->getName()}.d{$trashbinEntry->getMtime()}", $uid);
 				$this->logger->info(
 					"Remove {$trashbinEntry->getName()} from {$uid} trashbin because it exceeds max retention obligation term.",
 					['app' => 'files_trashbin']
@@ -121,7 +125,7 @@ public function expireTrash(string $uid) {
 		if ($availableSpace < 0) {
 			foreach ($remainingUserTrashbinContent as $trashbinEntry) {
 				if ($availableSpace < 0 && $this->expiration->isExpired($trashbinEntry->getMtime(), true)) {
-					$deletedSize = Trashbin::delete($trashbinEntry->getName(), $uid, $trashbinEntry->getMtime());
+					$deletedSize = Trashbin::delete("{$trashbinEntry->getName()}.d{$trashbinEntry->getMtime()}", $uid);
 					$this->logger->info(
 						"Remove {$trashbinEntry->getMtime()} ({$deletedSize}) to meet the limit of trash bin size ({$this->quota->getPurgeLimit()}% of available quota",
 						['app' => 'files_trashbin']