upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #36557 from nextcloud/backport/36452/stable25

Browse source 
[stable25] perf(federation): Only request root share info for checking availability
This commit is contained in:
blizzz 2023-02-07 18:35:03 +01:00 committed by GitHub
commit 5c53fe73aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/files_sharing/lib/Controller/ShareInfoController.php
View file

@ -59,13 +59,8 @@ class ShareInfoController extends ApiController {
* @PublicPage
* @NoCSRFRequired
* @BruteForceProtection(action=shareinfo)
*
* @param string $t
* @param null $password
* @param null $dir
* @return JSONResponse
*/
public function info($t, $password = null, $dir = null) {
public function info(string $t, ?string $password = null, ?string $dir = null, int $depth = -1): JSONResponse {
try {
$share = $this->shareManager->getShareByToken($t);
} catch (ShareNotFound $e) {
@ -96,34 +91,39 @@ class ShareInfoController extends ApiController {
}
}
return new JSONResponse($this->parseNode($node, $permissionMask));
return new JSONResponse($this->parseNode($node, $permissionMask, $depth));
}
private function parseNode(Node $node, int $permissionMask) {
private function parseNode(Node $node, int $permissionMask, int $depth): array {
if ($node instanceof File) {
return $this->parseFile($node, $permissionMask);
}
return $this->parseFolder($node, $permissionMask);
/** @var Folder $node */
return $this->parseFolder($node, $permissionMask, $depth);
}
private function parseFile(File $file, int $permissionMask) {
private function parseFile(File $file, int $permissionMask): array {
return $this->format($file, $permissionMask);
}
private function parseFolder(Folder $folder, int $permissionMask) {
private function parseFolder(Folder $folder, int $permissionMask, int $depth): array {
$data = $this->format($folder, $permissionMask);
if ($depth === 0) {
return $data;
}
$data['children'] = [];
$nodes = $folder->getDirectoryListing();
foreach ($nodes as $node) {
$data['children'][] = $this->parseNode($node, $permissionMask);
$data['children'][] = $this->parseNode($node, $permissionMask, $depth <= -1 ? -1 : $depth - 1);
}
return $data;
}
private function format(Node $node, int $permissionMask) {
private function format(Node $node, int $permissionMask): array {
$entry = [];
$entry['id'] = $node->getId();

6
apps/files_sharing/lib/External/Storage.php vendored
View file

@ -214,7 +214,7 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage,
public function checkStorageAvailability() {
// see if we can find out why the share is unavailable
try {
$this->getShareInfo();
$this->getShareInfo(0);
} catch (NotFoundException $e) {
// a 404 can either mean that the share no longer exists or there is no Nextcloud on the remote
if ($this->testRemote()) {
@ -308,7 +308,7 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage,
* @throws NotFoundException
* @throws \Exception
*/
public function getShareInfo() {
public function getShareInfo(int $depth = -1) {
$remote = $this->getRemote();
$token = $this->getToken();
$password = $this->getPassword();
@ -331,7 +331,7 @@ class Storage extends DAV implements ISharedStorage, IDisableEncryptionStorage,
$client = \OC::$server->getHTTPClientService()->newClient();
try {
$response = $client->post($url, [
'body' => ['password' => $password],
'body' => ['password' => $password, 'depth' => $depth],
'timeout' => 10,
'connect_timeout' => 10,
]);