Thomas Müller
10 years ago
No known key found for this signature in database
GPG Key ID: A943788A3BBEC44C
10 changed files with 422 additions and 317 deletions
-
5apps/updatenotification/appinfo/app.php
-
5apps/updatenotification/appinfo/application.php
-
8apps/updatenotification/lib/updatechecker.php
-
2apps/updatenotification/tests/UpdateCheckerTest.php
-
1core/Command/Upgrade.php
-
1core/ajax/update.php
-
66lib/private/updater.php
-
119lib/private/updater/versioncheck.php
-
239tests/lib/updater.php
-
293tests/lib/updater/versioncheck.php
@ -0,0 +1,119 @@ |
|||
<?php |
|||
/** |
|||
* @author Arthur Schiwon <blizzz@owncloud.com> |
|||
* @author Bart Visscher <bartv@thisnet.nl> |
|||
* @author Björn Schießle <schiessle@owncloud.com> |
|||
* @author Frank Karlitschek <frank@owncloud.org> |
|||
* @author Joas Schilling <nickvergessen@owncloud.com> |
|||
* @author Lukas Reschke <lukas@owncloud.com> |
|||
* @author Morris Jobke <hey@morrisjobke.de> |
|||
* @author Robin Appelman <icewind@owncloud.com> |
|||
* @author Robin McCorkell <robin@mccorkell.me.uk> |
|||
* @author Steffen Lindner <mail@steffen-lindner.de> |
|||
* @author Thomas Müller <thomas.mueller@tmit.eu> |
|||
* @author Victor Dubiniuk <dubiniuk@owncloud.com> |
|||
* @author Vincent Petry <pvince81@owncloud.com> |
|||
* |
|||
* @copyright Copyright (c) 2016, 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\Updater; |
|||
|
|||
use OC\Hooks\BasicEmitter; |
|||
use OC\HTTPHelper; |
|||
use OC_Util; |
|||
use OCP\IConfig; |
|||
use OC\Setup; |
|||
use OCP\Util; |
|||
|
|||
class VersionCheck { |
|||
|
|||
/** @var \OC\HTTPHelper $helper */ |
|||
private $httpHelper; |
|||
|
|||
/** @var IConfig */ |
|||
private $config; |
|||
|
|||
/** |
|||
* @param HTTPHelper $httpHelper |
|||
* @param IConfig $config |
|||
*/ |
|||
public function __construct(HTTPHelper $httpHelper, |
|||
IConfig $config) { |
|||
$this->httpHelper = $httpHelper; |
|||
$this->config = $config; |
|||
} |
|||
|
|||
|
|||
/** |
|||
* Check if a new version is available |
|||
* |
|||
* @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php' |
|||
* @return array|bool |
|||
*/ |
|||
public function check($updaterUrl = null) { |
|||
|
|||
// Look up the cache - it is invalidated all 30 minutes
|
|||
if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) { |
|||
return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true); |
|||
} |
|||
|
|||
if (is_null($updaterUrl)) { |
|||
$updaterUrl = 'https://updates.owncloud.com/server/'; |
|||
} |
|||
|
|||
$this->config->setAppValue('core', 'lastupdatedat', time()); |
|||
|
|||
if ($this->config->getAppValue('core', 'installedat', '') === '') { |
|||
$this->config->setAppValue('core', 'installedat', microtime(true)); |
|||
} |
|||
|
|||
$version = Util::getVersion(); |
|||
$version['installed'] = $this->config->getAppValue('core', 'installedat'); |
|||
$version['updated'] = $this->config->getAppValue('core', 'lastupdatedat'); |
|||
$version['updatechannel'] = \OC_Util::getChannel(); |
|||
$version['edition'] = \OC_Util::getEditionString(); |
|||
$version['build'] = \OC_Util::getBuild(); |
|||
$versionString = implode('x', $version); |
|||
|
|||
//fetch xml data from updater
|
|||
$url = $updaterUrl . '?version=' . $versionString; |
|||
|
|||
$tmp = []; |
|||
$xml = $this->httpHelper->getUrlContent($url); |
|||
if ($xml) { |
|||
$loadEntities = libxml_disable_entity_loader(true); |
|||
$data = @simplexml_load_string($xml); |
|||
libxml_disable_entity_loader($loadEntities); |
|||
if ($data !== false) { |
|||
$tmp['version'] = (string)$data->version; |
|||
$tmp['versionstring'] = (string)$data->versionstring; |
|||
$tmp['url'] = (string)$data->url; |
|||
$tmp['web'] = (string)$data->web; |
|||
} else { |
|||
libxml_clear_errors(); |
|||
} |
|||
} else { |
|||
$data = []; |
|||
} |
|||
|
|||
// Cache the result
|
|||
$this->config->setAppValue('core', 'lastupdateResult', json_encode($data)); |
|||
return $tmp; |
|||
} |
|||
} |
|||
|
|||
@ -0,0 +1,293 @@ |
|||
<?php |
|||
/** |
|||
* @author Lukas Reschke <lukas@owncloud.com> |
|||
* @author Victor Dubiniuk <dubiniuk@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; |
|||
|
|||
use OC\Updater\VersionCheck; |
|||
use OCP\IConfig; |
|||
use OCP\Util; |
|||
|
|||
class VersionCheckTest extends \Test\TestCase { |
|||
/** @var IConfig| \PHPUnit_Framework_MockObject_MockObject */ |
|||
private $config; |
|||
/** @var HTTPHelper | \PHPUnit_Framework_MockObject_MockObject*/ |
|||
private $httpHelper; |
|||
/** @var VersionCheck */ |
|||
private $updater; |
|||
|
|||
public function setUp() { |
|||
parent::setUp(); |
|||
$this->config = $this->getMockBuilder('\\OCP\\IConfig') |
|||
->disableOriginalConstructor() |
|||
->getMock(); |
|||
$this->httpHelper = $this->getMockBuilder('\\OC\\HTTPHelper') |
|||
->disableOriginalConstructor() |
|||
->getMock(); |
|||
|
|||
$this->updater = new VersionCheck( |
|||
$this->httpHelper, |
|||
$this->config |
|||
); |
|||
} |
|||
|
|||
/** |
|||
* @param string $baseUrl |
|||
* @return string |
|||
*/ |
|||
private function buildUpdateUrl($baseUrl) { |
|||
return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'x'; |
|||
} |
|||
|
|||
public function testCheckInCache() { |
|||
$expectedResult = [ |
|||
'version' => '8.0.4.2', |
|||
'versionstring' => 'ownCloud 8.0.4', |
|||
'url' => 'https://download.owncloud.org/community/owncloud-8.0.4.zip', |
|||
'web' => 'http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html', |
|||
]; |
|||
|
|||
$this->config |
|||
->expects($this->at(0)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue(time())); |
|||
$this->config |
|||
->expects($this->at(1)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdateResult') |
|||
->will($this->returnValue(json_encode($expectedResult))); |
|||
|
|||
$this->assertSame($expectedResult, $this->updater->check()); |
|||
} |
|||
|
|||
public function testCheckWithoutUpdateUrl() { |
|||
$expectedResult = [ |
|||
'version' => '8.0.4.2', |
|||
'versionstring' => 'ownCloud 8.0.4', |
|||
'url' => 'https://download.owncloud.org/community/owncloud-8.0.4.zip', |
|||
'web' => 'http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html', |
|||
]; |
|||
|
|||
$this->config |
|||
->expects($this->at(0)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue(0)); |
|||
$this->config |
|||
->expects($this->at(1)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdatedat', $this->isType('integer')); |
|||
$this->config |
|||
->expects($this->at(3)) |
|||
->method('getAppValue') |
|||
->with('core', 'installedat') |
|||
->will($this->returnValue('installedat')); |
|||
$this->config |
|||
->expects($this->at(4)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue('lastupdatedat')); |
|||
$this->config |
|||
->expects($this->at(5)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdateResult', json_encode($expectedResult)); |
|||
|
|||
$updateXml = '<?xml version="1.0"?>
|
|||
<owncloud> |
|||
<version>8.0.4.2</version> |
|||
<versionstring>ownCloud 8.0.4</versionstring> |
|||
<url>https://download.owncloud.org/community/owncloud-8.0.4.zip</url> |
|||
<web>http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html</web> |
|||
</owncloud>'; |
|||
$this->httpHelper |
|||
->expects($this->once()) |
|||
->method('getUrlContent') |
|||
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/')) |
|||
->will($this->returnValue($updateXml)); |
|||
|
|||
$this->assertSame($expectedResult, $this->updater->check()); |
|||
} |
|||
|
|||
public function testCheckWithInvalidXml() { |
|||
$this->config |
|||
->expects($this->at(0)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue(0)); |
|||
$this->config |
|||
->expects($this->at(1)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdatedat', $this->isType('integer')); |
|||
$this->config |
|||
->expects($this->at(3)) |
|||
->method('getAppValue') |
|||
->with('core', 'installedat') |
|||
->will($this->returnValue('installedat')); |
|||
$this->config |
|||
->expects($this->at(4)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue('lastupdatedat')); |
|||
$this->config |
|||
->expects($this->at(5)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdateResult', 'false'); |
|||
|
|||
$updateXml = 'Invalid XML Response!'; |
|||
$this->httpHelper |
|||
->expects($this->once()) |
|||
->method('getUrlContent') |
|||
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/')) |
|||
->will($this->returnValue($updateXml)); |
|||
|
|||
$this->assertSame([], $this->updater->check()); |
|||
} |
|||
|
|||
public function testCheckWithUpdateUrl() { |
|||
$expectedResult = [ |
|||
'version' => '8.0.4.2', |
|||
'versionstring' => 'ownCloud 8.0.4', |
|||
'url' => 'https://download.owncloud.org/community/owncloud-8.0.4.zip', |
|||
'web' => 'http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html', |
|||
]; |
|||
|
|||
$this->config |
|||
->expects($this->at(0)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue(0)); |
|||
$this->config |
|||
->expects($this->at(1)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdatedat', $this->isType('integer')); |
|||
$this->config |
|||
->expects($this->at(3)) |
|||
->method('getAppValue') |
|||
->with('core', 'installedat') |
|||
->will($this->returnValue('installedat')); |
|||
$this->config |
|||
->expects($this->at(4)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue('lastupdatedat')); |
|||
$this->config |
|||
->expects($this->at(5)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdateResult', json_encode($expectedResult)); |
|||
|
|||
$updateXml = '<?xml version="1.0"?>
|
|||
<owncloud> |
|||
<version>8.0.4.2</version> |
|||
<versionstring>ownCloud 8.0.4</versionstring> |
|||
<url>https://download.owncloud.org/community/owncloud-8.0.4.zip</url> |
|||
<web>http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html</web> |
|||
</owncloud>'; |
|||
$this->httpHelper |
|||
->expects($this->once()) |
|||
->method('getUrlContent') |
|||
->with($this->buildUpdateUrl('https://myupdater.com/')) |
|||
->will($this->returnValue($updateXml)); |
|||
|
|||
$this->assertSame($expectedResult, $this->updater->check('https://myupdater.com/')); |
|||
} |
|||
|
|||
public function testCheckWithEmptyValidXmlResponse() { |
|||
$expectedResult = [ |
|||
'version' => '', |
|||
'versionstring' => '', |
|||
'url' => '', |
|||
'web' => '', |
|||
]; |
|||
|
|||
$this->config |
|||
->expects($this->at(0)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue(0)); |
|||
$this->config |
|||
->expects($this->at(1)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdatedat', $this->isType('integer')); |
|||
$this->config |
|||
->expects($this->at(3)) |
|||
->method('getAppValue') |
|||
->with('core', 'installedat') |
|||
->will($this->returnValue('installedat')); |
|||
$this->config |
|||
->expects($this->at(4)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue('lastupdatedat')); |
|||
|
|||
$updateXml = '<?xml version="1.0"?>
|
|||
<owncloud> |
|||
<version></version> |
|||
<versionstring></versionstring> |
|||
<url></url> |
|||
<web></web> |
|||
</owncloud>'; |
|||
$this->httpHelper |
|||
->expects($this->once()) |
|||
->method('getUrlContent') |
|||
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/')) |
|||
->will($this->returnValue($updateXml)); |
|||
|
|||
$this->assertSame($expectedResult, $this->updater->check()); |
|||
} |
|||
|
|||
public function testCheckWithEmptyInvalidXmlResponse() { |
|||
$expectedResult = []; |
|||
|
|||
$this->config |
|||
->expects($this->at(0)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue(0)); |
|||
$this->config |
|||
->expects($this->at(1)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdatedat', $this->isType('integer')); |
|||
$this->config |
|||
->expects($this->at(3)) |
|||
->method('getAppValue') |
|||
->with('core', 'installedat') |
|||
->will($this->returnValue('installedat')); |
|||
$this->config |
|||
->expects($this->at(4)) |
|||
->method('getAppValue') |
|||
->with('core', 'lastupdatedat') |
|||
->will($this->returnValue('lastupdatedat')); |
|||
$this->config |
|||
->expects($this->at(5)) |
|||
->method('setAppValue') |
|||
->with('core', 'lastupdateResult', json_encode($expectedResult)); |
|||
|
|||
$updateXml = ''; |
|||
$this->httpHelper |
|||
->expects($this->once()) |
|||
->method('getUrlContent') |
|||
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/')) |
|||
->will($this->returnValue($updateXml)); |
|||
|
|||
$this->assertSame($expectedResult, $this->updater->check()); |
|||
} |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue