[tests-only] Acceptance test changes pending for master

.drone.star

@@ -218,6 +218,19 @@ config = {
                 "chmod -R 0770 data/owncloud-keys",
             ],
         },
+        "cliDbConversion": {
+            "suites": [
+                "cliDbConversion",
+            ],
+            "databases": [
+                "sqlite",
+            ],
+            "dbServices": [
+                "sqlite",
+                "mysql:8.0",
+                "postgres:10.3",
+            ],
+        },
         "cliExternalStorage": {
             "suites": [
                 "cliExternalStorage",
@@ -1518,6 +1531,7 @@ def acceptance(ctx):
         "coreTarball": "daily-master-qa",
         "earlyFail": True,
         "selUserNeeded": False,
+        "dbServices": [],
     }
 
     if "defaults" in config:
@@ -1676,6 +1690,12 @@ def acceptance(ctx):
 
                                 federationDbSuffix = "fed"
 
+                                # database services
+                                dbServices = databaseService(db)
+                                for dbService in params["dbServices"]:
+                                    if (dbService != db):
+                                        dbServices += databaseService(dbService)
+
                                 result = {
                                     "kind": "pipeline",
                                     "type": "docker",
@@ -1722,7 +1742,7 @@ def acceptance(ctx):
                                                      }],
                                                  }),
                                              ] + buildGithubCommentForBuildStopped(name, params["earlyFail"]) + githubComment(params["earlyFail"]) + stopBuild(params["earlyFail"]),
-                                    "services": databaseService(db) +
+                                    "services": dbServices +
                                                 browserService(browser) +
                                                 emailService(params["emailNeeded"]) +
                                                 ldapService(params["ldapNeeded"]) +

apps/provisioning_api/lib/Groups.php

@@ -136,6 +136,10 @@ public function addGroup($parameters) {
 			\OCP\Util::writeLog('provisioning_api', 'Group name not supplied', \OCP\Util::ERROR);
 			return new OC_OCS_Result(null, 101, 'Invalid group name');
 		}
