upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #49558 from nextcloud/chore/remove_legacy_endpoint

Browse source
This commit is contained in:
Kate 2024-12-02 12:47:06 +01:00 committed by GitHub
commit 9fcf5a5600
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 1 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_sharing/appinfo/routes.php
View file

@ -40,12 +40,6 @@ return [
'verb' => 'GET',
'root' => '',
],
[
'name' => 'externalShares#testRemote',
'url' => '/testremote',
'verb' => 'GET'
],
[
'name' => 'PublicPreview#getPreview',
'url' => '/publicpreview/{token}',

66
apps/files_sharing/lib/Controller/ExternalSharesController.php
View file

@ -8,11 +8,7 @@ namespace OCA\Files_Sharing\Controller;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\IRequest;
/**
@ -25,8 +21,6 @@ class ExternalSharesController extends Controller {
string $appName,
IRequest $request,
private \OCA\Files_Sharing\External\Manager $externalManager,
private IClientService $clientService,
private IConfig $config,
) {
parent::__construct($appName, $request);
}
@ -64,64 +58,4 @@ class ExternalSharesController extends Controller {
$this->externalManager->declineShare($id);
return new JSONResponse();
}
/**
* Test whether the specified remote is accessible
*
* @param string $remote
* @param bool $checkVersion
* @return bool
*/
protected function testUrl($remote, $checkVersion = false) {
try {
$client = $this->clientService->newClient();
$response = json_decode($client->get(
$remote,
[
'timeout' => 3,
'connect_timeout' => 3,
'verify' => !$this->config->getSystemValueBool('sharing.federation.allowSelfSignedCertificates', false),
]
)->getBody());
if ($checkVersion) {
return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
} else {
return is_object($response);
}
} catch (\Exception $e) {
return false;
}
}
/**
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired
*
* @param string $remote
* @return DataResponse
* @AnonRateThrottle(limit=5, period=120)
*/
#[PublicPage]
public function testRemote($remote) {
if (preg_match('%[!#$&\'()*+,;=?@[\]]%', $remote)) {
return new DataResponse(false);
}
if (
$this->testUrl('https://' . $remote . '/ocm-provider/') ||
$this->testUrl('https://' . $remote . '/ocm-provider/index.php') ||
$this->testUrl('https://' . $remote . '/status.php', true)
) {
return new DataResponse('https');
} elseif (
$this->testUrl('http://' . $remote . '/ocm-provider/') ||
$this->testUrl('http://' . $remote . '/ocm-provider/index.php') ||
$this->testUrl('http://' . $remote . '/status.php', true)
) {
return new DataResponse('http');
} else {
return new DataResponse(false);
}
}
}

7
apps/files_sharing/openapi.json
View file

@ -3805,10 +3805,5 @@
}
}
},
"tags": [
{
"name": "external_shares",
"description": "Class ExternalSharesController"
}
]
"tags": []
}

89
apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
View file

@ -8,11 +8,8 @@ namespace OCA\Files_Sharing\Tests\Controllers;
use OCA\Files_Sharing\Controller\ExternalSharesController;
use OCA\Files_Sharing\External\Manager;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\Http\Client\IClient;
use OCP\Http\Client\IClientService;
use OCP\Http\Client\IResponse;
use OCP\IConfig;
use OCP\IRequest;
use PHPUnit\Framework\MockObject\MockObject;
@ -79,90 +76,4 @@ class ExternalShareControllerTest extends \Test\TestCase {
$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->destroy(4));
}
public function testRemoteWithValidHttps(): void {
$client = $this->createMock(IClient::class);
$response = $this->createMock(IResponse::class);
$response
->expects($this->exactly(2))
->method('getBody')
->willReturnOnConsecutiveCalls(
'Certainly not a JSON string',
'{"installed":true,"maintenance":false,"version":"8.1.0.8","versionstring":"8.1.0","edition":""}'
);
$client
->expects($this->any())
->method('get')
->willReturn($response);
$this->clientService
->expects($this->exactly(2))
->method('newClient')
->willReturn($client);
$this->assertEquals(new DataResponse('https'), $this->getExternalShareController()->testRemote('nextcloud.com'));
}
public function testRemoteWithWorkingHttp(): void {
$client = $this->createMock(IClient::class);
$response = $this->createMock(IResponse::class);
$client
->method('get')
->willReturn($response);
$response
->expects($this->exactly(5))
->method('getBody')
->willReturnOnConsecutiveCalls(
'Certainly not a JSON string',
'Certainly not a JSON string',
'Certainly not a JSON string',
'Certainly not a JSON string',
'{"installed":true,"maintenance":false,"version":"8.1.0.8","versionstring":"8.1.0","edition":""}'
);
$this->clientService
->expects($this->exactly(5))
->method('newClient')
->willReturn($client);
$this->assertEquals(new DataResponse('http'), $this->getExternalShareController()->testRemote('nextcloud.com'));
}
public function testRemoteWithInvalidRemote(): void {
$client = $this->createMock(IClient::class);
$response = $this->createMock(IResponse::class);
$client
->expects($this->exactly(6))
->method('get')
->willReturn($response);
$response
->expects($this->exactly(6))
->method('getBody')
->willReturn('Certainly not a JSON string');
$this->clientService
->expects($this->exactly(6))
->method('newClient')
->willReturn($client);
$this->assertEquals(new DataResponse(false), $this->getExternalShareController()->testRemote('nextcloud.com'));
}
public function dataRemoteWithInvalidRemoteURLs(): array {
return [
['nextcloud.com?query'],
['nextcloud.com/#anchor'],
['nextcloud.com/;tomcat'],
];
}
/**
* @dataProvider dataRemoteWithInvalidRemoteURLs
* @param string $remote
*/
public function testRemoteWithInvalidRemoteURLs(string $remote): void {
$this->clientService
->expects($this->never())
->method('newClient');
$this->assertEquals(new DataResponse(false), $this->getExternalShareController()->testRemote($remote));
}
}