summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/ajax/update.php3
-rw-r--r--core/command/upgrade.php2
-rw-r--r--lib/private/templatelayout.php2
-rw-r--r--lib/private/updater.php26
-rw-r--r--tests/lib/updater.php47
5 files changed, 46 insertions, 34 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 85d5dc83ccf..5a9288a6381 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -10,7 +10,8 @@ if (OC::checkUpgrade(false)) {
$l = new \OC_L10N('core');
$eventSource = \OC::$server->createEventSource();
$updater = new \OC\Updater(
- \OC::$server->getHTTPHelper(),
+ \OC::$server->getHTTPHelper(),
+ \OC::$server->getAppConfig(),
\OC_Log::$object
);
$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) {
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 1d74ad0a90e..6e5ac1c5c9a 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -84,7 +84,7 @@ class Upgrade extends Command {
if(\OC::checkUpgrade(false)) {
$self = $this;
- $updater = new Updater(\OC::$server->getHTTPHelper());
+ $updater = new Updater(\OC::$server->getHTTPHelper(), \OC::$server->getAppConfig());
$updater->setSimulateStepEnabled($simulateStepEnabled);
$updater->setUpdateStepEnabled($updateStepEnabled);
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index aefb93ec266..fa025721e53 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -44,7 +44,7 @@ class OC_TemplateLayout extends OC_Template {
// Update notification
if($this->config->getSystemValue('updatechecker', true) === true &&
OC_User::isAdminUser(OC_User::getUser())) {
- $updater = new \OC\Updater(\OC::$server->getHTTPHelper());
+ $updater = new \OC\Updater(\OC::$server->getHTTPHelper(), \OC::$server->getAppConfig());
$data = $updater->check();
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 266cf9cc89f..6272f77cfc2 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -30,6 +30,11 @@ class Updater extends BasicEmitter {
* @var \OC\HTTPHelper $helper;
*/
private $httpHelper;
+
+ /**
+ * @var \OCP\IAppConfig;
+ */
+ private $config;
private $simulateStepEnabled;
@@ -38,9 +43,10 @@ class Updater extends BasicEmitter {
/**
* @param \OC\Log $log
*/
- public function __construct($httpHelper, $log = null) {
+ public function __construct($httpHelper, $config, $log = null) {
$this->httpHelper = $httpHelper;
$this->log = $log;
+ $this->config = $config;
$this->simulateStepEnabled = true;
$this->updateStepEnabled = true;
}
@@ -75,23 +81,23 @@ class Updater extends BasicEmitter {
public function check($updaterUrl = null) {
// Look up the cache - it is invalidated all 30 minutes
- if ((\OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
- return json_decode(\OC_Appconfig::getValue('core', 'lastupdateResult'), true);
+ if (($this->config->getValue('core', 'lastupdatedat') + 1800) > time()) {
+ return json_decode($this->config->getValue('core', 'lastupdateResult'), true);
}
if (is_null($updaterUrl)) {
$updaterUrl = 'https://apps.owncloud.com/updater.php';
}
- \OC_Appconfig::setValue('core', 'lastupdatedat', time());
+ $this->config->setValue('core', 'lastupdatedat', time());
- if (\OC_Appconfig::getValue('core', 'installedat', '') == '') {
- \OC_Appconfig::setValue('core', 'installedat', microtime(true));
+ if ($this->config->getValue('core', 'installedat', '') == '') {
+ $this->config->setValue('core', 'installedat', microtime(true));
}
$version = \OC_Util::getVersion();
- $version['installed'] = \OC_Appconfig::getValue('core', 'installedat');
- $version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat');
+ $version['installed'] = $this->config->getValue('core', 'installedat');
+ $version['updated'] = $this->config->getValue('core', 'lastupdatedat');
$version['updatechannel'] = \OC_Util::getChannel();
$version['edition'] = \OC_Util::getEditionString();
$version['build'] = \OC_Util::getBuild();
@@ -119,7 +125,7 @@ class Updater extends BasicEmitter {
}
// Cache the result
- \OC_Appconfig::setValue('core', 'lastupdateResult', json_encode($data));
+ $this->config->setValue('core', 'lastupdateResult', json_encode($data));
return $tmp;
}
@@ -219,7 +225,7 @@ class Updater extends BasicEmitter {
$repair->run();
//Invalidate update feed
- \OC_Appconfig::setValue('core', 'lastupdatedat', 0);
+ $this->config->setValue('core', 'lastupdatedat', 0);
// only set the final version if everything went well
\OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
diff --git a/tests/lib/updater.php b/tests/lib/updater.php
index 832f60fac06..dc1e9e5446f 100644
--- a/tests/lib/updater.php
+++ b/tests/lib/updater.php
@@ -27,13 +27,28 @@ class UpdaterTest extends \Test\TestCase {
* @dataProvider versionCompatibilityTestData
*/
public function testIsUpgradePossible($oldVersion, $newVersion, $result) {
- $updater = new Updater(\OC::$server->getHTTPHelper());
+ $updater = new Updater(\OC::$server->getHTTPHelper(), \OC::$server->getConfig());
$this->assertSame($result, $updater->isUpgradePossible($oldVersion, $newVersion));
}
+ public function testBrokenXmlResponse(){
+ $invalidUpdater = $this->getUpdaterMock('OMG!');
+ $invalidResult = $invalidUpdater->check();
+ $this->assertEmpty($invalidResult);
+ }
+
+ public function testEmptyResponse(){
+ $emptyUpdater = $this->getUpdaterMock('');
+ $emptyResult = $emptyUpdater->check();
+ $this->assertEmpty($emptyResult);
+
+ // Error while fetching new contents e.g. too many redirects
+ $falseUpdater = $this->getUpdaterMock(false);
+ $falseResult = $falseUpdater->check();
+ $this->assertEmpty($falseResult);
+ }
- public function testCheck(){
- // Valid XML. Empty values
+ public function testValidEmptyXmlResponse(){
$updater = $this->getUpdaterMock(
'<?xml version="1.0"?><owncloud><version></version><versionstring></versionstring><url></url><web></web></owncloud>'
);
@@ -47,18 +62,9 @@ class UpdaterTest extends \Test\TestCase {
$this->assertEmpty($result['versionstring']);
$this->assertEmpty($result['url']);
$this->assertEmpty($result['web']);
-
- // Empty feed
- $emptyUpdater = $this->getUpdaterMock('');
- $emptyResult = $emptyUpdater->check();
- $this->assertEmpty($emptyResult);
-
- // Error while fetching new contents e.g. too many redirects
- $falseUpdater = $this->getUpdaterMock(false);
- $falseResult = $falseUpdater->check();
- $this->assertEmpty($falseResult);
-
- // Valid XML. New version available
+ }
+
+ public function testValidUpdateResponse(){
$newUpdater = $this->getUpdaterMock(
'<?xml version="1.0"?>
<owncloud>
@@ -78,15 +84,14 @@ class UpdaterTest extends \Test\TestCase {
$this->assertEquals('ownCloud 7.0.3', $newResult['versionstring']);
$this->assertEquals('http://download.owncloud.org/community/owncloud-7.0.3.zip', $newResult['url']);
$this->assertEquals('http://owncloud.org/', $newResult['web']);
-
- // Invalid XML
- $invalidUpdater = $this->getUpdaterMock('OMG!');
- $invalidResult = $invalidUpdater->check();
- $this->assertEmpty($invalidResult);
}
protected function getUpdaterMock($content){
// Invalidate cache
+ $mockedAppConfig = $this->getMockBuilder('\OC\AppConfig')
+ ->disableOriginalConstructor()
+ ->getMock()
+ ;
\OC_Appconfig::setValue('core', 'lastupdatedat', 0);
$mockedHTTPHelper = $this->getMockBuilder('\OC\HTTPHelper')
@@ -97,7 +102,7 @@ class UpdaterTest extends \Test\TestCase {
$mockedHTTPHelper->method('getUrlContent')
->willReturn($content)
;
- return new Updater($mockedHTTPHelper);
+ return new Updater($mockedHTTPHelper, $mockedAppConfig);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 20:37:35 +0000