mirror of https://github.com/nextcloud/server.git
Add check for activated local memcache
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it. Fixes https://github.com/owncloud/core/issues/14956remotes/origin/poc-doctrine-migrations
Lukas Reschke
9 years ago
parent
d3752ca1e9
commit
65202d2a18
@ -1,40 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* @author Lukas Reschke <lukas@owncloud.com>
|
||||
* @author Morris Jobke <hey@morrisjobke.de>
|
||||
* @author Vincent Petry <pvince81@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
OCP\JSON::checkAdminUser();
|
||||
OCP\JSON::callCheck();
|
||||
|
||||
\OC::$server->getSession()->close();
|
||||
|
||||
// no warning when has_internet_connection is false in the config
|
||||
$hasInternet = true;
|
||||
if (OC_Util::isInternetConnectionEnabled()) {
|
||||
$hasInternet = OC_Util::isInternetConnectionWorking(\OC::$server->getHTTPClientService());
|
||||
}
|
||||
|
||||
OCP\JSON::success(
|
||||
array (
|
||||
'serverHasInternetConnection' => $hasInternet,
|
||||
'dataDirectoryProtected' => OC_Util::isHtaccessWorking()
|
||||
)
|
||||
);
|
||||
@ -0,0 +1,99 @@
|
||||
<?php
|
||||
/**
|
||||
* @author Lukas Reschke <lukas@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Settings\Controller;
|
||||
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\DataResponse;
|
||||
use OCP\Http\Client\IClientService;
|
||||
use OCP\IConfig;
|
||||
use OCP\IRequest;
|
||||
use OC_Util;
|
||||
|
||||
/**
|
||||
* @package OC\Settings\Controller
|
||||
*/
|
||||
class CheckSetupController extends Controller {
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
/** @var IClientService */
|
||||
private $clientService;
|
||||
/** @var \OC_Util */
|
||||
private $util;
|
||||
|
||||
/**
|
||||
* @param string $AppName
|
||||
* @param IRequest $request
|
||||
* @param IConfig $config
|
||||
* @param IClientService $clientService
|
||||
* @param \OC_Util $util
|
||||
*/
|
||||
public function __construct($AppName,
|
||||
IRequest $request,
|
||||
IConfig $config,
|
||||
IClientService $clientService,
|
||||
\OC_Util $util) {
|
||||
parent::__construct($AppName, $request);
|
||||
$this->config = $config;
|
||||
$this->clientService = $clientService;
|
||||
$this->util = $util;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the ownCloud server can connect to the internet using HTTPS and HTTP
|
||||
* @return bool
|
||||
*/
|
||||
private function isInternetConnectionWorking() {
|
||||
if ($this->config->getSystemValue('has_internet_connection', true) === false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
$client = $this->clientService->newClient();
|
||||
$client->get('https://www.owncloud.org/');
|
||||
$client->get('http://www.owncloud.org/');
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether a local memcache is installed or not
|
||||
* @return bool
|
||||
*/
|
||||
private function isMemcacheConfigured() {
|
||||
return $this->config->getSystemValue('memcache.local', null) !== null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return DataResponse
|
||||
*/
|
||||
public function check() {
|
||||
return new DataResponse(
|
||||
[
|
||||
'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
|
||||
'dataDirectoryProtected' => $this->util->isHtaccessWorking($this->config),
|
||||
'isMemcacheConfigured' => $this->isMemcacheConfigured(),
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,231 @@
|
||||
<?php
|
||||
/**
|
||||
* @author Lukas Reschke <lukas@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Settings\Controller;
|
||||
|
||||
use OCP\AppFramework\Http\DataResponse;
|
||||
use Test\TestCase;
|
||||
use OCP\IRequest;
|
||||
use OCP\IConfig;
|
||||
use OCP\Http\Client\IClientService;
|
||||
use OC_Util;
|
||||
|
||||
/**
|
||||
* Class CheckSetupControllerTest
|
||||
*
|
||||
* @package OC\Settings\Controller
|
||||
*/
|
||||
class CheckSetupControllerTest extends TestCase {
|
||||
/** @var CheckSetupController */
|
||||
private $checkSetupController;
|
||||
/** @var IRequest */
|
||||
private $request;
|
||||
/** @var IConfig */
|
||||
private $config;
|
||||
/** @var IClientService */
|
||||
private $clientService;
|
||||
/** @var OC_Util */
|
||||
private $util;
|
||||
|
||||
public function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->request = $this->getMockBuilder('\OCP\IRequest')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$this->config = $this->getMockBuilder('\OCP\IConfig')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$this->config = $this->getMockBuilder('\OCP\IConfig')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$this->clientService = $this->getMockBuilder('\OCP\Http\Client\IClientService')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$this->util = $this->getMockBuilder('\OC_Util')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
|
||||
$this->checkSetupController = new CheckSetupController(
|
||||
'settings',
|
||||
$this->request,
|
||||
$this->config,
|
||||
$this->clientService,
|
||||
$this->util
|
||||
);
|
||||
}
|
||||
|
||||
public function testIsInternetConnectionWorkingDisabledViaConfig() {
|
||||
$this->config->expects($this->once())
|
||||
->method('getSystemValue')
|
||||
->with('has_internet_connection', true)
|
||||
->will($this->returnValue(false));
|
||||
|
||||
$this->assertFalse(
|
||||
\Test_Helper::invokePrivate(
|
||||
$this->checkSetupController,
|
||||
'isInternetConnectionWorking'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public function testIsInternetConnectionWorkingCorrectly() {
|
||||
$this->config->expects($this->once())
|
||||
->method('getSystemValue')
|
||||
->with('has_internet_connection', true)
|
||||
->will($this->returnValue(true));
|
||||
|
||||
$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$client->expects($this->at(0))
|
||||
->method('get')
|
||||
->with('https://www.owncloud.org/', []);
|
||||
$client->expects($this->at(1))
|
||||
->method('get')
|
||||
->with('http://www.owncloud.org/', []);
|
||||
|
||||
$this->clientService->expects($this->once())
|
||||
->method('newClient')
|
||||
->will($this->returnValue($client));
|
||||
|
||||
|
||||
$this->assertTrue(
|
||||
\Test_Helper::invokePrivate(
|
||||
$this->checkSetupController,
|
||||
'isInternetConnectionWorking'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public function testIsInternetConnectionHttpsFail() {
|
||||
$this->config->expects($this->once())
|
||||
->method('getSystemValue')
|
||||
->with('has_internet_connection', true)
|
||||
->will($this->returnValue(true));
|
||||
|
||||
$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$client->expects($this->at(0))
|
||||
->method('get')
|
||||
->with('https://www.owncloud.org/', [])
|
||||
->will($this->throwException(new \Exception()));
|
||||
|
||||
$this->clientService->expects($this->once())
|
||||
->method('newClient')
|
||||
->will($this->returnValue($client));
|
||||
|
||||
$this->assertFalse(
|
||||
\Test_Helper::invokePrivate(
|
||||
$this->checkSetupController,
|
||||
'isInternetConnectionWorking'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public function testIsInternetConnectionHttpFail() {
|
||||
$this->config->expects($this->once())
|
||||
->method('getSystemValue')
|
||||
->with('has_internet_connection', true)
|
||||
->will($this->returnValue(true));
|
||||
|
||||
$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$client->expects($this->at(0))
|
||||
->method('get')
|
||||
->with('https://www.owncloud.org/', []);
|
||||
$client->expects($this->at(1))
|
||||
->method('get')
|
||||
->with('http://www.owncloud.org/', [])
|
||||
->will($this->throwException(new \Exception()));
|
||||
|
||||
$this->clientService->expects($this->once())
|
||||
->method('newClient')
|
||||
->will($this->returnValue($client));
|
||||
|
||||
$this->assertFalse(
|
||||
\Test_Helper::invokePrivate(
|
||||
$this->checkSetupController,
|
||||
'isInternetConnectionWorking'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public function testIsMemcacheConfiguredFalse() {
|
||||
$this->config->expects($this->once())
|
||||
->method('getSystemValue')
|
||||
->with('memcache.local', null)
|
||||
->will($this->returnValue(null));
|
||||
|
||||
$this->assertFalse(
|
||||
\Test_Helper::invokePrivate(
|
||||
$this->checkSetupController,
|
||||
'isMemcacheConfigured'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public function testIsMemcacheConfiguredTrue() {
|
||||
$this->config->expects($this->once())
|
||||
->method('getSystemValue')
|
||||
->with('memcache.local', null)
|
||||
->will($this->returnValue('SomeProvider'));
|
||||
|
||||
$this->assertTrue(
|
||||
\Test_Helper::invokePrivate(
|
||||
$this->checkSetupController,
|
||||
'isMemcacheConfigured'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public function testCheck() {
|
||||
$this->config->expects($this->at(0))
|
||||
->method('getSystemValue')
|
||||
->with('has_internet_connection', true)
|
||||
->will($this->returnValue(true));
|
||||
$this->config->expects($this->at(1))
|
||||
->method('getSystemValue')
|
||||
->with('memcache.local', null)
|
||||
->will($this->returnValue('SomeProvider'));
|
||||
|
||||
$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
|
||||
->disableOriginalConstructor()->getMock();
|
||||
$client->expects($this->at(0))
|
||||
->method('get')
|
||||
->with('https://www.owncloud.org/', []);
|
||||
$client->expects($this->at(1))
|
||||
->method('get')
|
||||
->with('http://www.owncloud.org/', [])
|
||||
->will($this->throwException(new \Exception()));
|
||||
|
||||
$this->clientService->expects($this->once())
|
||||
->method('newClient')
|
||||
->will($this->returnValue($client));
|
||||
|
||||
$this->util->expects($this->once())
|
||||
->method('isHtaccessWorking')
|
||||
->will($this->returnValue(true));
|
||||
|
||||
$expected = new DataResponse(
|
||||
[
|
||||
'serverHasInternetConnection' => false,
|
||||
'dataDirectoryProtected' => true,
|
||||
'isMemcacheConfigured' => true,
|
||||
]
|
||||
);
|
||||
$this->assertEquals($expected, $this->checkSetupController->check());
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue