Merge pull request #662 from nextcloud/groupbackend-upup

Implementation of Groupbackend II

.github/workflows/integration.yml

@@ -100,6 +100,12 @@ jobs:
           mkdir data
           ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
           ./occ app:enable --force ${{ env.APP_NAME }}
+          cat << EOF > config/debug.config.php
+          <?php
+          \$CONFIG = [
+            'log.condition' => ['apps' => ['user_saml']],
+          ];
+          EOF
           PHP_CLI_SERVER_WORKERS=4 php -S localhost:8080 &
 
       - name: Run behat

.github/workflows/phpunit-oci.yml

@@ -34,7 +34,7 @@ concurrency:
 
 jobs:
   phpunit-oci:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 6.1.0
+
+### Added
+
+- [Group backend and migration of original SAML groups created as local database groups (user_saml#622)](https://github.com/nextcloud/user_saml/pull/622)
+
 ## 6.0.1
 
 ### Added 

appinfo/app.php

@@ -19,9 +19,15 @@
  *
  */
 
+use OCA\User_SAML\GroupBackend;
+use OCA\User_SAML\SAMLSettings;
+use OCA\User_SAML\UserBackend;
+use OCP\IGroupManager;
+use Psr\Log\LoggerInterface;
+
 require_once __DIR__ . '/../3rdparty/vendor/autoload.php';
 
-// If we run in CLI mode do not setup the app as it can fail the OCC execution
+// If we run in CLI mode do not set up the app as it can fail the OCC execution
 // since the URLGenerator isn't accessible.
 $cli = false;
 if (OC::$CLI) {
@@ -35,30 +41,17 @@
 	$userSession = \OC::$server->getUserSession();
 	$session = \OC::$server->getSession();
 } catch (Throwable $e) {
-	$logger = \OCP\Server::get(\Psr\Log\LoggerInterface::class);
+	$logger = \OCP\Server::get(LoggerInterface::class);
 	$logger->critical($e->getMessage(), ['exception' => $e, 'app' => 'user_saml']);
 	return;
 }
 
-$samlSettings = \OC::$server->query(\OCA\User_SAML\SAMLSettings::class);
-
-$userData = new \OCA\User_SAML\UserData(
-	new \OCA\User_SAML\UserResolver(\OC::$server->getUserManager()),
-	$samlSettings,
-);
-
-$userBackend = new \OCA\User_SAML\UserBackend(
-	$config,
-	$urlGenerator,
-	\OC::$server->getSession(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserManager(),
-	\OC::$server->getGroupManager(),
-	$samlSettings,
-	\OCP\Server::get(\Psr\Log\LoggerInterface::class),
-	$userData,
-	\OC::$server->query(\OCP\EventDispatcher\IEventDispatcher::class),
-);
+$groupBackend = \OC::$server->get(GroupBackend::class);
+\OC::$server->get(IGroupManager::class)->addBackend($groupBackend);
+
+$samlSettings = \OC::$server->get(SAMLSettings::class);
+
+$userBackend = \OCP\Server::get(UserBackend::class);
 $userBackend->registerBackends(\OC::$server->getUserManager()->getBackends());
 OC_User::useBackend($userBackend);
 

appinfo/info.xml

@@ -16,7 +16,7 @@ The following providers are supported and tested at the moment:
 	* Any other provider that authenticates using the environment variable
 
 While theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.]]></description>
-	<version>6.0.1</version>
+	<version>6.1.0</version>
 	<licence>agpl</licence>
 	<author>Lukas Reschke</author>
 	<namespace>User_SAML</namespace>
@@ -35,6 +35,11 @@ While theoretically any other authentication provider implementing either one of
 	<dependencies>
 		<nextcloud min-version="28" max-version="29" />
 	</dependencies>
+	<repair-steps>
+		<post-migration>
+			<step>OCA\User_SAML\Migration\RememberLocalGroupsForPotentialMigrations</step>
+		</post-migration>
+	</repair-steps>
 	<commands>
 		<command>OCA\User_SAML\Command\ConfigCreate</command>
 		<command>OCA\User_SAML\Command\ConfigDelete</command>

composer.json

@@ -18,6 +18,6 @@
 		"nextcloud/coding-standard": "^1.1",
 		"phpunit/phpunit": "^9",
 		"psalm/phar": "^5.13",
-		"nextcloud/ocp": "^27.0"
+		"nextcloud/ocp": "dev-stable27"
 	}
 }

lib/Exceptions/GroupNotFoundException.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Arthur Schiwon <[email protected]>
+ *
+ * @author Arthur Schiwon <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\User_SAML\Exceptions;
+
+class GroupNotFoundException extends \RuntimeException {
+}

lib/Exceptions/NonMigratableGroupException.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Arthur Schiwon <[email protected]>
+ *
+ * @author Arthur Schiwon <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\User_SAML\Exceptions;
+
+class NonMigratableGroupException extends \RuntimeException {
+}