+		if (\trim($groupId) !== $groupId) {
+			\OCP\Util::writeLog('provisioning_api', 'Group name must not start or end with white space', \OCP\Util::ERROR);
+			return new OC_OCS_Result(null, 101, 'Invalid group name');
+		}
 		// Check if it exists
 		if ($this->groupManager->groupExists($groupId)) {
 			return new OC_OCS_Result(null, 102);

apps/provisioning_api/tests/GroupsTest.php

@@ -333,11 +333,26 @@ public function testGetSubAdminsOfGroupEmptyList() {
 		$this->assertEquals([], $result->getData());
 	}
 
-	public function testAddGroupEmptyGroup() {
+	public function dataAddGroupWithInvalidName() {
+		return [
+			[''],
+			[' '],
+			[' white-space-at-start'],
+			['white-space-at-end '],
+			[' white-space-at-both-ends '],
+		];
+	}
+
+	/**
+	 * @dataProvider dataAddGroupWithInvalidName
+	 *
+	 * @param string $groupName
+	 */
+	public function testAddGroupWithInvalidName($groupName) {
 		$this->request
 			->method('getParam')
 			->with('groupid')
-			->willReturn('');
+			->willReturn($groupName);
 
 		$result = $this->api->addGroup([]);
 

changelog/unreleased/39540

@@ -0,0 +1,3 @@
+Bugfix: Prevent group names starting or ending with white space
+
+https://github.com/owncloud/core/pull/39540

lib/private/Group/Manager.php

@@ -210,7 +210,7 @@ public function groupExists($gid) {
 	 * @return \OC\Group\Group
 	 */
 	public function createGroup($gid) {
-		if ($gid === '' || $gid === null) {
+		if ($gid === '' || $gid === null || \trim($gid) !== $gid) {
 			return false;
 		} elseif ($group = $this->get($gid)) {
 			return $group;

tests/TestHelpers/HttpRequestHelper.php

@@ -42,6 +42,28 @@
  * Helper for HTTP requests
  */
 class HttpRequestHelper {
+
+	/**
+	 * @var string
+	 */
+	private static $oCSelectorCookie = null;
+
+	/**
+	 * @return string
+	 */
+	public static function getOCSelectorCookie(): string {
+		return self::$oCSelectorCookie;
+	}
+
+	/**
+	 * @param string $oCSelectorCookie	"owncloud-selector=oc10;path=/;"
+	 *
+	 * @return void
+	 */
+	public static function setOCSelectorCookie(string $oCSelectorCookie): void {
+		self::$oCSelectorCookie = $oCSelectorCookie;
+	}
+
 	/**
 	 *
 	 * @param string|null $url
@@ -296,6 +318,22 @@ public static function createRequest(
 			$body = \http_build_query($body, '', '&');
 			$headers['Content-Type'] = 'application/x-www-form-urlencoded';
 		}
+
+		if (OcisHelper::isTestingParallelDeployment()) {
+			// oCIS cannot handle '/apps/testing' endpoints
+			// so those requests must be redirected to oC10 server
+			// change server to oC10 if the request url has `/apps/testing`
+			if (strpos($url, "/apps/testing") !== false) {
+				$oCISServerUrl = \getenv('TEST_SERVER_URL');
+				$oC10ServerUrl = \getenv('TEST_OC10_URL');
+
+				$url = str_replace($oCISServerUrl, $oC10ServerUrl, $url);
+			} else {
+				// set 'owncloud-server' selector cookie for oCIS requests
+				$headers['Cookie'] = self::getOCSelectorCookie();
+			}
+		}
+
 		$request = new Request(
 			$method,
 			$url,

tests/TestHelpers/OcisHelper.php

@@ -61,6 +61,13 @@ public static function isTestingOnOc10():bool {
 		return (!self::isTestingOnOcisOrReva());
 	}
 
+	/**
+	 * @return bool
+	 */
+	public static function isTestingParallelDeployment(): bool {
+		return (\getenv("TEST_PARALLEL_DEPLOYMENT") === "true");
+	}
+
 	/**
 	 * @return bool|string false if no command given or the command as string
 	 */

tests/TestHelpers/SetupHelper.php

@@ -865,7 +865,7 @@ public static function runOcc(
 		?string $ocPath = null,
 		?array $envVariables = null
 	):array {
-		if (OcisHelper::isTestingOnOcisOrReva()) {
+		if (OcisHelper::isTestingOnOcisOrReva() && !OcisHelper::isTestingParallelDeployment()) {
 			return ['code' => '', 'stdOut' => '', 'stdErr' => '' ];
 		}
 		$baseUrl = self::checkBaseUrl($baseUrl, "runOcc");
@@ -885,7 +885,8 @@ public static function runOcc(
 		}
 
 		$body = [];
-		$body['command'] = \implode(' ', $args);
+		$argsString = \implode(' ', $args);
+		$body['command'] = $argsString;
 
 		if ($envVariables !== null) {
 			$body['env_variables'] = $envVariables;
@@ -917,7 +918,7 @@ public static function runOcc(
 
 		if ($resultXml === false) {
 			throw new Exception(
-				"Response is not valid XML after executing 'occ $args'. " .
+				"Response is not valid XML after executing 'occ $argsString'. " .
 				$isTestingAppEnabledText .
 				$contents
 			);
@@ -929,47 +930,47 @@ public static function runOcc(
 
 		if (!isset($return['code'][0])) {
 			throw new Exception(
-				"Return code not found after executing 'occ $args'. " .
+				"Return code not found after executing 'occ $argsString'. " .
 				$isTestingAppEnabledText .
 				$contents
 			);
 		}
 
 		if (!isset($return['stdOut'][0])) {
 			throw new Exception(
-				"Return stdOut not found after executing 'occ $args'. " .
+				"Return stdOut not found after executing 'occ $argsString'. " .
 				$isTestingAppEnabledText .
 				$contents
 			);
 		}
 
 		if (!isset($return['stdErr'][0])) {
 			throw new Exception(
-				"Return stdErr not found after executing 'occ $args'. " .
+				"Return stdErr not found after executing 'occ $argsString'. " .
 				$isTestingAppEnabledText .
 				$contents
 			);
 		}
 
 		if (!\is_a($return['code'][0], "SimpleXMLElement")) {
 			throw new Exception(
-				"Return code is not a SimpleXMLElement after executing 'occ $args'. " .
+				"Return code is not a SimpleXMLElement after executing 'occ $argsString'. " .
 				$isTestingAppEnabledText .
 				$contents
 			);
 		}
 
 		if (!\is_a($return['stdOut'][0], "SimpleXMLElement")) {
 			throw new Exception(
-				"Return stdOut is not a SimpleXMLElement after executing 'occ $args'. " .
+				"Return stdOut is not a SimpleXMLElement after executing 'occ $argsString'. " .
 				$isTestingAppEnabledText .
 				$contents
 			);
 		}
 
 		if (!\is_a($return['stdErr'][0], "SimpleXMLElement")) {
 			throw new Exception(
-				"Return stdErr is not a SimpleXMLElement after executing 'occ $args'. " .
+				"Return stdErr is not a SimpleXMLElement after executing 'occ $argsString'. " .
 				$isTestingAppEnabledText .
 				$contents
 			);

tests/TestHelpers/WebDavHelper.php

@@ -23,6 +23,7 @@
 
 use Exception;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
@@ -363,6 +364,7 @@ public static function listFolder(
 	}
 
 	/**
+	 * sends a DAV request
 	 *
 	 * @param string|null $baseUrl
 	 * URL of owncloud e.g. http://localhost:8080
@@ -385,8 +387,11 @@ public static function listFolder(
 	 * @param Client|null $client
 	 * @param array|null $urlParameter to concatenate with path
 	 * @param string|null $doDavRequestAsUser run the DAV as this user, if null its same as $user
+	 * @param bool|null $usingSpacesDavPath to send request with spaces dav
+	 * @param string|null $spaceId space id to perform action on
 	 *
 	 * @return ResponseInterface
+	 * @throws GuzzleException
 	 */
 	public static function makeDavRequest(
 		?string $baseUrl,
@@ -397,22 +402,31 @@ public static function makeDavRequest(
 		?array $headers,
 		?string $xRequestId = '',
 		$body = null,
-		?int $davPathVersionToUse = 1,
+		?int $davPathVersionToUse = null,
 		?string $type = "files",
 		?string $sourceIpAddress = null,
 		?string $authType = "basic",
 		?bool $stream = false,
 		?int $timeout = 0,
 		?Client $client = null,
 		?array $urlParameter = [],
-		?string $doDavRequestAsUser = null
+		?string $doDavRequestAsUser = null,
+		?bool $usingSpacesDavPath = false,
+		?string $spaceId = null
 	):ResponseInterface {
 		$baseUrl = self::sanitizeUrl($baseUrl, true);
+
+		// set default dav version as 1
+		if (!$usingSpacesDavPath && !$davPathVersionToUse) {
+			$davPathVersionToUse = 1;
+		}
+
 		if ($doDavRequestAsUser === null) {
-			$davPath = self::getDavPath($user, $davPathVersionToUse, $type);
+			$davPath = self::getDavPath($user, $davPathVersionToUse, $type, $usingSpacesDavPath, $spaceId);
 		} else {
-			$davPath = self::getDavPath($doDavRequestAsUser, $davPathVersionToUse, $type);
+			$davPath = self::getDavPath($doDavRequestAsUser, $davPathVersionToUse, $type, $usingSpacesDavPath, $spaceId);
 		}
+
 		//replace %, # and ? and in the path, Guzzle will not encode them
 		$urlSpecialChar = [['%', '#', '?'], ['%25', '%23', '%3F']];
 		$path = \str_replace($urlSpecialChar[0], $urlSpecialChar[1], $path);
@@ -475,13 +489,17 @@ public static function makeDavRequest(
 	 * @param string|null $user
 	 * @param int|null $davPathVersionToUse (1|2)
 	 * @param string|null $type
+	 * @param bool $usingSpaces
+	 * @param string|null $spaceId
 	 *
 	 * @return string
 	 */
 	public static function getDavPath(
 		?string $user,
-		?int $davPathVersionToUse = 1,
-		?string $type = "files"
+		?int $davPathVersionToUse = null,
+		?string $type = "files",
+		?bool $usingSpaces = false,
+		?string $spaceId = null
 	):string {
 		if ($type === "public-files" || $type === "public-files-old") {
 			return "public.php/webdav/";
@@ -495,20 +513,24 @@ public static function getDavPath(
 		if ($type === "customgroups") {
 			return "remote.php/dav/";
 		}
-		if ($davPathVersionToUse === 1) {
-			$path = "remote.php/webdav/";
-			return $path;
-		} elseif ($davPathVersionToUse === 2) {
-			if ($type === "files") {
-				$path = 'remote.php/dav/files/';
-				return $path . $user . '/';
+		if ($usingSpaces) {
+			return "dav/spaces/" . $spaceId . '/';
+		} else {
+			if ($davPathVersionToUse === 1) {
+				$path = "remote.php/webdav/";
+				return $path;
+			} elseif ($davPathVersionToUse === 2) {
+				if ($type === "files") {
+					$path = 'remote.php/dav/files/';
+					return $path . $user . '/';
+				} else {
+					return "remote.php/dav";
+				}
 			} else {
-				return "remote.php/dav";
+				throw new InvalidArgumentException(
+					"DAV path version $davPathVersionToUse is unknown"
+				);
 			}
-		} else {
-			throw new InvalidArgumentException(
-				"DAV path version $davPathVersionToUse is unknown"
-			);
 		}
 	}
 

tests/acceptance/config/behat.yml

@@ -691,6 +691,14 @@ default:
       contexts:
         - FeatureContext: *common_feature_context_params
         - OccContext:
+
+    cliDbConversion:
+      paths:
+        - '%paths.base%/../features/cliDbConversion'
+      context: *common_ldap_suite_context
+      contexts:
+        - FeatureContext: *common_feature_context_params
+        - OccContext:
 
     cliEncryption:
       paths:
@@ -711,6 +719,7 @@ default:
         - FederationContext:
         - OccContext:
         - WebDavPropertiesContext:
+        - PublicWebDavContext:
 
     cliLocalStorage:
       paths: