sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: make remote.php configurable

Browse Source 
test: build dav paths

test: fix paths

test: merge method args

test: add issue tags

test: add new expected failure file

test: merge expected-failure files before running tests
This commit is contained in:
Saw-jan
2024-10-21 16:57:58 +05:45
parent 273915506e
commit f86d137f87
100 changed files with 2484 additions and 2329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/TestHelpers/HttpRequestHelper.php
+21
View File
@@ -104,6 +104,27 @@ class HttpRequestHelper {
$timeout
);
}
if (WebdavHelper::isDAVRequest($url) && \str_starts_with($url, OcisHelper::getServerUrl())) {
$withRemotePhp = \getenv("WITH_REMOTE_PHP") === "true";
$urlHasRemotePhp = \str_contains($url, 'remote.php');
if (!$withRemotePhp && $urlHasRemotePhp) {
throw new Exception("remote.php is disabled but found in the URL: $url");
}
if ($withRemotePhp && !$urlHasRemotePhp) {
throw new Exception("remote.php is enabled but not found in the URL: $url");
}
if ($headers && \array_key_exists("Destination", $headers)) {
if (!$withRemotePhp && $urlHasRemotePhp) {
throw new Exception("remote.php is disabled but found in the URL: $url");
}
if ($withRemotePhp && !$urlHasRemotePhp) {
throw new Exception("remote.php is enabled but not found in the URL: $url");
}
}
}
$request = self::createRequest(
$url,
$xRequestId,
tests/acceptance/TestHelpers/OcisHelper.php
+10
View File
@@ -33,6 +33,16 @@ use GuzzleHttp\Exception\GuzzleException;
* @package TestHelpers
*/
class OcisHelper {
/**
* @return string
*/
public static function getServerUrl(): string {
if (\getenv('TEST_SERVER_URL')) {
return \getenv('TEST_SERVER_URL');
}
return 'https://localhost:9200';
}
/**
* @return bool
*/
tests/acceptance/TestHelpers/UploadHelper.php
+1 -1
View File
@@ -170,7 +170,7 @@ class UploadHelper extends Assert {
if ($chunkingVersion === 2) {
$source = $v2ChunksDestination . '/.file';
$headers['Destination'] = $baseUrl . "/" .
WebDavHelper::getDavPath($user, $davPathVersionToUse) .
WebDavHelper::getDavPath($davPathVersionToUse, $user) .
$destination;
$result = WebDavHelper::makeDavRequest(
$baseUrl,
tests/acceptance/TestHelpers/WebDavHelper.php
+88 -53
View File
@@ -46,6 +46,30 @@ class WebDavHelper {
*/
public static array $spacesIdRef = [];
/**
* clear space id reference for user
*
* @param string $urlPath
*
* @return string
*/
public static function withRemotePhp(string $urlPath): string {
if (\getenv("WITH_REMOTE_PHP") === "true") {
return "remote.php/$urlPath";
}
return $urlPath;
}
/**
* @param string $url
*
* @return bool
*/
public static function isDAVRequest(string $url): bool {
$found = \preg_match("/(\bwebdav\b|\bdav\b)/", $url);
return (bool)$found;
}
/**
* clear space id reference for user
*
@@ -534,7 +558,7 @@ class WebDavHelper {
if ($json === null) {
// the graph endpoint did not give a useful answer
// try getting the information from the webdav endpoint
$fullUrl = $trimmedBaseUrl . '/remote.php/webdav';
$fullUrl = "$trimmedBaseUrl/" . self::getDavPath(self::DAV_VERSION_NEW, $user);
$response = HttpRequestHelper::sendRequest(
$fullUrl,
$xRequestId,
@@ -702,12 +726,12 @@ class WebDavHelper {
}
// get space id if testing with spaces dav
if ($spaceId === null && $davPathVersionToUse === self::DAV_VERSION_SPACES) {
if ($spaceId === null && $davPathVersionToUse === self::DAV_VERSION_SPACES && !\in_array($type, ["public-files", "versions"])) {
$path = \ltrim($path, "/");
if (\str_starts_with($path, "Shares/")) {
$spaceId = self::getSharesSpaceIdForUser(
$baseUrl,
$doDavRequestAsUser ?? $user,
$user,
$password,
$xRequestId
);
@@ -715,14 +739,22 @@ class WebDavHelper {
} else {
$spaceId = self::getPersonalSpaceIdForUserOrFakeIfNotFound(
$baseUrl,
$doDavRequestAsUser ?? $user,
$user,
$password,
$xRequestId
);
}
}
$davPath = self::getDavPath($doDavRequestAsUser ?? $user, $davPathVersionToUse, $type, $spaceId);
$uniquePath = $user;
if ($davPathVersionToUse === self::DAV_VERSION_SPACES && !\in_array($type, ["archive", "versions", "public-files"])) {
$uniquePath = $spaceId;
} elseif ($type === "versions") {
// $path is file-id in case of versions
$uniquePath = $path;
}
$davPath = self::getDavPath($davPathVersionToUse, $uniquePath, $type);
//replace %, # and ? and in the path, Guzzle will not encode them
$urlSpecialChar = [['%', '#', '?'], ['%25', '%23', '%3F']];
@@ -732,14 +764,18 @@ class WebDavHelper {
$urlParameter = \http_build_query($urlParameter, '', '&');
$path .= '?' . $urlParameter;
}
$fullUrl = self::sanitizeUrl($baseUrl . "/$davPath" . $path);
$fullUrl = self::sanitizeUrl("{$baseUrl}/{$davPath}");
// NOTE: no need to append path for archive and versions endpoints
if (!\in_array($type, ["archive", "versions"])) {
$fullUrl .= "/" . \ltrim($path, "/");
}
if ($authType === 'bearer') {
$headers['Authorization'] = 'Bearer ' . $password;
$user = null;
$password = null;
}
if ($type === "public-files-new") {
if ($type === "public-files") {
if ($password === null || $password === "") {
$user = null;
} else {
@@ -769,7 +805,7 @@ class WebDavHelper {
$fullUrl,
$xRequestId,
$method,
$user,
$doDavRequestAsUser ?? $user,
$password,
$headers,
$body,
@@ -785,67 +821,66 @@ class WebDavHelper {
/**
* get the dav path
*
* @param string|null $user
* @param int|null $davPathVersionToUse (1|2)
* @param int $davPathVersion (1|2|3)
* @param string|null $userOrItemIdOrSpaceIdOrToken 'user' or 'file-id' or 'space-id' or 'public-token'
* @param string|null $type
* @param string|null $spaceId
*
* @return string
*/
public static function getDavPath(
?string $user,
?int $davPathVersionToUse = null,
?string $type = "files",
?string $spaceId = null
int $davPathVersion,
?string $userOrItemIdOrSpaceIdOrToken = null,
?string $type = "files"
):string {
$newTrashbinDavPath = "remote.php/dav/trash-bin/$user/";
switch ($type) {
case 'public-files':
case 'public-files-old':
return "public.php/webdav/";
case 'public-files-new':
return "remote.php/dav/public-files/$user/";
case 'archive':
return "remote.php/dav/archive/$user/files";
return self::withRemotePhp("dav/archive/$userOrItemIdOrSpaceIdOrToken/files");
case 'versions':
case 'customgroups':
return "remote.php/dav/";
return self::withRemotePhp("dav/meta/$userOrItemIdOrSpaceIdOrToken/v");
case 'comments':
return self::withRemotePhp("dav/comments/files");
default:
break;
}
if ($davPathVersionToUse === self::DAV_VERSION_SPACES) {
if ($davPathVersion === self::DAV_VERSION_SPACES) {
if ($type === "trash-bin") {
if ($userOrItemIdOrSpaceIdOrToken === null) {
throw new InvalidArgumentException("Space ID is required for trash-bin endpoint");
}
return self::withRemotePhp("dav/spaces/trash-bin/$userOrItemIdOrSpaceIdOrToken");
} elseif ($type === "public-files") {
// spaces DAV path doesn't have own public-files endpoint
return self::withRemotePhp("dav/public-files/$userOrItemIdOrSpaceIdOrToken");
}
// return spaces root path if spaceid is null
// REPORT request uses spaces root path
if ($spaceId === null) {
return "remote.php/dav/spaces/";
if ($userOrItemIdOrSpaceIdOrToken === null) {
return self::withRemotePhp("dav/spaces");
}
if ($type === "trash-bin") {
return "remote.php/dav/spaces/trash-bin/" . $spaceId . '/';
}
return "remote.php/dav/spaces/" . $spaceId . '/';
return self::withRemotePhp("dav/spaces/$userOrItemIdOrSpaceIdOrToken");
} else {
if ($davPathVersionToUse === self::DAV_VERSION_OLD) {
if ($type === "trash-bin") {
// Since there is no trash bin endpoint for old dav version, new dav version's endpoint is used here.
return $newTrashbinDavPath;
}
return "remote.php/webdav/";
} elseif ($davPathVersionToUse === self::DAV_VERSION_NEW) {
if ($type === "files") {
$path = 'remote.php/dav/files/';
return $path . $user . '/';
} elseif ($type === "trash-bin") {
return $newTrashbinDavPath;
} else {
return "remote.php/dav";
}
} else {
throw new InvalidArgumentException(
"DAV path version $davPathVersionToUse is unknown"
);
if ($type === "trash-bin") {
// Since there is no trash bin endpoint for old dav version,
// new dav version's endpoint is used here.
return self::withRemotePhp("dav/trash-bin/$userOrItemIdOrSpaceIdOrToken");
}
if ($davPathVersion === self::DAV_VERSION_OLD) {
if ($type === "public-files") {
// TODO: cleanup
// this endpoint does not exist
return self::withRemotePhp("public.php/webdav");
}
return self::withRemotePhp("webdav");
} elseif ($davPathVersion === self::DAV_VERSION_NEW) {
if ($type === "files") {
return self::withRemotePhp("dav/files/$userOrItemIdOrSpaceIdOrToken");
} elseif ($type === "public-files") {
return self::withRemotePhp("dav/public-files/$userOrItemIdOrSpaceIdOrToken");
}
return self::withRemotePhp("dav");
}
throw new InvalidArgumentException("Invalid DAV path: $davPathVersion");
}
}
@@ -917,12 +952,12 @@ class WebDavHelper {
$baseUrl,
null,
null,
"/public-files/$token/$fileName",
"{$token}/{$fileName}",
['d:getlastmodified'],
$xRequestId,
'1',
null,
null,
"public-files",
$davVersionToUse
);
$responseXmlObject = HttpRequestHelper::getResponseXml(