Merge pull request #20158 from nextcloud/backport/19930/stable18

[stable18] Add app config to disable user flows

Author: rullzer

apps/workflowengine/lib/Controller/UserWorkflowsController.php

@@ -106,7 +106,7 @@ public function destroy(int $id): DataResponse {
 	protected function getScopeContext(): ScopeContext {
 		if($this->scopeContext === null) {
 			$user = $this->session->getUser();
-			if(!$user) {
+			if(!$user || !$this->manager->isUserScopeEnabled()) {
 				throw new OCSForbiddenException('User not logged in');
 			}
 			$this->scopeContext = new ScopeContext(IManager::SCOPE_USER, $user->getUID());

apps/workflowengine/lib/Manager.php

@@ -23,6 +23,7 @@
 
 use Doctrine\DBAL\DBALException;
 use OC\Cache\CappedMemoryCache;
+use OCA\WorkflowEngine\AppInfo\Application;
 use OCA\WorkflowEngine\Check\FileMimeType;
 use OCA\WorkflowEngine\Check\FileName;
 use OCA\WorkflowEngine\Check\FileSize;
@@ -40,6 +41,7 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Storage\IStorage;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\ILogger;
@@ -108,14 +110,18 @@ class Manager implements IManager {
 	/** @var IEventDispatcher */
 	private $dispatcher;
 
+	/** @var IConfig */
+	private $config;
+
 	public function __construct(
 		IDBConnection $connection,
 		IServerContainer $container,
 		IL10N $l,
 		LegacyDispatcher $eventDispatcher,
 		ILogger $logger,
 		IUserSession $session,
-		IEventDispatcher $dispatcher
+		IEventDispatcher $dispatcher,
+		IConfig $config
 	) {
 		$this->connection = $connection;
 		$this->container = $container;
@@ -125,6 +131,7 @@ public function __construct(
 		$this->operationsByScope = new CappedMemoryCache(64);
 		$this->session = $session;
 		$this->dispatcher = $dispatcher;
+		$this->config = $config;
 	}
 
 	public function getRuleMatcher(): IRuleMatcher {
@@ -704,4 +711,8 @@ protected function getBuildInChecks(): array {
 			return [];
 		}
 	}
+
+	public function isUserScopeEnabled(): bool {
+		return $this->config->getAppValue(Application::APP_ID, 'user_scope_disabled', 'no') === 'no';
+	}
 }

apps/workflowengine/lib/Service/RuleMatcher.php

@@ -117,7 +117,7 @@ public function getFlows(bool $returnFirstMatchingOperationOnly = true): array {
 	public function getMatchingOperations(string $class, bool $returnFirstMatchingOperationOnly = true): array {
 		$scopes[] = new ScopeContext(IManager::SCOPE_ADMIN);
 		$user = $this->session->getUser();
-		if($user !== null) {
+		if($user !== null && $this->manager->isUserScopeEnabled()) {
 			$scopes[] = new ScopeContext(IManager::SCOPE_USER, $user->getUID());
 		}
 

apps/workflowengine/lib/Settings/ASettings.php

@@ -49,7 +49,7 @@ abstract class ASettings implements ISettings {
 	private $eventDispatcher;
 
 	/** @var Manager */
-	private $manager;
+	protected $manager;
 
 	/** @var IInitialStateService */
 	private $initialStateService;

apps/workflowengine/lib/Settings/Personal.php

@@ -31,4 +31,8 @@ class Personal extends ASettings {
 	function getScope(): int {
 		return IManager::SCOPE_USER;
 	}
+
+	public function getSection() {
+		return $this->manager->isUserScopeEnabled() ? 'workflow' : null;
+	}
 }

apps/workflowengine/tests/ManagerTest.php

@@ -28,6 +28,7 @@
 use OCA\WorkflowEngine\Manager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\ILogger;
@@ -67,6 +68,8 @@ class ManagerTest extends TestCase {
 	protected $l;
 	/** @var MockObject|IEventDispatcher */
 	protected $dispatcher;
+	/** @var MockObject|IConfig */
+	protected $config;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -84,6 +87,7 @@ protected function setUp(): void {
 		$this->logger = $this->createMock(ILogger::class);
 		$this->session = $this->createMock(IUserSession::class);
 		$this->dispatcher = $this->createMock(IEventDispatcher::class);
+		$this->config = $this->createMock(IConfig::class);
 
 		$this->manager = new Manager(
 			\OC::$server->getDatabaseConnection(),
@@ -92,7 +96,8 @@ protected function setUp(): void {
 			$this->legacyDispatcher,
 			$this->logger,
 			$this->session,
-			$this->dispatcher
+			$this->dispatcher,
+			$this->config
 		);
 		$this->clearTables();
 	}