feat(files_trashbin): Allow preventing trash to be deleted permanently

Signed-off-by: provokateurin <kate@provokateurin.de>

Author: provokateurin

apps/files/src/actions/deleteAction.ts

@@ -13,6 +13,8 @@ import TrashCanSvg from '@mdi/svg/svg/trash-can.svg?raw'
 
 import logger from '../logger.ts'
 import { askConfirmation, canDisconnectOnly, canUnshareOnly, deleteNode, displayName, isTrashbinEnabled } from './deleteUtils'
+import { loadState } from '@nextcloud/initial-state'
+import type { FilesTrashbinConfigState } from '../../../files_trashbin/src/fileListActions/emptyTrashAction.ts'
 
 const queue = new PQueue({ concurrency: 5 })
 
@@ -34,6 +36,11 @@ export const action = new FileAction({
 	},
 
 	enabled(nodes: Node[]) {
+		const config = loadState<FilesTrashbinConfigState>('files_trashbin', 'config')
+		if (!config.allow_delete) {
+			return false
+		}
+
 		return nodes.length > 0 && nodes
 			.map(node => node.permissions)
 			.every(permission => (permission & Permission.DELETE) !== 0)

apps/files_trashbin/composer/composer/autoload_classmap.php

@@ -40,6 +40,7 @@
     'OCA\\Files_Trashbin\\Sabre\\TrashHome' => $baseDir . '/../lib/Sabre/TrashHome.php',
     'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => $baseDir . '/../lib/Sabre/TrashRoot.php',
     'OCA\\Files_Trashbin\\Sabre\\TrashbinPlugin' => $baseDir . '/../lib/Sabre/TrashbinPlugin.php',
+    'OCA\\Files_Trashbin\\Service\\ConfigService' => $baseDir . '/../lib/Service/ConfigService.php',
     'OCA\\Files_Trashbin\\Storage' => $baseDir . '/../lib/Storage.php',
     'OCA\\Files_Trashbin\\Trash\\BackendNotFoundException' => $baseDir . '/../lib/Trash/BackendNotFoundException.php',
     'OCA\\Files_Trashbin\\Trash\\ITrashBackend' => $baseDir . '/../lib/Trash/ITrashBackend.php',

apps/files_trashbin/composer/composer/autoload_static.php

@@ -55,6 +55,7 @@ class ComposerStaticInitFiles_Trashbin
         'OCA\\Files_Trashbin\\Sabre\\TrashHome' => __DIR__ . '/..' . '/../lib/Sabre/TrashHome.php',
         'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => __DIR__ . '/..' . '/../lib/Sabre/TrashRoot.php',
         'OCA\\Files_Trashbin\\Sabre\\TrashbinPlugin' => __DIR__ . '/..' . '/../lib/Sabre/TrashbinPlugin.php',
+        'OCA\\Files_Trashbin\\Service\\ConfigService' => __DIR__ . '/..' . '/../lib/Service/ConfigService.php',
         'OCA\\Files_Trashbin\\Storage' => __DIR__ . '/..' . '/../lib/Storage.php',
         'OCA\\Files_Trashbin\\Trash\\BackendNotFoundException' => __DIR__ . '/..' . '/../lib/Trash/BackendNotFoundException.php',
         'OCA\\Files_Trashbin\\Trash\\ITrashBackend' => __DIR__ . '/..' . '/../lib/Trash/ITrashBackend.php',

apps/files_trashbin/lib/Capabilities.php

@@ -6,6 +6,7 @@
  */
 namespace OCA\Files_Trashbin;
 
+use OCA\Files_Trashbin\Service\ConfigService;
 use OCP\Capabilities\ICapability;
 
 /**
@@ -18,12 +19,18 @@ class Capabilities implements ICapability {
 	/**
 	 * Return this classes capabilities
 	 *
-	 * @return array{files: array{undelete: bool}}
+	 * @return array{
+	 *     files: array{
+	 *         undelete: bool,
+	 *         delete_from_trash: bool
+	 *     }
+	 * }
 	 */
 	public function getCapabilities() {
 		return [
 			'files' => [
-				'undelete' => true
+				'undelete' => true,
+				'delete_from_trash' => ConfigService::getDeleteFromTrashEnabled(),
 			]
 		];
 	}

apps/files_trashbin/lib/Listeners/LoadAdditionalScripts.php

@@ -10,17 +10,30 @@
 
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files_Trashbin\AppInfo\Application;
+use OCA\Files_Trashbin\Service\ConfigService;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
 /** @template-implements IEventListener<LoadAdditionalScriptsEvent> */
 class LoadAdditionalScripts implements IEventListener {
+	public function __construct(
+		private IInitialState $initialState,
+	) {
+	}
+
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadAdditionalScriptsEvent)) {
 			return;
 		}
 
 		Util::addInitScript(Application::APP_ID, 'init');
+
+		$this->initialState->provideLazyInitialState('config', function () {
+			return [
+				'allow_delete' => ConfigService::getDeleteFromTrashEnabled(),
+			];
+		});
 	}
 }

apps/files_trashbin/lib/Service/ConfigService.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\Files_Trashbin\Service;
+
+use OCP\IConfig;
+use OCP\Server;
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+class ConfigService {
+	public static function getDeleteFromTrashEnabled(): bool {
+		return Server::get(IConfig::class)->getSystemValueBool('files.trash.delete', true);
+	}
+}

apps/files_trashbin/src/fileListActions/emptyTrashAction.ts

@@ -19,6 +19,11 @@ import { logger } from '../logger.ts'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 import { emit } from '@nextcloud/event-bus'
+import { loadState } from '@nextcloud/initial-state'
+
+export type FilesTrashbinConfigState = {
+	allow_delete: boolean;
+}
 
 const emptyTrash = async (): Promise<boolean> => {
 	try {
@@ -42,6 +47,12 @@ export const emptyTrashAction = new FileListAction({
 		if (view.id !== 'trashbin') {
 			return false
 		}
+
+		const config = loadState<FilesTrashbinConfigState>('files_trashbin', 'config')
+		if (!config.allow_delete) {
+			return false
+		}
+
 		return nodes.length > 0 && folder.path === '/'
 	},
 

config/config.sample.php

@@ -369,7 +369,7 @@
 /**
  * Enable or disable the automatic logout after session_lifetime, even if session
  * keepalive is enabled. This will make sure that an inactive browser will log itself out
- * even if requests to the server might extend the session lifetime. Note: the logout is   
+ * even if requests to the server might extend the session lifetime. Note: the logout is
  * handled on the client side. This is not a way to limit the duration of potentially
  * compromised sessions.
  *
@@ -688,7 +688,7 @@
  * are generated within Nextcloud using any kind of command line tools (cron or
  * occ). The value should contain the full base URL:
  * ``https://www.example.com/nextcloud``
- * Please make sure to set the value to the URL that your users mainly use to access this Nextcloud. 
+ * Please make sure to set the value to the URL that your users mainly use to access this Nextcloud.
  * Otherwise there might be problems with the URL generation via cron.
  *
  * Defaults to ``''`` (empty string)
@@ -2597,4 +2597,12 @@
  * Defaults to 5.
  */
 'files.chunked_upload.max_parallel_count' => 5,
+
+/**
+ * Allow users to manually delete files from their trashbin.
+ * Automated deletions are not affected and will continue to work in cases like low remaining quota for example.
+ *
+ * Defaults to true.
+ */
+'files.trash.delete' => true,
 ];