diff --git a/apps/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php
index da292826f0aba5cb0209187e8d81df547db4be03..bb320336d4898df726ad55151a860c0af9abd966 100644
--- a/apps/files_sharing/tests/UpdaterTest.php
+++ b/apps/files_sharing/tests/UpdaterTest.php
@@ -71,7 +71,8 @@ class UpdaterTest extends TestCase {
*/
function testDeleteParentFolder() {
$status = \OC_App::isEnabled('files_trashbin');
- \OC_App::enable('files_trashbin');
+ (new \OC_App())->enable('files_trashbin');
+
\OCA\Files_Trashbin\Trashbin::registerHooks();
diff --git a/apps/provisioning_api/lib/Controller/AppsController.php b/apps/provisioning_api/lib/Controller/AppsController.php
index 3821fc343ad86d2c3c0e1b9dfd3626890233a0f8..7d11d92b55acc2524a10cb9c4e7da3080f0d4cc5 100644
--- a/apps/provisioning_api/lib/Controller/AppsController.php
+++ b/apps/provisioning_api/lib/Controller/AppsController.php
@@ -37,25 +37,20 @@ use OCP\IRequest;
class AppsController extends OCSController {
/** @var \OCP\App\IAppManager */
private $appManager;
- /** @var OCSClient */
- private $ocsClient;
/**
* @param string $appName
* @param IRequest $request
* @param IAppManager $appManager
- * @param OCSClient $ocsClient
*/
public function __construct(
$appName,
IRequest $request,
- IAppManager $appManager,
- OCSClient $ocsClient
+ IAppManager $appManager
) {
parent::__construct($appName, $request);
$this->appManager = $appManager;
- $this->ocsClient = $ocsClient;
}
/**
@@ -64,7 +59,7 @@ class AppsController extends OCSController {
* @throws OCSException
*/
public function getApps($filter = null) {
- $apps = OC_App::listAllApps(false, true, $this->ocsClient);
+ $apps = (new OC_App())->listAllApps();
$list = [];
foreach($apps as $app) {
$list[] = $app['id'];
diff --git a/apps/provisioning_api/tests/Controller/AppsControllerTest.php b/apps/provisioning_api/tests/Controller/AppsControllerTest.php
index 9ac4a8290e424cd3081560a39cbb2729e53bbf8f..c891433258f6df5847eec1ef2de73adc421e73f5 100644
--- a/apps/provisioning_api/tests/Controller/AppsControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/AppsControllerTest.php
@@ -48,8 +48,6 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
private $api;
/** @var IUserSession */
private $userSession;
- /** @var OCSClient|\PHPUnit_Framework_MockObject_MockObject */
- private $ocsClient;
protected function setUp() {
parent::setUp();
@@ -57,9 +55,6 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
$this->appManager = \OC::$server->getAppManager();
$this->groupManager = \OC::$server->getGroupManager();
$this->userSession = \OC::$server->getUserSession();
- $this->ocsClient = $this->getMockBuilder('OC\OCSClient')
- ->disableOriginalConstructor()
- ->getMock();
$request = $this->getMockBuilder('OCP\IRequest')
->disableOriginalConstructor()
@@ -68,8 +63,7 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
$this->api = new AppsController(
'provisioning_api',
$request,
- $this->appManager,
- $this->ocsClient
+ $this->appManager
);
}
@@ -88,10 +82,6 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
}
public function testGetApps() {
- $this->ocsClient
- ->expects($this->any())
- ->method($this->anything())
- ->will($this->returnValue(null));
$user = $this->generateUsers();
$this->groupManager->get('admin')->addUser($user);
$this->userSession->setUser($user);
@@ -99,7 +89,7 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
$result = $this->api->getApps();
$data = $result->getData();
- $this->assertEquals(count(\OC_App::listAllApps(false, true, $this->ocsClient)), count($data['apps']));
+ $this->assertEquals(count((new \OC_App())->listAllApps()), count($data['apps']));
}
public function testGetAppsEnabled() {
@@ -109,13 +99,9 @@ class AppsControllerTest extends \OCA\Provisioning_API\Tests\TestCase {
}
public function testGetAppsDisabled() {
- $this->ocsClient
- ->expects($this->any())
- ->method($this->anything())
- ->will($this->returnValue(null));
$result = $this->api->getApps('disabled');
$data = $result->getData();
- $apps = \OC_App::listAllApps(false, true, $this->ocsClient);
+ $apps = (new \OC_App)->listAllApps();
$list = array();
foreach($apps as $app) {
$list[] = $app['id'];
diff --git a/apps/updatenotification/lib/Notification/BackgroundJob.php b/apps/updatenotification/lib/Notification/BackgroundJob.php
index 3a1aa5e0f16358f12a5900827b0721ea0bd99c40..7bcc0e869050a39b3af0b896c5f3d2b936aa581c 100644
--- a/apps/updatenotification/lib/Notification/BackgroundJob.php
+++ b/apps/updatenotification/lib/Notification/BackgroundJob.php
@@ -22,7 +22,6 @@
namespace OCA\UpdateNotification\Notification;
-
use OC\BackgroundJob\TimedJob;
use OC\Installer;
use OC\Updater\VersionCheck;
@@ -215,6 +214,6 @@ class BackgroundJob extends TimedJob {
* @return string|false
*/
protected function isUpdateAvailable($app) {
- return Installer::isUpdateAvailable($app);
+ return Installer::isUpdateAvailable($app, \OC::$server->getAppFetcher());
}
}
diff --git a/config/config.sample.php b/config/config.sample.php
index 7f4b3345642ab1a9f01169a6e577aeb183d34c69..fc52edbc7785d17c7037b32ef71e374f92a5d81e 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -673,20 +673,6 @@ $CONFIG = array(
*/
'appstoreenabled' => true,
-/**
- * The URL of the appstore to use.
- */
-'appstoreurl' => 'https://api.owncloud.com/v1',
-
-/**
- * Whether to show experimental apps in the appstore interface
- *
- * Experimental apps are not checked for security issues and are new or known
- * to be unstable and under heavy development. Installing these can cause data
- * loss or security breaches.
- */
-'appstore.experimental.enabled' => false,
-
/**
* Use the ``apps_paths`` parameter to set the location of the Apps directory,
* which should be scanned for available apps, and where user-specific apps
diff --git a/core/Command/App/Enable.php b/core/Command/App/Enable.php
index 19f24d82e43b5b96137c9eef4d1d3db4fd40cf06..4aa38cd6f8feab5d5dc45de3c00d5e220faffde6 100644
--- a/core/Command/App/Enable.php
+++ b/core/Command/App/Enable.php
@@ -75,11 +75,12 @@ class Enable extends Command implements CompletionAwareInterface {
}
$groups = $input->getOption('groups');
+ $appClass = new \OC_App();
if (empty($groups)) {
- \OC_App::enable($appId);
+ $appClass->enable($appId);
$output->writeln($appId . ' enabled');
} else {
- \OC_App::enable($appId, $groups);
+ $appClass->enable($appId, $groups);
$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
}
return 0;
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 532a6f39848ef3e080cdd177a1687bb6710e8e8a..ddd531868d4f20dc02b41ec210320e1eb8f4708f 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -279,6 +279,11 @@ return array(
'OC\\AppFramework\\Utility\\TimeFactory' => $baseDir . '/lib/private/AppFramework/Utility/TimeFactory.php',
'OC\\AppHelper' => $baseDir . '/lib/private/AppHelper.php',
'OC\\App\\AppManager' => $baseDir . '/lib/private/App/AppManager.php',
+ 'OC\\App\\AppStore\\Fetcher\\AppFetcher' => $baseDir . '/lib/private/App/AppStore/Fetcher/AppFetcher.php',
+ 'OC\\App\\AppStore\\Fetcher\\CategoryFetcher' => $baseDir . '/lib/private/App/AppStore/Fetcher/CategoryFetcher.php',
+ 'OC\\App\\AppStore\\Fetcher\\Fetcher' => $baseDir . '/lib/private/App/AppStore/Fetcher/Fetcher.php',
+ 'OC\\App\\AppStore\\Version\\Version' => $baseDir . '/lib/private/App/AppStore/Version/Version.php',
+ 'OC\\App\\AppStore\\Version\\VersionParser' => $baseDir . '/lib/private/App/AppStore/Version/VersionParser.php',
'OC\\App\\CodeChecker\\AbstractCheck' => $baseDir . '/lib/private/App/CodeChecker/AbstractCheck.php',
'OC\\App\\CodeChecker\\CodeChecker' => $baseDir . '/lib/private/App/CodeChecker/CodeChecker.php',
'OC\\App\\CodeChecker\\DeprecationCheck' => $baseDir . '/lib/private/App/CodeChecker/DeprecationCheck.php',
@@ -602,7 +607,6 @@ return array(
'OC\\Notification\\Action' => $baseDir . '/lib/private/Notification/Action.php',
'OC\\Notification\\Manager' => $baseDir . '/lib/private/Notification/Manager.php',
'OC\\Notification\\Notification' => $baseDir . '/lib/private/Notification/Notification.php',
- 'OC\\OCSClient' => $baseDir . '/lib/private/OCSClient.php',
'OC\\OCS\\CoreCapabilities' => $baseDir . '/lib/private/OCS/CoreCapabilities.php',
'OC\\OCS\\Exception' => $baseDir . '/lib/private/OCS/Exception.php',
'OC\\OCS\\Person' => $baseDir . '/lib/private/OCS/Person.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index c0a3e9b50c662b58a5f0b4383081a40b5f13fdb5..99a3c3d540ef677af8828061d542872496eb33bb 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -309,6 +309,11 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\AppFramework\\Utility\\TimeFactory' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Utility/TimeFactory.php',
'OC\\AppHelper' => __DIR__ . '/../../..' . '/lib/private/AppHelper.php',
'OC\\App\\AppManager' => __DIR__ . '/../../..' . '/lib/private/App/AppManager.php',
+ 'OC\\App\\AppStore\\Fetcher\\AppFetcher' => __DIR__ . '/../../..' . '/lib/private/App/AppStore/Fetcher/AppFetcher.php',
+ 'OC\\App\\AppStore\\Fetcher\\CategoryFetcher' => __DIR__ . '/../../..' . '/lib/private/App/AppStore/Fetcher/CategoryFetcher.php',
+ 'OC\\App\\AppStore\\Fetcher\\Fetcher' => __DIR__ . '/../../..' . '/lib/private/App/AppStore/Fetcher/Fetcher.php',
+ 'OC\\App\\AppStore\\Version\\Version' => __DIR__ . '/../../..' . '/lib/private/App/AppStore/Version/Version.php',
+ 'OC\\App\\AppStore\\Version\\VersionParser' => __DIR__ . '/../../..' . '/lib/private/App/AppStore/Version/VersionParser.php',
'OC\\App\\CodeChecker\\AbstractCheck' => __DIR__ . '/../../..' . '/lib/private/App/CodeChecker/AbstractCheck.php',
'OC\\App\\CodeChecker\\CodeChecker' => __DIR__ . '/../../..' . '/lib/private/App/CodeChecker/CodeChecker.php',
'OC\\App\\CodeChecker\\DeprecationCheck' => __DIR__ . '/../../..' . '/lib/private/App/CodeChecker/DeprecationCheck.php',
@@ -632,7 +637,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Notification\\Action' => __DIR__ . '/../../..' . '/lib/private/Notification/Action.php',
'OC\\Notification\\Manager' => __DIR__ . '/../../..' . '/lib/private/Notification/Manager.php',
'OC\\Notification\\Notification' => __DIR__ . '/../../..' . '/lib/private/Notification/Notification.php',
- 'OC\\OCSClient' => __DIR__ . '/../../..' . '/lib/private/OCSClient.php',
'OC\\OCS\\CoreCapabilities' => __DIR__ . '/../../..' . '/lib/private/OCS/CoreCapabilities.php',
'OC\\OCS\\Exception' => __DIR__ . '/../../..' . '/lib/private/OCS/Exception.php',
'OC\\OCS\\Person' => __DIR__ . '/../../..' . '/lib/private/OCS/Person.php',
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..19e61d416a0bf8b657d9cb30f295c4724ffa7ac2
--- /dev/null
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\App\AppStore\Fetcher;
+
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\IAppData;
+use OCP\Http\Client\IClientService;
+use OCP\IConfig;
+
+class AppFetcher extends Fetcher {
+ /**
+ * @param IAppData $appData
+ * @param IClientService $clientService
+ * @param ITimeFactory $timeFactory
+ * @param IConfig $config;
+ */
+ public function __construct(IAppData $appData,
+ IClientService $clientService,
+ ITimeFactory $timeFactory,
+ IConfig $config) {
+ parent::__construct(
+ $appData,
+ $clientService,
+ $timeFactory
+ );
+
+ $this->fileName = 'apps.json';
+
+ $versionArray = \OC_Util::getVersion();
+ $this->endpointUrl = sprintf(
+ 'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json',
+ $versionArray[0],
+ $versionArray[1],
+ $versionArray[2]
+ );
+ }
+}
diff --git a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..74201ec37379145efe9119a822b5368b438a15a5
--- /dev/null
+++ b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\App\AppStore\Fetcher;
+
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\IAppData;
+use OCP\Http\Client\IClientService;
+
+class CategoryFetcher extends Fetcher {
+ /**
+ * @param IAppData $appData
+ * @param IClientService $clientService
+ * @param ITimeFactory $timeFactory
+ */
+ public function __construct(IAppData $appData,
+ IClientService $clientService,
+ ITimeFactory $timeFactory) {
+ parent::__construct(
+ $appData,
+ $clientService,
+ $timeFactory
+ );
+ $this->fileName = 'categories.json';
+ $this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
+ }
+}
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..cffff9176e2eb0aba737a38238e9e66bad964b76
--- /dev/null
+++ b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\App\AppStore\Fetcher;
+
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\IAppData;
+use OCP\Files\NotFoundException;
+use OCP\Http\Client\IClientService;
+
+abstract class Fetcher {
+ const INVALIDATE_AFTER_SECONDS = 300;
+
+ /** @var IAppData */
+ private $appData;
+ /** @var IClientService */
+ private $clientService;
+ /** @var ITimeFactory */
+ private $timeFactory;
+ /** @var string */
+ protected $fileName;
+ /** @var string */
+ protected $endpointUrl;
+
+ /**
+ * @param IAppData $appData
+ * @param IClientService $clientService
+ * @param ITimeFactory $timeFactory
+ */
+ public function __construct(IAppData $appData,
+ IClientService $clientService,
+ ITimeFactory $timeFactory) {
+ $this->appData = $appData;
+ $this->clientService = $clientService;
+ $this->timeFactory = $timeFactory;
+ }
+
+ /**
+ * Returns the array with the categories on the appstore server
+ *
+ * @return array
+ */
+ public function get() {
+ $rootFolder = $this->appData->getFolder('/');
+
+ try {
+ // File does already exists
+ $file = $rootFolder->getFile($this->fileName);
+ $jsonBlob = json_decode($file->getContent(), true);
+ if(is_array($jsonBlob)) {
+ // If the timestamp is older than 300 seconds request the files new
+ if((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+ return $jsonBlob['data'];
+ }
+ }
+ } catch (NotFoundException $e) {
+ // File does not already exists
+ $file = $rootFolder->newFile($this->fileName);
+ }
+
+ // Refresh the file content
+ $client = $this->clientService->newClient();
+ try {
+ $response = $client->get($this->endpointUrl);
+ $responseJson = [];
+ $responseJson['data'] = json_decode($response->getBody(), true);
+ $responseJson['timestamp'] = $this->timeFactory->getTime();
+ $file->putContent(json_encode($responseJson));
+ return json_decode($file->getContent(), true)['data'];
+ } catch (\Exception $e) {
+ return [];
+ }
+ }
+}
diff --git a/lib/private/App/AppStore/Version/Version.php b/lib/private/App/AppStore/Version/Version.php
new file mode 100644
index 0000000000000000000000000000000000000000..ca182ae078b74f11e7bda2f0d0aaab52075d27a4
--- /dev/null
+++ b/lib/private/App/AppStore/Version/Version.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\App\AppStore\Version;
+
+class Version {
+ /** @var string */
+ private $minVersion;
+ /** @var string */
+ private $maxVersion;
+
+ /**
+ * @param string $minVersion
+ * @param string $maxVersion
+ */
+ public function __construct($minVersion, $maxVersion) {
+ $this->minVersion = $minVersion;
+ $this->maxVersion = $maxVersion;
+ }
+
+ /**
+ * @return string
+ */
+ public function getMinimumVersion() {
+ return $this->minVersion;
+ }
+
+ /**
+ * @return string
+ */
+ public function getMaximumVersion() {
+ return $this->maxVersion;
+ }
+}
diff --git a/lib/private/App/AppStore/Version/VersionParser.php b/lib/private/App/AppStore/Version/VersionParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..b548ef386d9ae0ce30a553080c22a6936807a45a
--- /dev/null
+++ b/lib/private/App/AppStore/Version/VersionParser.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\App\AppStore\Version;
+
+/**
+ * Class VersionParser parses the versions as sent by the Nextcloud app store
+ *
+ * @package OC\App\AppStore
+ */
+class VersionParser {
+ /**
+ * @param string $versionString
+ * @return bool
+ */
+ private function isValidVersionString($versionString) {
+ return (bool)preg_match('/^[0-9.]+$/', $versionString);
+ }
+
+ /**
+ * Returns the version for a version string
+ *
+ * @param string $versionSpec
+ * @return Version
+ * @throws \Exception If the version cannot be parsed
+ */
+ public function getVersion($versionSpec) {
+ // * indicates that the version is compatible with all versions
+ if($versionSpec === '*') {
+ return new Version('', '');
+ }
+
+ // Count the amount of =, if it is one then it's either maximum or minimum
+ // version. If it is two then it is maximum and minimum.
+ $versionElements = explode(' ', $versionSpec);
+ $firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
+ $firstVersionNumber = substr($firstVersion, 2);
+ $secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
+ $secondVersionNumber = substr($secondVersion, 2);
+
+ switch(count($versionElements)) {
+ case 1:
+ if(!$this->isValidVersionString($firstVersionNumber)) {
+ break;
+ }
+ if(substr($firstVersion, 0, 1) === '>') {
+ return new Version($firstVersionNumber, '');
+ } else {
+ return new Version('', $firstVersionNumber);
+ }
+ case 2:
+ if(!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
+ break;
+ }
+ return new Version($firstVersionNumber, $secondVersionNumber);
+ }
+
+ throw new \Exception(
+ sprintf(
+ 'Version cannot be parsed: %s',
+ $versionSpec
+ )
+ );
+ }
+}
diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php
index 67268981e997dac4193e080dd6ca645c71e5ef51..c24b25ff14da8e2a1b2f1796c1533e7563d71503 100644
--- a/lib/private/App/DependencyAnalyzer.php
+++ b/lib/private/App/DependencyAnalyzer.php
@@ -1,6 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
*
* @author Bernhard Posselt <dev@bernhard-posselt.com>
* @author Joas Schilling <coding@schilljs.com>
@@ -294,7 +295,9 @@ class DependencyAnalyzer {
private function analyzeOC(array $dependencies, array $appInfo) {
$missing = [];
$minVersion = null;
- if (isset($dependencies['owncloud']['@attributes']['min-version'])) {
+ if (isset($dependencies['nextcloud']['@attributes']['min-version'])) {
+ $minVersion = $dependencies['nextcloud']['@attributes']['min-version'];
+ } elseif (isset($dependencies['owncloud']['@attributes']['min-version'])) {
$minVersion = $dependencies['owncloud']['@attributes']['min-version'];
} elseif (isset($appInfo['requiremin'])) {
$minVersion = $appInfo['requiremin'];
@@ -302,7 +305,9 @@ class DependencyAnalyzer {
$minVersion = $appInfo['require'];
}
$maxVersion = null;
- if (isset($dependencies['owncloud']['@attributes']['max-version'])) {
+ if (isset($dependencies['nextcloud']['@attributes']['max-version'])) {
+ $maxVersion = $dependencies['nextcloud']['@attributes']['max-version'];
+ } elseif (isset($dependencies['owncloud']['@attributes']['max-version'])) {
$maxVersion = $dependencies['owncloud']['@attributes']['max-version'];
} elseif (isset($appInfo['requiremax'])) {
$maxVersion = $appInfo['requiremax'];
diff --git a/lib/private/Archive/Archive.php b/lib/private/Archive/Archive.php
index da2c53f2aa14c44939efdd86dfe3addfa080ae7a..fadc12d2a24bcab1022a99dddc907f76a4795943 100644
--- a/lib/private/Archive/Archive.php
+++ b/lib/private/Archive/Archive.php
@@ -32,26 +32,7 @@
namespace OC\Archive;
-abstract class Archive{
- /**
- * Open any of the supported archive types
- *
- * @param string $path
- * @return Archive|void
- */
- public static function open($path) {
- $mime = \OC::$server->getMimeTypeDetector()->detect($path);
-
- switch($mime) {
- case 'application/zip':
- return new ZIP($path);
- case 'application/x-gzip':
- return new TAR($path);
- case 'application/x-bzip2':
- return new TAR($path);
- }
- }
-
+abstract class Archive {
/**
* @param $source
*/
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 009df7905854d1be436055306904d2aa3bcb299f..2366b762654edac4a41919d6cf2046b0ce5e81d1 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -1,6 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bart Visscher <bartv@thisnet.nl>
@@ -40,90 +41,64 @@
namespace OC;
+use OC\App\AppStore\Fetcher\AppFetcher;
use OC\App\CodeChecker\CodeChecker;
use OC\App\CodeChecker\EmptyCheck;
use OC\App\CodeChecker\PrivateCheck;
+use OC\Archive\Archive;
+use OC\Archive\TAR;
use OC_App;
use OC_DB;
use OC_Helper;
+use OCP\Http\Client\IClientService;
+use OCP\ILogger;
+use OCP\ITempManager;
+use phpseclib\File\X509;
/**
- * This class provides the functionality needed to install, update and remove plugins/apps
+ * This class provides the functionality needed to install, update and remove apps
*/
class Installer {
+ /** @var AppFetcher */
+ private $appFetcher;
+ /** @var IClientService */
+ private $clientService;
+ /** @var ITempManager */
+ private $tempManager;
+ /** @var ILogger */
+ private $logger;
/**
+ * @param AppFetcher $appFetcher
+ * @param IClientService $clientService
+ * @param ITempManager $tempManager
+ * @param ILogger $logger
+ */
+ public function __construct(AppFetcher $appFetcher,
+ IClientService $clientService,
+ ITempManager $tempManager,
+ ILogger $logger) {
+ $this->appFetcher = $appFetcher;
+ $this->clientService = $clientService;
+ $this->tempManager = $tempManager;
+ $this->logger = $logger;
+ }
+
+ /**
+ * Installs an app that is located in one of the app folders already
*
- * This function installs an app. All information needed are passed in the
- * associative array $data.
- * The following keys are required:
- * - source: string, can be "path" or "http"
- *
- * One of the following keys is required:
- * - path: path to the file containing the app
- * - href: link to the downloadable file containing the app
- *
- * The following keys are optional:
- * - pretend: boolean, if set true the system won't do anything
- * - noinstall: boolean, if true appinfo/install.php won't be loaded
- * - inactive: boolean, if set true the appconfig/app.sample.php won't be
- * renamed
- *
- * This function works as follows
- * -# fetching the file
- * -# unzipping it
- * -# check the code
- * -# installing the database at appinfo/database.xml
- * -# including appinfo/install.php
- * -# setting the installed version
- *
- * It is the task of oc_app_install to create the tables and do whatever is
- * needed to get the app working.
- *
- * Installs an app
- * @param array $data with all information
+ * @param string $appId App to install
* @throws \Exception
* @return integer
*/
- public static function installApp( $data = array()) {
- $l = \OC::$server->getL10N('lib');
-
- list($extractDir, $path) = self::downloadApp($data);
-
- $info = self::checkAppsIntegrity($data, $extractDir, $path);
- $appId = OC_App::cleanAppId($info['id']);
- $basedir = OC_App::getInstallPath().'/'.$appId;
- //check if the destination directory already exists
- if(is_dir($basedir)) {
- OC_Helper::rmdirr($extractDir);
- if($data['source']=='http') {
- unlink($path);
- }
- throw new \Exception($l->t("App directory already exists"));
- }
-
- if(!empty($data['pretent'])) {
- return false;
+ public function installApp($appId) {
+ $app = \OC_App::findAppInDirectories($appId);
+ if($app === false) {
+ throw new \Exception('App not found in any app directory');
}
- //copy the app to the correct place
- if(@!mkdir($basedir)) {
- OC_Helper::rmdirr($extractDir);
- if($data['source']=='http') {
- unlink($path);
- }
- throw new \Exception($l->t("Can't create app folder. Please fix permissions. %s", array($basedir)));
- }
-
- $extractDir .= '/' . $info['id'];
- if(!file_exists($extractDir)) {
- OC_Helper::rmdirr($basedir);
- throw new \Exception($l->t("Archive does not contain a directory named %s", $info['id']));
- }
- OC_Helper::copyr($extractDir, $basedir);
-
- //remove temporary files
- OC_Helper::rmdirr($extractDir);
+ $basedir = $app['path'].'/'.$appId;
+ $info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
//install the database
if(is_file($basedir.'/appinfo/database.xml')) {
@@ -168,259 +143,189 @@ class Installer {
*
* Checks whether or not an app is installed, i.e. registered in apps table.
*/
- public static function isInstalled( $app ) {
+ public static function isInstalled( $app ) {
return (\OC::$server->getConfig()->getAppValue($app, "installed_version", null) !== null);
}
/**
- * @brief Update an application
- * @param array $info
- * @param bool $isShipped
- * @throws \Exception
- * @return bool
- *
- * This function could work like described below, but currently it disables and then
- * enables the app again. This does result in an updated app.
- *
- *
- * This function installs an app. All information needed are passed in the
- * associative array $info.
- * The following keys are required:
- * - source: string, can be "path" or "http"
- *
- * One of the following keys is required:
- * - path: path to the file containing the app
- * - href: link to the downloadable file containing the app
- *
- * The following keys are optional:
- * - pretend: boolean, if set true the system won't do anything
- * - noupgrade: boolean, if true appinfo/upgrade.php won't be loaded
- *
- * This function works as follows
- * -# fetching the file
- * -# removing the old files
- * -# unzipping new file
- * -# including appinfo/upgrade.php
- * -# setting the installed version
- *
- * upgrade.php can determine the current installed version of the app using
- * "\OC::$server->getAppConfig()->getValue($appid, 'installed_version')"
- */
- public static function updateApp($info=array(), $isShipped=false) {
- list($extractDir, $path) = self::downloadApp($info);
- $info = self::checkAppsIntegrity($info, $extractDir, $path, $isShipped);
-
- $currentDir = OC_App::getAppPath($info['id']);
- $basedir = OC_App::getInstallPath();
- $basedir .= '/';
- $basedir .= $info['id'];
-
- if($currentDir !== false && is_writable($currentDir)) {
- $basedir = $currentDir;
- }
- if(is_dir($basedir)) {
- OC_Helper::rmdirr($basedir);
- }
-
- $appInExtractDir = $extractDir;
- if (substr($extractDir, -1) !== '/') {
- $appInExtractDir .= '/';
- }
-
- $appInExtractDir .= $info['id'];
- OC_Helper::copyr($appInExtractDir, $basedir);
- OC_Helper::rmdirr($extractDir);
-
- return OC_App::updateApp($info['id']);
- }
-
- /**
- * update an app by it's id
+ * Updates the specified app from the appstore
*
- * @param integer $ocsId
+ * @param string $appId
* @return bool
- * @throws \Exception
*/
- public static function updateAppByOCSId($ocsId) {
- $ocsClient = new OCSClient(
- \OC::$server->getHTTPClientService(),
- \OC::$server->getConfig(),
- \OC::$server->getLogger()
- );
- $appData = $ocsClient->getApplication($ocsId, \OCP\Util::getVersion());
- $download = $ocsClient->getApplicationDownload($ocsId, \OCP\Util::getVersion());
-
- if (isset($download['downloadlink']) && trim($download['downloadlink']) !== '') {
- $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
- $info = array(
- 'source' => 'http',
- 'href' => $download['downloadlink'],
- 'appdata' => $appData
- );
- } else {
- throw new \Exception('Could not fetch app info!');
+ public function updateAppstoreApp($appId) {
+ if(self::isUpdateAvailable($appId, $this->appFetcher)) {
+ try {
+ $this->downloadApp($appId);
+ } catch (\Exception $e) {
+ $this->logger->error($e->getMessage(), ['app' => 'core']);
+ return false;
+ }
+ return OC_App::updateApp($appId);
}
- return self::updateApp($info);
+ return false;
}
/**
- * @param array $data
- * @return array
- * @throws \Exception
+ * Downloads an app and puts it into the app directory
+ *
+ * @param string $appId
+ *
+ * @throws \Exception If the installation was not successful
*/
- public static function downloadApp($data = array()) {
- $l = \OC::$server->getL10N('lib');
-
- if(!isset($data['source'])) {
- throw new \Exception($l->t("No source specified when installing app"));
- }
+ public function downloadApp($appId) {
+ $appId = strtolower($appId);
+
+ $apps = $this->appFetcher->get();
+ foreach($apps as $app) {
+ if($app['id'] === $appId) {
+ // Load the certificate
+ $certificate = new X509();
+ $certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+ $loadedCertificate = $certificate->loadX509($app['certificate']);
+
+ // Verify if the certificate has been revoked
+ $crl = new X509();
+ $crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+ $crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+ if($crl->validateSignature() !== true) {
+ throw new \Exception('Could not validate CRL signature');
+ }
+ $csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
+ $revoked = $crl->getRevoked($csn);
+ if ($revoked !== false) {
+ throw new \Exception(
+ sprintf(
+ 'Certificate "%s" has been revoked',
+ $csn
+ )
+ );
+ }
- //download the file if necessary
- if($data['source']=='http') {
- $pathInfo = pathinfo($data['href']);
- $extension = isset($pathInfo['extension']) ? '.' . $pathInfo['extension'] : '';
- $path = \OC::$server->getTempManager()->getTemporaryFile($extension);
- if(!isset($data['href'])) {
- throw new \Exception($l->t("No href specified when installing app from http"));
- }
- $client = \OC::$server->getHTTPClientService()->newClient();
- $client->get($data['href'], ['save_to' => $path]);
- } else {
- if(!isset($data['path'])) {
- throw new \Exception($l->t("No path specified when installing app from local file"));
- }
- $path=$data['path'];
- }
+ // Verify if the certificate has been issued by the Nextcloud Code Authority CA
+ if($certificate->validateSignature() !== true) {
+ throw new \Exception(
+ sprintf(
+ 'App with id %s has a certificate not issued by a trusted Code Signing Authority',
+ $appId
+ )
+ );
+ }
- //detect the archive type
- $mime = \OC::$server->getMimeTypeDetector()->detect($path);
- if ($mime !=='application/zip' && $mime !== 'application/x-gzip' && $mime !== 'application/x-bzip2') {
- throw new \Exception($l->t("Archives of type %s are not supported", array($mime)));
- }
+ // Verify if the certificate is issued for the requested app id
+ $certInfo = openssl_x509_parse($app['certificate']);
+ if(!isset($certInfo['subject']['CN'])) {
+ throw new \Exception(
+ sprintf(
+ 'App with id %s has a cert with no CN',
+ $appId
+ )
+ );
+ }
+ if($certInfo['subject']['CN'] !== $appId) {
+ throw new \Exception(
+ sprintf(
+ 'App with id %s has a cert issued to %s',
+ $appId,
+ $certInfo['subject']['CN']
+ )
+ );
+ }
- //extract the archive in a temporary folder
- $extractDir = \OC::$server->getTempManager()->getTemporaryFolder();
- OC_Helper::rmdirr($extractDir);
- mkdir($extractDir);
- if($archive=\OC\Archive\Archive::open($path)) {
- $archive->extract($extractDir);
- } else {
- OC_Helper::rmdirr($extractDir);
- if($data['source']=='http') {
- unlink($path);
- }
- throw new \Exception($l->t("Failed to open archive when installing app"));
- }
+ // Download the release
+ $tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
+ $client = $this->clientService->newClient();
+ $client->get($app['releases'][0]['download'], ['save_to' => $tempFile]);
+
+ // Check if the signature actually matches the downloaded content
+ $certificate = openssl_get_publickey($app['certificate']);
+ $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+ openssl_free_key($certificate);
+
+ if($verified === true) {
+ // Seems to match, let's proceed
+ $extractDir = $this->tempManager->getTemporaryFolder();
+ $archive = new TAR($tempFile);
+
+ if($archive) {
+ $archive->extract($extractDir);
+ $allFiles = scandir($extractDir);
+ $folders = array_diff($allFiles, ['.', '..']);
+ $folders = array_values($folders);
+
+ if(count($folders) > 1) {
+ throw new \Exception(
+ sprintf(
+ 'Extracted app %s has more than 1 folder',
+ $appId
+ )
+ );
+ }
- return array(
- $extractDir,
- $path
- );
- }
+ // Check if appinfo/info.xml has the same app ID as well
+ $loadEntities = libxml_disable_entity_loader(false);
+ $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+ libxml_disable_entity_loader($loadEntities);
+ if((string)$xml->id !== $appId) {
+ throw new \Exception(
+ sprintf(
+ 'App for id %s has a wrong app ID in info.xml: %s',
+ $appId,
+ (string)$xml->id
+ )
+ );
+ }
- /**
- * check an app's integrity
- * @param array $data
- * @param string $extractDir
- * @param string $path
- * @param bool $isShipped
- * @return array
- * @throws \Exception
- */
- public static function checkAppsIntegrity($data, $extractDir, $path, $isShipped = false) {
- $l = \OC::$server->getL10N('lib');
- //load the info.xml file of the app
- if(!is_file($extractDir.'/appinfo/info.xml')) {
- //try to find it in a subdir
- $dh=opendir($extractDir);
- if(is_resource($dh)) {
- while (($folder = readdir($dh)) !== false) {
- if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) {
- if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) {
- $extractDir.='/'.$folder;
+ $baseDir = OC_App::getInstallPath() . '/' . $appId;
+ // Remove old app with the ID if existent
+ OC_Helper::rmdirr($baseDir);
+ // Move to app folder
+ if(@mkdir($baseDir)) {
+ $extractDir .= '/' . $folders[0];
+ OC_Helper::copyr($extractDir, $baseDir);
}
+ OC_Helper::copyr($extractDir, $baseDir);
+ OC_Helper::rmdirr($extractDir);
+ return;
+ } else {
+ throw new \Exception(
+ sprintf(
+ 'Could not extract app with ID %s to %s',
+ $appId,
+ $extractDir
+ )
+ );
}
- }
- }
- }
- if(!is_file($extractDir.'/appinfo/info.xml')) {
- OC_Helper::rmdirr($extractDir);
- if($data['source'] === 'http') {
- unlink($path);
- }
- throw new \Exception($l->t("App does not provide an info.xml file"));
- }
-
- $info = OC_App::getAppInfo($extractDir.'/appinfo/info.xml', true);
- if(!is_array($info)) {
- throw new \Exception($l->t('App cannot be installed because appinfo file cannot be read.'));
- }
-
- // We can't trust the parsed info.xml file as it may have been tampered
- // with by an attacker and thus we need to use the local data to check
- // whether the application needs to be signed.
- $appId = OC_App::cleanAppId($data['appdata']['id']);
- $appBelongingToId = OC_App::getInternalAppIdByOcs($appId);
- if(is_string($appBelongingToId)) {
- $previouslySigned = \OC::$server->getConfig()->getAppValue($appBelongingToId, 'signed', 'false');
- } else {
- $appBelongingToId = $info['id'];
- $previouslySigned = 'false';
- }
- if($data['appdata']['level'] === OC_App::officialApp || $previouslySigned === 'true') {
- \OC::$server->getConfig()->setAppValue($appBelongingToId, 'signed', 'true');
- $integrityResult = \OC::$server->getIntegrityCodeChecker()->verifyAppSignature(
- $appBelongingToId,
- $extractDir
- );
- if($integrityResult !== []) {
- $e = new \Exception(
- $l->t(
- 'Signature could not get checked. Please contact the app developer and check your admin screen.'
+ } else {
+ // Signature does not match
+ throw new \Exception(
+ sprintf(
+ 'App with id %s has invalid signature',
+ $appId
)
- );
- throw $e;
+ );
+ }
}
}
- // check the code for not allowed calls
- if(!$isShipped && !Installer::checkCode($extractDir)) {
- OC_Helper::rmdirr($extractDir);
- throw new \Exception($l->t("App can't be installed because of not allowed code in the App"));
- }
-
- // check if the app is compatible with this version of ownCloud
- if(!OC_App::isAppCompatible(\OCP\Util::getVersion(), $info)) {
- OC_Helper::rmdirr($extractDir);
- throw new \Exception($l->t("App can't be installed because it is not compatible with this version of the server"));
- }
-
- // check if shipped tag is set which is only allowed for apps that are shipped with ownCloud
- if(!$isShipped && isset($info['shipped']) && ($info['shipped']=='true')) {
- OC_Helper::rmdirr($extractDir);
- throw new \Exception($l->t("App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps"));
- }
-
- // check if the ocs version is the same as the version in info.xml/version
- $version = trim($info['version']);
-
- if(isset($data['appdata']['version']) && $version<>trim($data['appdata']['version'])) {
- OC_Helper::rmdirr($extractDir);
- throw new \Exception($l->t("App can't be installed because the version in info.xml is not the same as the version reported from the app store"));
- }
-
- return $info;
+ throw new \Exception(
+ sprintf(
+ 'Could not download app %s',
+ $appId
+ )
+ );
}
/**
* Check if an update for the app is available
- * @param string $app
- * @return string|false false or the version number of the update
*
- * The function will check if an update for a version is available
+ * @param string $appId
+ * @param AppFetcher $appFetcher
+ * @return string|false false or the version number of the update
*/
- public static function isUpdateAvailable( $app ) {
+ public static function isUpdateAvailable($appId,
+ AppFetcher $appFetcher) {
static $isInstanceReadyForUpdates = null;
if ($isInstanceReadyForUpdates === null) {
@@ -436,27 +341,20 @@ class Installer {
return false;
}
- $ocsid=\OC::$server->getAppConfig()->getValue( $app, 'ocsid', '');
-
- if($ocsid<>'') {
- $ocsClient = new OCSClient(
- \OC::$server->getHTTPClientService(),
- \OC::$server->getConfig(),
- \OC::$server->getLogger()
- );
- $ocsdata = $ocsClient->getApplication($ocsid, \OCP\Util::getVersion());
- $ocsversion= (string) $ocsdata['version'];
- $currentversion=OC_App::getAppVersion($app);
- if (version_compare($ocsversion, $currentversion, '>')) {
- return($ocsversion);
- }else{
- return false;
+ $apps = $appFetcher->get();
+ foreach($apps as $app) {
+ if($app['id'] === $appId) {
+ $currentVersion = OC_App::getAppVersion($appId);
+ $newestVersion = $app['releases'][0]['version'];
+ if (version_compare($newestVersion, $currentVersion, '>')) {
+ return $newestVersion;
+ } else {
+ return false;
+ }
}
-
- }else{
- return false;
}
+ return false;
}
/**
@@ -466,7 +364,7 @@ class Installer {
*
* The function will check if the app is already downloaded in the apps repository
*/
- public static function isDownloaded( $name ) {
+ public function isDownloaded($name) {
foreach(\OC::$APPSROOTS as $dir) {
$dirToTest = $dir['path'];
$dirToTest .= '/';
@@ -483,7 +381,7 @@ class Installer {
/**
* Removes an app
- * @param string $name name of the application to remove
+ * @param string $appId ID of the application to remove
* @return boolean
*
*
@@ -494,12 +392,10 @@ class Installer {
* The function will not delete preferences, tables and the configuration,
* this has to be done by the function oc_app_uninstall().
*/
- public static function removeApp($appId) {
-
- if(Installer::isDownloaded( $appId )) {
- $appDir=OC_App::getInstallPath() . '/' . $appId;
+ public function removeApp($appId) {
+ if($this->isDownloaded( $appId )) {
+ $appDir = OC_App::getInstallPath() . '/' . $appId;
OC_Helper::rmdirr($appDir);
-
return true;
}else{
\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', \OCP\Util::ERROR);
@@ -620,7 +516,7 @@ class Installer {
}
/**
- * @param $basedir
+ * @param string $script
*/
private static function includeAppScript($script) {
if ( file_exists($script) ){
diff --git a/lib/private/OCSClient.php b/lib/private/OCSClient.php
deleted file mode 100644
index 76c0b136c067a062283f6cfa1cec0b567bed84e9..0000000000000000000000000000000000000000
--- a/lib/private/OCSClient.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Brice Maron <brice@bmaron.net>
- * @author Felix Moeller <mail@felixmoeller.de>
- * @author Frank Karlitschek <frank@karlitschek.de>
- * @author Jarrett <JetUni@users.noreply.github.com>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Kamil Domanski <kdomanski@kdemail.net>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Sam Tuke <mail@samtuke.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @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 OCP\Http\Client\IClientService;
-use OCP\IConfig;
-use OCP\ILogger;
-
-/**
- * Class OCSClient is a class for communication with the ownCloud appstore
- *
- * @package OC
- */
-class OCSClient {
- /** @var IClientService */
- private $httpClientService;
- /** @var IConfig */
- private $config;
- /** @var ILogger */
- private $logger;
-
- /**
- * @param IClientService $httpClientService
- * @param IConfig $config
- * @param ILogger $logger
- */
- public function __construct(IClientService $httpClientService,
- IConfig $config,
- ILogger $logger) {
- $this->httpClientService = $httpClientService;
- $this->config = $config;
- $this->logger = $logger;
- }
-
- /**
- * Returns whether the AppStore is enabled (i.e. because the AppStore is disabled for EE)
- *
- * @return bool
- */
- public function isAppStoreEnabled() {
- return $this->config->getSystemValue('appstoreenabled', true) === true;
- }
-
- /**
- * Get the url of the OCS AppStore server.
- *
- * @return string of the AppStore server
- */
- private function getAppStoreUrl() {
- return $this->config->getSystemValue('appstoreurl', 'https://api.owncloud.com/v1');
- }
-
- /**
- * @param string $body
- * @param string $action
- * @return null|\SimpleXMLElement
- */
- private function loadData($body, $action) {
- $loadEntities = libxml_disable_entity_loader(true);
- $data = @simplexml_load_string($body);
- libxml_disable_entity_loader($loadEntities);
-
- if($data === false) {
- libxml_clear_errors();
- $this->logger->error(
- sprintf('Could not get %s, content was no valid XML', $action),
- [
- 'app' => 'core',
- ]
- );
- return null;
- }
-
- return $data;
- }
-
- /**
- * Get all the categories from the OCS server
- *
- * @param array $targetVersion The target ownCloud version
- * @return array|null an array of category ids or null
- * @note returns NULL if config value appstoreenabled is set to false
- * This function returns a list of all the application categories on the OCS server
- */
- public function getCategories(array $targetVersion) {
- if (!$this->isAppStoreEnabled()) {
- return null;
- }
-
- $client = $this->httpClientService->newClient();
- try {
- $response = $client->get(
- $this->getAppStoreUrl() . '/content/categories',
- [
- 'timeout' => 20,
- 'query' => [
- 'version' => implode('x', $targetVersion),
- ],
- ]
- );
- } catch(\Exception $e) {
- $this->logger->error(
- sprintf('Could not get categories: %s', $e->getMessage()),
- [
- 'app' => 'core',
- ]
- );
- return null;
- }
-
- $data = $this->loadData($response->getBody(), 'categories');
- if($data === null) {
- return null;
- }
-
- $tmp = $data->data;
- $cats = [];
-
- foreach ($tmp->category as $value) {
- $id = (int)$value->id;
- $name = (string)$value->name;
- $cats[$id] = $name;
- }
-
- return $cats;
- }
-
- /**
- * Get all the applications from the OCS server
- * @param array $categories
- * @param int $page
- * @param string $filter
- * @param array $targetVersion The target ownCloud version
- * @return array An array of application data
- */
- public function getApplications(array $categories, $page, $filter, array $targetVersion) {
- if (!$this->isAppStoreEnabled()) {
- return [];
- }
-
- $client = $this->httpClientService->newClient();
- try {
- $response = $client->get(
- $this->getAppStoreUrl() . '/content/data',
- [
- 'timeout' => 20,
- 'query' => [
- 'version' => implode('x', $targetVersion),
- 'filter' => $filter,
- 'categories' => implode('x', $categories),
- 'sortmode' => 'new',
- 'page' => $page,
- 'pagesize' => 100,
- 'approved' => $filter
- ],
- ]
- );
- } catch(\Exception $e) {
- $this->logger->error(
- sprintf('Could not get applications: %s', $e->getMessage()),
- [
- 'app' => 'core',
- ]
- );
- return [];
- }
-
- $data = $this->loadData($response->getBody(), 'applications');
- if($data === null) {
- return [];
- }
-
- $tmp = $data->data->content;
- $tmpCount = count($tmp);
-
- $apps = [];
- for ($i = 0; $i < $tmpCount; $i++) {
- $app = [];
- $app['id'] = (string)$tmp[$i]->id;
- $app['name'] = (string)$tmp[$i]->name;
- $app['label'] = (string)$tmp[$i]->label;
- $app['version'] = (string)$tmp[$i]->version;
- $app['type'] = (string)$tmp[$i]->typeid;
- $app['typename'] = (string)$tmp[$i]->typename;
- $app['personid'] = (string)$tmp[$i]->personid;
- $app['profilepage'] = (string)$tmp[$i]->profilepage;
- $app['license'] = (string)$tmp[$i]->license;
- $app['detailpage'] = (string)$tmp[$i]->detailpage;
- $app['preview'] = (string)$tmp[$i]->smallpreviewpic1;
- $app['preview-full'] = (string)$tmp[$i]->previewpic1;
- $app['changed'] = strtotime($tmp[$i]->changed);
- $app['description'] = (string)$tmp[$i]->description;
- $app['score'] = (string)$tmp[$i]->score;
- $app['downloads'] = (int)$tmp[$i]->downloads;
- $app['level'] = (int)$tmp[$i]->approved;
-
- $apps[] = $app;
- }
-
- return $apps;
- }
-
-
- /**
- * Get an the applications from the OCS server
- *
- * @param string $id
- * @param array $targetVersion The target ownCloud version
- * @return array|null an array of application data or null
- *
- * This function returns an applications from the OCS server
- */
- public function getApplication($id, array $targetVersion) {
- if (!$this->isAppStoreEnabled()) {
- return null;
- }
-
- $client = $this->httpClientService->newClient();
- try {
- $response = $client->get(
- $this->getAppStoreUrl() . '/content/data/' . urlencode($id),
- [
- 'timeout' => 20,
- 'query' => [
- 'version' => implode('x', $targetVersion),
- ],
- ]
- );
- } catch(\Exception $e) {
- $this->logger->error(
- sprintf('Could not get application: %s', $e->getMessage()),
- [
- 'app' => 'core',
- ]
- );
- return null;
- }
-
- $data = $this->loadData($response->getBody(), 'application');
- if($data === null) {
- return null;
- }
-
- $tmp = $data->data->content;
- if (is_null($tmp)) {
- \OCP\Util::writeLog('core', 'No update found at the ownCloud appstore for app ' . $id, \OCP\Util::DEBUG);
- return null;
- }
-
- $app = [];
- $app['id'] = (int)$id;
- $app['name'] = (string)$tmp->name;
- $app['version'] = (string)$tmp->version;
- $app['type'] = (string)$tmp->typeid;
- $app['label'] = (string)$tmp->label;
- $app['typename'] = (string)$tmp->typename;
- $app['personid'] = (string)$tmp->personid;
- $app['profilepage'] = (string)$tmp->profilepage;
- $app['detailpage'] = (string)$tmp->detailpage;
- $app['preview1'] = (string)$tmp->smallpreviewpic1;
- $app['preview2'] = (string)$tmp->smallpreviewpic2;
- $app['preview3'] = (string)$tmp->smallpreviewpic3;
- $app['changed'] = strtotime($tmp->changed);
- $app['description'] = (string)$tmp->description;
- $app['detailpage'] = (string)$tmp->detailpage;
- $app['score'] = (int)$tmp->score;
- $app['level'] = (int)$tmp->approved;
-
- return $app;
- }
-
- /**
- * Get the download url for an application from the OCS server
- * @param string $id
- * @param array $targetVersion The target ownCloud version
- * @return array|null an array of application data or null
- */
- public function getApplicationDownload($id, array $targetVersion) {
- if (!$this->isAppStoreEnabled()) {
- return null;
- }
- $url = $this->getAppStoreUrl() . '/content/download/' . urlencode($id) . '/1';
- $client = $this->httpClientService->newClient();
- try {
- $response = $client->get(
- $url,
- [
- 'timeout' => 20,
- 'query' => [
- 'version' => implode('x', $targetVersion),
- ],
- ]
- );
- } catch(\Exception $e) {
- $this->logger->error(
- sprintf('Could not get application download URL: %s', $e->getMessage()),
- [
- 'app' => 'core',
- ]
- );
- return null;
- }
-
- $data = $this->loadData($response->getBody(), 'application download URL');
- if($data === null) {
- return null;
- }
-
- $tmp = $data->data->content;
- $app = [];
- if (isset($tmp->downloadlink)) {
- $app['downloadlink'] = (string)$tmp->downloadlink;
- } else {
- $app['downloadlink'] = '';
- }
- return $app;
- }
-
-}
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 21ec311401dac6926deec8d5f70ef60b71a57caa..3ea358498da16351afa2bbfb8603b0a3195b687e 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -1,6 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bart Visscher <bartv@thisnet.nl>
@@ -41,6 +42,8 @@
namespace OC;
use bantu\IniGetWrapper\IniGetWrapper;
+use OC\App\AppStore\Fetcher\AppFetcher;
+use OC\App\AppStore\Fetcher\CategoryFetcher;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Db\Db;
use OC\AppFramework\Utility\TimeFactory;
@@ -320,6 +323,21 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService('AppHelper', function ($c) {
return new \OC\AppHelper();
});
+ $this->registerService('AppFetcher', function ($c) {
+ return new AppFetcher(
+ $this->getAppDataDir('appstore'),
+ $this->getHTTPClientService(),
+ $this->query(TimeFactory::class),
+ $this->getConfig()
+ );
+ });
+ $this->registerService('CategoryFetcher', function ($c) {
+ return new CategoryFetcher(
+ $this->getAppDataDir('appstore'),
+ $this->getHTTPClientService(),
+ $this->query(TimeFactory::class)
+ );
+ });
$this->registerService('UserCache', function ($c) {
return new Cache\File();
});
@@ -580,13 +598,6 @@ class Server extends ServerContainer implements IServerContainer {
$c->getThemingDefaults()
);
});
- $this->registerService('OcsClient', function (Server $c) {
- return new OCSClient(
- $this->getHTTPClientService(),
- $this->getConfig(),
- $this->getLogger()
- );
- });
$this->registerService('LDAPProvider', function(Server $c) {
$config = $c->getConfig();
$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
@@ -1007,6 +1018,13 @@ class Server extends ServerContainer implements IServerContainer {
return $this->query('AppHelper');
}
+ /**
+ * @return AppFetcher
+ */
+ public function getAppFetcher() {
+ return $this->query('AppFetcher');
+ }
+
/**
* Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
* getMemCacheFactory() instead.
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 646fc031a830597d890d7e3c8096165e32ae7c22..cd2934f71961c554e8d02e58ee92668699f97077 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -1,6 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Frank Karlitschek <frank@karlitschek.de>
@@ -426,11 +427,15 @@ class Updater extends BasicEmitter {
private function upgradeAppStoreApps(array $disabledApps) {
foreach($disabledApps as $app) {
try {
- if (Installer::isUpdateAvailable($app)) {
- $ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', '');
-
- $this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app));
- Installer::updateAppByOCSId($ocsId);
+ $installer = new Installer(
+ \OC::$server->getAppFetcher(),
+ \OC::$server->getHTTPClientService(),
+ \OC::$server->getTempManager(),
+ $this->log
+ );
+ if (Installer::isUpdateAvailable($app, \OC::$server->getAppFetcher())) {
+ $this->emit('\OC\Updater', 'upgradeAppStoreApp', [$app]);
+ $installer->updateAppstoreApp($app);
}
} catch (\Exception $ex) {
$this->log->logException($ex, ['app' => 'core']);
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index d25534aa82264316ccfd34bd61e79fa9d778bb90..a89a4650c5d335573ddb7eaeaf93752d92f6fec9 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -1,6 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bart Visscher <bartv@thisnet.nl>
@@ -326,24 +327,44 @@ class OC_App {
/**
* enables an app
*
- * @param mixed $app app
+ * @param string $appId
* @param array $groups (optional) when set, only these groups will have access to the app
* @throws \Exception
* @return void
*
* This function set an app as enabled in appconfig.
*/
- public static function enable($app, $groups = null) {
+ public function enable($appId,
+ $groups = null) {
self::$enabledAppsCache = []; // flush
- if (!Installer::isInstalled($app)) {
- $app = self::installApp($app);
+ $l = \OC::$server->getL10N('core');
+ $config = \OC::$server->getConfig();
+
+ // Check if app is already downloaded
+ $installer = new Installer(
+ \OC::$server->getAppFetcher(),
+ \OC::$server->getHTTPClientService(),
+ \OC::$server->getTempManager(),
+ \OC::$server->getLogger()
+ );
+ $isDownloaded = $installer->isDownloaded($appId);
+
+ if(!$isDownloaded) {
+ $installer->downloadApp($appId);
+ }
+
+ if (!Installer::isInstalled($appId)) {
+ $appId = self::installApp(
+ $appId,
+ $config,
+ $l
+ );
+ $installer->installApp($appId);
} else {
// check for required dependencies
- $config = \OC::$server->getConfig();
- $l = \OC::$server->getL10N('core');
- $info = self::getAppInfo($app);
-
+ $info = self::getAppInfo($appId);
self::checkAppDependencies($config, $l, $info);
+ $installer->installApp($appId);
}
$appManager = \OC::$server->getAppManager();
@@ -356,40 +377,19 @@ class OC_App {
$groupsList[] = $groupManager->get($group);
}
}
- $appManager->enableAppForGroups($app, $groupsList);
+ $appManager->enableAppForGroups($appId, $groupsList);
} else {
- $appManager->enableApp($app);
+ $appManager->enableApp($appId);
}
- $info = self::getAppInfo($app);
+ $info = self::getAppInfo($appId);
if(isset($info['settings']) && is_array($info['settings'])) {
- $appPath = self::getAppPath($app);
- self::registerAutoloading($app, $appPath);
+ $appPath = self::getAppPath($appId);
+ self::registerAutoloading($appId, $appPath);
\OC::$server->getSettingsManager()->setupSettings($info['settings']);
}
}
- /**
- * @param string $app
- * @return int
- */
- private static function downloadApp($app) {
- $ocsClient = new OCSClient(
- \OC::$server->getHTTPClientService(),
- \OC::$server->getConfig(),
- \OC::$server->getLogger()
- );
- $appData = $ocsClient->getApplication($app, \OCP\Util::getVersion());
- $download = $ocsClient->getApplicationDownload($app, \OCP\Util::getVersion());
- if(isset($download['downloadlink']) and $download['downloadlink']!='') {
- // Replace spaces in download link without encoding entire URL
- $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
- $info = array('source' => 'http', 'href' => $download['downloadlink'], 'appdata' => $appData);
- $app = Installer::installApp($info);
- }
- return $app;
- }
-
/**
* @param string $app
* @return bool
@@ -399,7 +399,13 @@ class OC_App {
return false;
}
- return Installer::removeApp($app);
+ $installer = new Installer(
+ \OC::$server->getAppFetcher(),
+ \OC::$server->getHTTPClientService(),
+ \OC::$server->getTempManager(),
+ \OC::$server->getLogger()
+ );
+ return $installer->removeApp($app);
}
/**
@@ -409,11 +415,6 @@ class OC_App {
* @throws Exception
*/
public static function disable($app) {
- // Convert OCS ID to regular application identifier
- if(self::getInternalAppIdByOcs($app) !== false) {
- $app = self::getInternalAppIdByOcs($app);
- }
-
// flush
self::$enabledAppsCache = array();
@@ -554,7 +555,7 @@ class OC_App {
* @param string $appId
* @return false|string
*/
- protected static function findAppInDirectories($appId) {
+ public static function findAppInDirectories($appId) {
$sanitizedAppId = self::cleanAppId($appId);
if($sanitizedAppId !== $appId) {
return false;
@@ -613,18 +614,6 @@ class OC_App {
return false;
}
-
- /**
- * check if an app's directory is writable
- *
- * @param string $appId
- * @return bool
- */
- public static function isAppDirWritable($appId) {
- $path = self::getAppPath($appId);
- return ($path !== false) ? is_writable($path) : false;
- }
-
/**
* Get the path for the given app on the access
* If the app is defined in multiple directories, the first one is taken. (false if not found)
@@ -837,20 +826,11 @@ class OC_App {
/**
* List all apps, this is used in apps.php
*
- * @param bool $onlyLocal
- * @param bool $includeUpdateInfo Should we check whether there is an update
- * in the app store?
- * @param OCSClient $ocsClient
* @return array
*/
- public static function listAllApps($onlyLocal = false,
- $includeUpdateInfo = true,
- OCSClient $ocsClient) {
+ public function listAllApps() {
$installedApps = OC_App::getAllApps();
- //TODO which apps do we want to blacklist and how do we integrate
- // blacklisting with the multi apps folder feature?
-
//we don't want to show configuration for these
$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
$appList = array();
@@ -893,8 +873,6 @@ class OC_App {
$info['removable'] = true;
}
- $info['update'] = ($includeUpdateInfo) ? Installer::isUpdateAvailable($app) : null;
-
$appPath = self::getAppPath($app);
if($appPath !== false) {
$appIcon = $appPath . '/img/' . $app . '.svg';
@@ -926,29 +904,8 @@ class OC_App {
$appList[] = $info;
}
}
- if ($onlyLocal) {
- $remoteApps = [];
- } else {
- $remoteApps = OC_App::getAppstoreApps('approved', null, $ocsClient);
- }
- if ($remoteApps) {
- // Remove duplicates
- foreach ($appList as $app) {
- foreach ($remoteApps AS $key => $remote) {
- if ($app['name'] === $remote['name'] ||
- (isset($app['ocsid']) &&
- $app['ocsid'] === $remote['id'])
- ) {
- unset($remoteApps[$key]);
- }
- }
- }
- $combinedApps = array_merge($appList, $remoteApps);
- } else {
- $combinedApps = $appList;
- }
- return $combinedApps;
+ return $appList;
}
/**
@@ -966,70 +923,6 @@ class OC_App {
return false;
}
- /**
- * Get a list of all apps on the appstore
- * @param string $filter
- * @param string|null $category
- * @param OCSClient $ocsClient
- * @return array|bool multi-dimensional array of apps.
- * Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description
- */
- public static function getAppstoreApps($filter = 'approved',
- $category = null,
- OCSClient $ocsClient) {
- $categories = [$category];
-
- if (is_null($category)) {
- $categoryNames = $ocsClient->getCategories(\OCP\Util::getVersion());
- if (is_array($categoryNames)) {
- // Check that categories of apps were retrieved correctly
- if (!$categories = array_keys($categoryNames)) {
- return false;
- }
- } else {
- return false;
- }
- }
-
- $page = 0;
- $remoteApps = $ocsClient->getApplications($categories, $page, $filter, \OCP\Util::getVersion());
- $apps = [];
- $i = 0;
- $l = \OC::$server->getL10N('core');
- foreach ($remoteApps as $app) {
- $potentialCleanId = self::getInternalAppIdByOcs($app['id']);
- // enhance app info (for example the description)
- $apps[$i] = OC_App::parseAppInfo($app);
- $apps[$i]['author'] = $app['personid'];
- $apps[$i]['ocs_id'] = $app['id'];
- $apps[$i]['internal'] = 0;
- $apps[$i]['active'] = ($potentialCleanId !== false) ? self::isEnabled($potentialCleanId) : false;
- $apps[$i]['update'] = false;
- $apps[$i]['groups'] = false;
- $apps[$i]['score'] = $app['score'];
- $apps[$i]['removable'] = false;
- if ($app['label'] == 'recommended') {
- $apps[$i]['internallabel'] = (string)$l->t('Recommended');
- $apps[$i]['internalclass'] = 'recommendedapp';
- }
-
- // Apps from the appstore are always assumed to be compatible with the
- // the current release as the initial filtering is done on the appstore
- $apps[$i]['dependencies']['owncloud']['@attributes']['min-version'] = implode('.', \OCP\Util::getVersion());
- $apps[$i]['dependencies']['owncloud']['@attributes']['max-version'] = implode('.', \OCP\Util::getVersion());
-
- $i++;
- }
-
-
-
- if (empty($apps)) {
- return false;
- } else {
- return $apps;
- }
- }
-
public static function shouldUpgrade($app) {
$versions = self::getAppVersions();
$currentVersion = OC_App::getAppVersion($app);
@@ -1083,7 +976,9 @@ class OC_App {
public static function isAppCompatible($ocVersion, $appInfo) {
$requireMin = '';
$requireMax = '';
- if (isset($appInfo['dependencies']['owncloud']['@attributes']['min-version'])) {
+ if (isset($appInfo['dependencies']['nextcloud']['@attributes']['min-version'])) {
+ $requireMin = $appInfo['dependencies']['nextcloud']['@attributes']['min-version'];
+ } elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['min-version'])) {
$requireMin = $appInfo['dependencies']['owncloud']['@attributes']['min-version'];
} else if (isset($appInfo['requiremin'])) {
$requireMin = $appInfo['requiremin'];
@@ -1091,7 +986,9 @@ class OC_App {
$requireMin = $appInfo['require'];
}
- if (isset($appInfo['dependencies']['owncloud']['@attributes']['max-version'])) {
+ if (isset($appInfo['dependencies']['nextcloud']['@attributes']['max-version'])) {
+ $requireMax = $appInfo['dependencies']['nextcloud']['@attributes']['max-version'];
+ } elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['max-version'])) {
$requireMax = $appInfo['dependencies']['owncloud']['@attributes']['max-version'];
} else if (isset($appInfo['requiremax'])) {
$requireMax = $appInfo['requiremax'];
@@ -1132,46 +1029,16 @@ class OC_App {
/**
* @param string $app
+ * @param \OCP\IConfig $config
+ * @param \OCP\IL10N $l
* @return bool
+ *
* @throws Exception if app is not compatible with this version of ownCloud
* @throws Exception if no app-name was specified
*/
- public static function installApp($app) {
- $appName = $app; // $app will be overwritten, preserve name for error logging
- $l = \OC::$server->getL10N('core');
- $config = \OC::$server->getConfig();
- $ocsClient = new OCSClient(
- \OC::$server->getHTTPClientService(),
- $config,
- \OC::$server->getLogger()
- );
- $appData = $ocsClient->getApplication($app, \OCP\Util::getVersion());
-
- // check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
- if (!is_numeric($app)) {
- $shippedVersion = self::getAppVersion($app);
- if ($appData && version_compare($shippedVersion, $appData['version'], '<')) {
- $app = self::downloadApp($app);
- } else {
- $app = Installer::installShippedApp($app);
- }
- } else {
- // Maybe the app is already installed - compare the version in this
- // case and use the local already installed one.
- // FIXME: This is a horrible hack. I feel sad. The god of code cleanness may forgive me.
- $internalAppId = self::getInternalAppIdByOcs($app);
- if($internalAppId !== false) {
- if($appData && version_compare(\OC_App::getAppVersion($internalAppId), $appData['version'], '<')) {
- $app = self::downloadApp($app);
- } else {
- self::enable($internalAppId);
- $app = $internalAppId;
- }
- } else {
- $app = self::downloadApp($app);
- }
- }
-
+ public function installApp($app,
+ \OCP\IConfig $config,
+ \OCP\IL10N $l) {
if ($app !== false) {
// check if the app is compatible with this version of ownCloud
$info = self::getAppInfo($app);
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index e4c2caeafd7a55828e8e0eaae9c6af16e265f3d0..5cd92eaa4157d424f5b8a243566219d2fd9b863c 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -757,6 +757,7 @@ class OC_Util {
'simplexml_load_string' => 'SimpleXML',
'hash' => 'HASH Message Digest Framework',
'curl_init' => 'cURL',
+ 'openssl_verify' => 'OpenSSL',
],
'defined' => array(
'PDO::ATTR_DRIVER_NAME' => 'PDO'
diff --git a/resources/codesigning/root.crl b/resources/codesigning/root.crl
new file mode 100644
index 0000000000000000000000000000000000000000..cb1b97fc87dd8c415c0dd00fab3ce486393d75d7
--- /dev/null
+++ b/resources/codesigning/root.crl
@@ -0,0 +1,14 @@
+-----BEGIN X509 CRL-----
+MIICDTCB9gIBATANBgkqhkiG9w0BAQsFADB7MQswCQYDVQQGEwJERTEbMBkGA1UE
+CAwSQmFkZW4tV3VlcnR0ZW1iZXJnMRcwFQYDVQQKDA5OZXh0Y2xvdWQgR21iSDE2
+MDQGA1UEAwwtTmV4dGNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0
+aG9yaXR5Fw0xNjEwMTcxMjA5MjhaFw0yNjA4MjYxMjA5MjhaMBUwEwICEBAXDTE2
+MTAxNzEyMDkxOVqgMDAuMB8GA1UdIwQYMBaAFG3qbqqpNyw8iS0XPv1G7sOeeO10
+MAsGA1UdFAQEAgIQAzANBgkqhkiG9w0BAQsFAAOCAQEAZGJNwERFseCv6cS6bfmq
+hIIqHieG+/mp4kjqtk4mg8CEYZq/M0q2DMjh7xZUuflV3wadqTCDunDXoyUIV36K
+TwLsrREKGFqpSDsVgnX6IYeG0Sf7rnV5PYD2ODWfXrjp3yU7/Jgc2qjco11X5psV
+uUnqGDU7DoMwFB6GTTRXfjpCKn8SUtuETAEN013Ii6xXsfCJQTjzQaZByz/Xbypr
+sPfotQRfpAhhfjowK5B2ESjXePdNuFlPEAJ114HDJrI89dndIzus95N+3q2sm80T
+TFwdooAghAvVmABADC3GQ9bvQb9CUC14DQZJWesy/ps64fgKdXcnBhsX9uPJ7Fdb
+hQ==
+-----END X509 CRL-----
\ No newline at end of file
diff --git a/settings/Application.php b/settings/Application.php
index dd237e40c9d6e0beb8ff690dd8e1b428c1a4b810..d907cd666fb76ce41b1f0a4033aabd085c0845dd 100644
--- a/settings/Application.php
+++ b/settings/Application.php
@@ -30,7 +30,11 @@
namespace OC\Settings;
+use OC\App\AppStore\Fetcher\AppFetcher;
+use OC\App\AppStore\Fetcher\CategoryFetcher;
+use OC\AppFramework\Utility\TimeFactory;
use OC\Authentication\Token\IProvider;
+use OC\Server;
use OC\Settings\Middleware\SubadminMiddleware;
use OCP\AppFramework\App;
use OCP\IContainer;
@@ -86,5 +90,24 @@ class Application extends App {
$container->registerService(IManager::class, function (IContainer $c) {
return $c->query('ServerContainer')->getSettingsManager();
});
+ $container->registerService(AppFetcher::class, function (IContainer $c) {
+ /** @var Server $server */
+ $server = $c->query('ServerContainer');
+ return new AppFetcher(
+ $server->getAppDataDir('appstore'),
+ $server->getHTTPClientService(),
+ $server->query(TimeFactory::class),
+ $server->getConfig()
+ );
+ });
+ $container->registerService(CategoryFetcher::class, function (IContainer $c) {
+ /** @var Server $server */
+ $server = $c->query('ServerContainer');
+ return new CategoryFetcher(
+ $server->getAppDataDir('appstore'),
+ $server->getHTTPClientService(),
+ $server->query(TimeFactory::class)
+ );
+ });
}
}
diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php
index 2efd3b8a847d583a7d8663621fb9548595e7986d..8164dd1fcfa80cbcea48b56254361e5d469d3c5a 100644
--- a/settings/Controller/AppSettingsController.php
+++ b/settings/Controller/AppSettingsController.php
@@ -1,6 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
*
* @author Christoph Wurst <christoph@owncloud.com>
* @author Joas Schilling <coding@schilljs.com>
@@ -26,19 +27,21 @@
namespace OC\Settings\Controller;
+use OC\App\AppStore\Fetcher\AppFetcher;
+use OC\App\AppStore\Fetcher\CategoryFetcher;
+use OC\App\AppStore\Version\VersionParser;
use OC\App\DependencyAnalyzer;
use OC\App\Platform;
-use OC\OCSClient;
use OCP\App\IAppManager;
use \OCP\AppFramework\Controller;
use OCP\AppFramework\Http\ContentSecurityPolicy;
-use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\TemplateResponse;
-use OCP\ICacheFactory;
use OCP\INavigationManager;
use OCP\IRequest;
use OCP\IL10N;
use OCP\IConfig;
+use OCP\L10N\IFactory;
/**
* @package OC\Settings\Controller
@@ -51,95 +54,66 @@ class AppSettingsController extends Controller {
private $l10n;
/** @var IConfig */
private $config;
- /** @var \OCP\ICache */
- private $cache;
/** @var INavigationManager */
private $navigationManager;
/** @var IAppManager */
private $appManager;
- /** @var OCSClient */
- private $ocsClient;
+ /** @var CategoryFetcher */
+ private $categoryFetcher;
+ /** @var AppFetcher */
+ private $appFetcher;
+ /** @var IFactory */
+ private $l10nFactory;
/**
* @param string $appName
* @param IRequest $request
* @param IL10N $l10n
* @param IConfig $config
- * @param ICacheFactory $cache
* @param INavigationManager $navigationManager
* @param IAppManager $appManager
- * @param OCSClient $ocsClient
+ * @param CategoryFetcher $categoryFetcher
+ * @param AppFetcher $appFetcher
+ * @param IFactory $l10nFactory
*/
public function __construct($appName,
IRequest $request,
IL10N $l10n,
IConfig $config,
- ICacheFactory $cache,
INavigationManager $navigationManager,
IAppManager $appManager,
- OCSClient $ocsClient) {
+ CategoryFetcher $categoryFetcher,
+ AppFetcher $appFetcher,
+ IFactory $l10nFactory) {
parent::__construct($appName, $request);
$this->l10n = $l10n;
$this->config = $config;
- $this->cache = $cache->create($appName);
$this->navigationManager = $navigationManager;
$this->appManager = $appManager;
- $this->ocsClient = $ocsClient;
- }
-
- /**
- * Enables or disables the display of experimental apps
- * @param bool $state
- * @return DataResponse
- */
- public function changeExperimentalConfigState($state) {
- $this->config->setSystemValue('appstore.experimental.enabled', $state);
- $this->appManager->clearAppsCache();
- return new DataResponse();
- }
-
- /**
- * @param string|int $category
- * @return int
- */
- protected function getCategory($category) {
- if (is_string($category)) {
- foreach ($this->listCategories() as $cat) {
- if (isset($cat['ident']) && $cat['ident'] === $category) {
- $category = (int) $cat['id'];
- break;
- }
- }
-
- // Didn't find the category, falling back to enabled
- if (is_string($category)) {
- $category = self::CAT_ENABLED;
- }
- }
- return (int) $category;
+ $this->categoryFetcher = $categoryFetcher;
+ $this->appFetcher = $appFetcher;
+ $this->l10nFactory = $l10nFactory;
}
/**
* @NoCSRFRequired
+ *
* @param string $category
* @return TemplateResponse
*/
public function viewApps($category = '') {
- $categoryId = $this->getCategory($category);
- if ($categoryId === self::CAT_ENABLED) {
- // Do not use an arbitrary input string, because we put the category in html
+ if ($category === '') {
$category = 'enabled';
}
$params = [];
- $params['experimentalEnabled'] = $this->config->getSystemValue('appstore.experimental.enabled', false);
$params['category'] = $category;
$params['appstoreEnabled'] = $this->config->getSystemValue('appstoreenabled', true) === true;
$this->navigationManager->setActiveEntry('core_apps');
$templateResponse = new TemplateResponse($this->appName, 'apps', $params, 'user');
$policy = new ContentSecurityPolicy();
- $policy->addAllowedImageDomain('https://apps.owncloud.com');
+ $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
$templateResponse->setContentSecurityPolicy($policy);
return $templateResponse;
@@ -147,139 +121,192 @@ class AppSettingsController extends Controller {
/**
* Get all available categories
- * @return array
+ *
+ * @return JSONResponse
*/
public function listCategories() {
+ $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
- if(!is_null($this->cache->get('listCategories'))) {
- return $this->cache->get('listCategories');
- }
- $categories = [
+ $formattedCategories = [
['id' => self::CAT_ENABLED, 'ident' => 'enabled', 'displayName' => (string)$this->l10n->t('Enabled')],
['id' => self::CAT_DISABLED, 'ident' => 'disabled', 'displayName' => (string)$this->l10n->t('Not enabled')],
];
+ $categories = $this->categoryFetcher->get();
+ foreach($categories as $category) {
+ $formattedCategories[] = [
+ 'id' => $category['id'],
+ 'ident' => $category['id'],
+ 'displayName' => isset($category['translations'][$currentLanguage]['name']) ? $category['translations'][$currentLanguage]['name'] : $category['translations']['en']['name'],
+ ];
+ }
+
+ return new JSONResponse($formattedCategories);
+ }
- if($this->ocsClient->isAppStoreEnabled()) {
- // apps from external repo via OCS
- $ocs = $this->ocsClient->getCategories(\OCP\Util::getVersion());
- if ($ocs) {
- foreach($ocs as $k => $v) {
- $name = str_replace('ownCloud ', '', $v);
- $ident = str_replace(' ', '-', urlencode(strtolower($name)));
- $categories[] = [
- 'id' => $k,
- 'ident' => $ident,
- 'displayName' => $name,
- ];
+ /**
+ * Get all apps for a category
+ *
+ * @param string $requestedCategory
+ * @return array
+ */
+ private function getAppsForCategory($requestedCategory) {
+ $versionParser = new VersionParser();
+ $formattedApps = [];
+ $apps = $this->appFetcher->get();
+ foreach($apps as $app) {
+
+ // Skip all apps not in the requested category
+ $isInCategory = false;
+ foreach($app['categories'] as $category) {
+ if($category === $requestedCategory) {
+ $isInCategory = true;
}
}
- }
+ if(!$isInCategory) {
+ continue;
+ }
- $this->cache->set('listCategories', $categories, 3600);
+ $nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
+ $nextCloudVersionDependencies = [];
+ if($nextCloudVersion->getMinimumVersion() !== '') {
+ $nextCloudVersionDependencies['owncloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
+ }
+ if($nextCloudVersion->getMaximumVersion() !== '') {
+ $nextCloudVersionDependencies['owncloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
+ }
+ $phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
+ $existsLocally = (\OC_App::getAppPath($app['id']) !== false) ? true : false;
+ $phpDependencies = [];
+ if($phpVersion->getMinimumVersion() !== '') {
+ $phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
+ }
+ if($phpVersion->getMaximumVersion() !== '') {
+ $phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
+ }
+ if(isset($app['releases'][0]['minIntSize'])) {
+ $phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
+ }
+ $authors = '';
+ foreach($app['authors'] as $key => $author) {
+ $authors .= $author['name'];
+ if($key !== count($app['authors']) - 1) {
+ $authors .= ', ';
+ }
+ }
+
+ $currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
+ $enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
+ $groups = null;
+ if($enabledValue !== 'no' && $enabledValue !== 'yes') {
+ $groups = $enabledValue;
+ }
- return $categories;
+ $currentVersion = '';
+ if($this->appManager->isInstalled($app['id'])) {
+ $currentVersion = \OC_App::getAppVersion($app['id']);
+ } else {
+ $currentLanguage = $app['releases'][0]['version'];
+ }
+
+ $formattedApps[] = [
+ 'id' => $app['id'],
+ 'name' => isset($app['translations'][$currentLanguage]['name']) ? $app['translations'][$currentLanguage]['name'] : $app['translations']['en']['name'],
+ 'description' => isset($app['translations'][$currentLanguage]['description']) ? $app['translations'][$currentLanguage]['description'] : $app['translations']['en']['description'],
+ 'license' => $app['releases'][0]['licenses'],
+ 'author' => $authors,
+ 'shipped' => false,
+ 'version' => $currentVersion,
+ 'default_enable' => '',
+ 'types' => [],
+ 'documentation' => [
+ 'admin' => $app['adminDocs'],
+ 'user' => $app['userDocs'],
+ 'developer' => $app['developerDocs']
+ ],
+ 'website' => $app['website'],
+ 'bugs' => $app['issueTracker'],
+ 'detailpage' => $app['website'],
+ 'dependencies' => array_merge(
+ $nextCloudVersionDependencies,
+ $phpDependencies
+ ),
+ 'level' => ($app['featured'] === true) ? 200 : 100,
+ 'missingMaxOwnCloudVersion' => false,
+ 'missingMinOwnCloudVersion' => false,
+ 'canInstall' => true,
+ 'preview' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
+ 'score' => $app['ratingOverall'],
+ 'removable' => $existsLocally,
+ 'active' => $this->appManager->isEnabledForUser($app['id']),
+ 'needsDownload' => !$existsLocally,
+ 'groups' => $groups,
+ 'fromAppStore' => true,
+ ];
+
+
+ $appFetcher = \OC::$server->getAppFetcher();
+ $newVersion = \OC\Installer::isUpdateAvailable($app['id'], $appFetcher);
+ if($newVersion && $this->appManager->isInstalled($app['id'])) {
+ $formattedApps[count($formattedApps)-1]['update'] = $newVersion;
+ }
+ }
+
+ return $formattedApps;
}
/**
* Get all available apps in a category
*
* @param string $category
- * @param bool $includeUpdateInfo Should we check whether there is an update
- * in the app store?
- * @return array
+ * @return JSONResponse
*/
- public function listApps($category = '', $includeUpdateInfo = true) {
- $category = $this->getCategory($category);
- $cacheName = 'listApps-' . $category . '-' . (int) $includeUpdateInfo;
-
- if(!is_null($this->cache->get($cacheName))) {
- $apps = $this->cache->get($cacheName);
- } else {
- switch ($category) {
- // installed apps
- case 0:
- $apps = $this->getInstalledApps($includeUpdateInfo);
- usort($apps, function ($a, $b) {
- $a = (string)$a['name'];
- $b = (string)$b['name'];
- if ($a === $b) {
- return 0;
- }
- return ($a < $b) ? -1 : 1;
- });
- $version = \OCP\Util::getVersion();
- foreach($apps as $key => $app) {
- if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) {
- $remoteAppEntry = $this->ocsClient->getApplication($app['ocsid'], $version);
-
- if(is_array($remoteAppEntry) && array_key_exists('level', $remoteAppEntry)) {
- $apps[$key]['level'] = $remoteAppEntry['level'];
- }
- }
+ public function listApps($category = '') {
+ $appClass = new \OC_App();
+
+ switch ($category) {
+ // installed apps
+ case 'enabled':
+ $apps = $appClass->listAllApps();
+ $apps = array_filter($apps, function ($app) {
+ return $app['active'];
+ });
+ usort($apps, function ($a, $b) {
+ $a = (string)$a['name'];
+ $b = (string)$b['name'];
+ if ($a === $b) {
+ return 0;
}
- break;
- // not-installed apps
- case 1:
- $apps = \OC_App::listAllApps(true, $includeUpdateInfo, $this->ocsClient);
- $apps = array_filter($apps, function ($app) {
- return !$app['active'];
- });
- $version = \OCP\Util::getVersion();
- foreach($apps as $key => $app) {
- if(!array_key_exists('level', $app) && array_key_exists('ocsid', $app)) {
- $remoteAppEntry = $this->ocsClient->getApplication($app['ocsid'], $version);
-
- if(is_array($remoteAppEntry) && array_key_exists('level', $remoteAppEntry)) {
- $apps[$key]['level'] = $remoteAppEntry['level'];
- }
- }
+ return ($a < $b) ? -1 : 1;
+ });
+ break;
+ // disabled apps
+ case 'disabled':
+ $apps = $appClass->listAllApps();
+ $apps = array_filter($apps, function ($app) {
+ return !$app['active'];
+ });
+ usort($apps, function ($a, $b) {
+ $a = (string)$a['name'];
+ $b = (string)$b['name'];
+ if ($a === $b) {
+ return 0;
}
- usort($apps, function ($a, $b) {
- $a = (string)$a['name'];
- $b = (string)$b['name'];
- if ($a === $b) {
- return 0;
- }
- return ($a < $b) ? -1 : 1;
- });
- break;
- default:
- $filter = $this->config->getSystemValue('appstore.experimental.enabled', false) ? 'all' : 'approved';
-
- $apps = \OC_App::getAppstoreApps($filter, $category, $this->ocsClient);
- if (!$apps) {
- $apps = array();
- } else {
- // don't list installed apps
- $installedApps = $this->getInstalledApps(false);
- $installedApps = array_map(function ($app) {
- if (isset($app['ocsid'])) {
- return $app['ocsid'];
- }
- return $app['id'];
- }, $installedApps);
- $apps = array_filter($apps, function ($app) use ($installedApps) {
- return !in_array($app['id'], $installedApps);
- });
-
- // show tooltip if app is downloaded from remote server
- $inactiveApps = $this->getInactiveApps();
- foreach ($apps as &$app) {
- $app['needsDownload'] = !in_array($app['id'], $inactiveApps);
- }
+ return ($a < $b) ? -1 : 1;
+ });
+ break;
+ default:
+ $apps = $this->getAppsForCategory($category);
+
+ // sort by score
+ usort($apps, function ($a, $b) {
+ $a = (int)$a['score'];
+ $b = (int)$b['score'];
+ if ($a === $b) {
+ return 0;
}
-
- // sort by score
- usort($apps, function ($a, $b) {
- $a = (int)$a['score'];
- $b = (int)$b['score'];
- if ($a === $b) {
- return 0;
- }
- return ($a > $b) ? -1 : 1;
- });
- break;
- }
+ return ($a > $b) ? -1 : 1;
+ });
+ break;
}
// fix groups to be an array
@@ -310,40 +337,6 @@ class AppSettingsController extends Controller {
return $app;
}, $apps);
- $this->cache->set($cacheName, $apps, 300);
-
- return ['apps' => $apps, 'status' => 'success'];
- }
-
- /**
- * @param bool $includeUpdateInfo Should we check whether there is an update
- * in the app store?
- * @return array
- */
- private function getInstalledApps($includeUpdateInfo = true) {
- $apps = \OC_App::listAllApps(true, $includeUpdateInfo, $this->ocsClient);
- $apps = array_filter($apps, function ($app) {
- return $app['active'];
- });
- return $apps;
+ return new JSONResponse(['apps' => $apps, 'status' => 'success']);
}
-
- /**
- * @return array
- */
- private function getInactiveApps() {
- $inactiveApps = \OC_App::listAllApps(true, false, $this->ocsClient);
- $inactiveApps = array_filter($inactiveApps,
- function ($app) {
- return !$app['active'];
- });
- $inactiveApps = array_map(function($app) {
- if (isset($app['ocsid'])) {
- return $app['ocsid'];
- }
- return $app['id'];
- }, $inactiveApps);
- return $inactiveApps;
- }
-
}
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index db4503f20e79c92d9a489406a7f007d967e88d3f..b378b3c918d8d473e2db1fbfbe598ac7badcb461 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -31,8 +31,10 @@ OCP\JSON::callCheck();
$groups = isset($_POST['groups']) ? (array)$_POST['groups'] : null;
try {
- $app = OC_App::cleanAppId((string)$_POST['appid']);
- OC_App::enable($app, $groups);
+ $app = new OC_App();
+ $appId = (string)$_POST['appid'];
+ $appId = OC_App::cleanAppId($appId);
+ $app->enable($appId, $groups);
OC_JSON::success(['data' => ['update_required' => \OC_App::shouldUpgrade($app)]]);
} catch (Exception $e) {
\OCP\Util::writeLog('core', $e->getMessage(), \OCP\Util::ERROR);
diff --git a/settings/ajax/installapp.php b/settings/ajax/installapp.php
index 8831305e223e59bf15823dc389c790950c7945cc..75f3fea83b7315e893124a1fc21956852d4c0781 100644
--- a/settings/ajax/installapp.php
+++ b/settings/ajax/installapp.php
@@ -29,14 +29,15 @@ if (!array_key_exists('appid', $_POST)) {
exit;
}
+$app = new OC_App();
$appId = (string)$_POST['appid'];
$appId = OC_App::cleanAppId($appId);
-
-$result = OC_App::installApp($appId);
+$result = $app->installApp(
+ $appId,
+ \OC::$server->getConfig(),
+ \OC::$server->getL10N('core')
+);
if($result !== false) {
- // FIXME: Clear the cache - move that into some sane helper method
- \OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-0');
- \OC::$server->getMemCacheFactory()->create('settings')->remove('listApps-1');
OC_JSON::success(array('data' => array('appid' => $appId)));
} else {
$l = \OC::$server->getL10N('settings');
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 47ecac26cf1aa62803e529daa4dada6f9fb1991b..3020f82857742b6c123d221b71efd79c858409bf 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -35,23 +35,18 @@ if (!array_key_exists('appid', $_POST)) {
}
$appId = (string)$_POST['appid'];
-
-if (!is_numeric($appId)) {
- $appId = \OC::$server->getAppConfig()->getValue($appId, 'ocsid', null);
- if ($appId === null) {
- OCP\JSON::error(array(
- 'message' => 'No OCS-ID found for app!'
- ));
- exit;
- }
-}
-
$appId = OC_App::cleanAppId($appId);
$config = \OC::$server->getConfig();
$config->setSystemValue('maintenance', true);
try {
- $result = \OC\Installer::updateAppByOCSId($appId);
+ $installer = new \OC\Installer(
+ \OC::$server->getAppFetcher(),
+ \OC::$server->getHTTPClientService(),
+ \OC::$server->getTempManager(),
+ \OC::$server->getLogger()
+ );
+ $result = $installer->updateAppstoreApp($appId);
$config->setSystemValue('maintenance', false);
} catch(Exception $ex) {
$config->setSystemValue('maintenance', false);
diff --git a/settings/css/settings.css b/settings/css/settings.css
index ffc17c20a8b445ebcee41bd231f15bcaedef9f6c..7d139a632d0afefad25c7a1523b54885fa85d736 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -415,17 +415,6 @@ span.version {
background-position: 5px center;
padding-left: 25px;
}
-.app-level .approved {
- border-color: #0082c9;
-}
-.app-level .experimental {
- background-color: #ce3702;
- border-color: #ce3702;
- color: #fff;
-}
-.apps-experimental {
- color: #ce3702;
-}
.app-score {
position: relative;
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 5fc366c492149bc784a2cdc11464887cc7565b06..654756af5314e4d006836f7d7aa3c330798f36e6 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -2,7 +2,7 @@
Handlebars.registerHelper('score', function() {
if(this.score) {
- var score = Math.round( this.score / 10 );
+ var score = Math.round( this.score * 10 );
var imageName = 'rating/s' + score + '.svg';
return new Handlebars.SafeString('<img src="' + OC.imagePath('core', imageName) + '">');
@@ -13,10 +13,6 @@ Handlebars.registerHelper('level', function() {
if(typeof this.level !== 'undefined') {
if(this.level === 200) {
return new Handlebars.SafeString('<span class="official icon-checkmark">' + t('settings', 'Official') + '</span>');
- } else if(this.level === 100) {
- return new Handlebars.SafeString('<span class="approved">' + t('settings', 'Approved') + '</span>');
- } else {
- return new Handlebars.SafeString('<span class="experimental">' + t('settings', 'Experimental') + '</span>');
}
}
});
@@ -211,7 +207,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
currentImage.onload = function() {
page.find('.app-image')
- .append(OC.Settings.Apps.imageUrl(app.preview, app.detailpage))
+ .append(OC.Settings.Apps.imageUrl(app.preview, app.fromAppStore))
.fadeIn();
};
}
@@ -248,7 +244,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
var img = '<svg width="72" height="72" viewBox="0 0 72 72">';
if (appfromstore) {
- img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon" /></svg>';
+ img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '" class="app-icon" /></svg>';
} else {
img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon"></image></svg>';
}
diff --git a/settings/routes.php b/settings/routes.php
index 64c4e549681f9d4164aefdcb290e29c3055d2ffa..829474ce2bba238da27a52fc83bf1e72dd340714 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -49,7 +49,6 @@ $application->registerRoutes($this, [
['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
- ['name' => 'AppSettings#changeExperimentalConfigState', 'url' => '/settings/apps/experimental', 'verb' => 'POST'],
['name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'],
['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
['name' => 'Users#setMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 46fd5bd0e40d87a563d50a1bec7b5255e4924185..36064f0981cb1c99e8bcaad60bc1dd074f4f0ed0 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -30,15 +30,6 @@ script(
</script>
<script id="app-template" type="text/x-handlebars">
- {{#if firstExperimental}}
- <div class="section apps-experimental">
- <h2><?php p($l->t('Experimental applications ahead')) ?></h2>
- <p>
- <?php p($l->t('Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches.')) ?>
- </p>
- </div>
- {{/if}}
-
<div class="section" id="app-{{id}}">
{{#if preview}}
<div class="app-image{{#if previewAsIcon}} app-image-icon{{/if}} hidden">
@@ -160,16 +151,6 @@ script(
<div id="app-settings-header">
<button class="settings-button" data-apps-slide-toggle="#app-settings-content"></button>
</div>
-
- <div id="app-settings-content" class="apps-experimental">
- <input type="checkbox" id="enable-experimental-apps" <?php if($_['experimentalEnabled']) { print_unescaped('checked="checked"'); }?> class="checkbox">
- <label for="enable-experimental-apps"><?php p($l->t('Enable experimental apps')) ?></label>
- <p>
- <small>
- <?php p($l->t('Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches.')) ?>
- </small>
- </p>
- </div>
</div>
</div>
<div id="app-content">
diff --git a/tests/Settings/Controller/AppSettingsControllerTest.php b/tests/Settings/Controller/AppSettingsControllerTest.php
index 9dcc55e135bfd0db11168b0c35aa11be6abaa10e..a3e4a6fd8285f3de484f0b6447c90a78a385af6a 100644
--- a/tests/Settings/Controller/AppSettingsControllerTest.php
+++ b/tests/Settings/Controller/AppSettingsControllerTest.php
@@ -2,6 +2,7 @@
/**
* @author Lukas Reschke <lukas@owncloud.com>
*
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
@@ -21,18 +22,19 @@
namespace Tests\Settings\Controller;
+use OC\App\AppStore\Fetcher\AppFetcher;
+use OC\App\AppStore\Fetcher\CategoryFetcher;
use OC\Settings\Controller\AppSettingsController;
use OCP\AppFramework\Http\ContentSecurityPolicy;
-use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\TemplateResponse;
+use OCP\L10N\IFactory;
use Test\TestCase;
use OCP\IRequest;
use OCP\IL10N;
use OCP\IConfig;
-use OCP\ICache;
use OCP\INavigationManager;
use OCP\App\IAppManager;
-use OC\OCSClient;
/**
* Class AppSettingsControllerTest
@@ -42,95 +44,53 @@ use OC\OCSClient;
class AppSettingsControllerTest extends TestCase {
/** @var AppSettingsController */
private $appSettingsController;
- /** @var IRequest */
+ /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
private $request;
- /** @var IL10N */
+ /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
private $l10n;
- /** @var IConfig */
+ /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
private $config;
- /** @var ICache */
- private $cache;
- /** @var INavigationManager */
+ /** @var INavigationManager|\PHPUnit_Framework_MockObject_MockObject */
private $navigationManager;
- /** @var IAppManager */
+ /** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */
private $appManager;
- /** @var OCSClient */
- private $ocsClient;
+ /** @var CategoryFetcher|\PHPUnit_Framework_MockObject_MockObject */
+ private $categoryFetcher;
+ /** @var AppFetcher|\PHPUnit_Framework_MockObject_MockObject */
+ private $appFetcher;
+ /** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */
+ private $l10nFactory;
public function setUp() {
parent::setUp();
- $this->request = $this->getMockBuilder('\OCP\IRequest')
- ->disableOriginalConstructor()->getMock();
- $this->l10n = $this->getMockBuilder('\OCP\IL10N')
- ->disableOriginalConstructor()->getMock();
+ $this->request = $this->createMock(IRequest::class);
+ $this->l10n = $this->createMock(IL10N::class);
$this->l10n->expects($this->any())
->method('t')
->will($this->returnArgument(0));
- $this->config = $this->getMockBuilder('\OCP\IConfig')
- ->disableOriginalConstructor()->getMock();
- $cacheFactory = $this->getMockBuilder('\OCP\ICacheFactory')
- ->disableOriginalConstructor()->getMock();
- $this->cache = $this->getMockBuilder('\OCP\ICache')
- ->disableOriginalConstructor()->getMock();
- $cacheFactory
- ->expects($this->once())
- ->method('create')
- ->with('settings')
- ->will($this->returnValue($this->cache));
-
- $this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')
- ->disableOriginalConstructor()->getMock();
- $this->appManager = $this->getMockBuilder('\OCP\App\IAppManager')
- ->disableOriginalConstructor()->getMock();
- $this->ocsClient = $this->getMockBuilder('\OC\OCSClient')
- ->disableOriginalConstructor()->getMock();
+ $this->config = $this->createMock(IConfig::class);
+ $this->navigationManager = $this->createMock(INavigationManager::class);
+ $this->appManager = $this->createMock(IAppManager::class);
+ $this->categoryFetcher = $this->createMock(CategoryFetcher::class);
+ $this->appFetcher = $this->createMock(AppFetcher::class);
+ $this->l10nFactory = $this->createMock(IFactory::class);
$this->appSettingsController = new AppSettingsController(
'settings',
$this->request,
$this->l10n,
$this->config,
- $cacheFactory,
$this->navigationManager,
$this->appManager,
- $this->ocsClient
+ $this->categoryFetcher,
+ $this->appFetcher,
+ $this->l10nFactory
);
}
- public function testChangeExperimentalConfigStateTrue() {
- $this->config
- ->expects($this->once())
- ->method('setSystemValue')
- ->with('appstore.experimental.enabled', true);
- $this->appManager
- ->expects($this->once())
- ->method('clearAppsCache');
- $this->assertEquals(new DataResponse(), $this->appSettingsController->changeExperimentalConfigState(true));
- }
-
- public function testChangeExperimentalConfigStateFalse() {
- $this->config
- ->expects($this->once())
- ->method('setSystemValue')
- ->with('appstore.experimental.enabled', false);
- $this->appManager
- ->expects($this->once())
- ->method('clearAppsCache');
- $this->assertEquals(new DataResponse(), $this->appSettingsController->changeExperimentalConfigState(false));
- }
-
- public function testListCategoriesCached() {
- $this->cache
- ->expects($this->exactly(2))
- ->method('get')
- ->with('listCategories')
- ->will($this->returnValue(['CachedArray']));
- $this->assertSame(['CachedArray'], $this->appSettingsController->listCategories());
- }
-
- public function testListCategoriesNotCachedWithoutAppStore() {
- $expected = [
+ public function testListCategories() {
+ $expected = new JSONResponse([
[
'id' => 0,
'ident' => 'enabled',
@@ -141,115 +101,69 @@ class AppSettingsControllerTest extends TestCase {
'ident' => 'disabled',
'displayName' => 'Not enabled',
],
- ];
- $this->cache
- ->expects($this->once())
- ->method('get')
- ->with('listCategories')
- ->will($this->returnValue(null));
- $this->cache
- ->expects($this->once())
- ->method('set')
- ->with('listCategories', $expected, 3600);
-
-
- $this->assertSame($expected, $this->appSettingsController->listCategories());
- }
-
- public function testListCategoriesNotCachedWithAppStore() {
- $expected = [
[
- 'id' => 0,
- 'ident' => 'enabled',
- 'displayName' => 'Enabled',
+ 'id' => 'auth',
+ 'ident' => 'auth',
+ 'displayName' => 'Authentication & authorization',
],
[
- 'id' => 1,
- 'ident' => 'disabled',
- 'displayName' => 'Not enabled',
+ 'id' => 'customization',
+ 'ident' => 'customization',
+ 'displayName' => 'Customization',
],
[
- 'id' => 0,
- 'ident' => 'tools',
- 'displayName' => 'Tools',
+ 'id' => 'files',
+ 'ident' => 'files',
+ 'displayName' => 'Files',
],
[
- 'id' => 1,
- 'ident' => 'games',
- 'displayName' => 'Games',
+ 'id' => 'integration',
+ 'ident' => 'integration',
+ 'displayName' => 'Integration',
],
[
- 'id' => 2,
- 'ident' => 'productivity',
- 'displayName' => 'Productivity',
+ 'id' => 'monitoring',
+ 'ident' => 'monitoring',
+ 'displayName' => 'Monitoring',
],
[
- 'id' => 3,
+ 'id' => 'multimedia',
'ident' => 'multimedia',
'displayName' => 'Multimedia',
],
- ];
+ [
+ 'id' => 'office',
+ 'ident' => 'office',
+ 'displayName' => 'Office & text',
+ ],
+ [
+ 'id' => 'organization',
+ 'ident' => 'organization',
+ 'displayName' => 'Organization',
+ ],
+ [
+ 'id' => 'social',
+ 'ident' => 'social',
+ 'displayName' => 'Social & communication',
+ ],
+ [
+ 'id' => 'tools',
+ 'ident' => 'tools',
+ 'displayName' => 'Tools',
+ ],
+ ]);
- $this->cache
+ $this->categoryFetcher
->expects($this->once())
->method('get')
- ->with('listCategories')
- ->will($this->returnValue(null));
- $this->cache
- ->expects($this->once())
- ->method('set')
- ->with('listCategories', $expected, 3600);
-
- $this->ocsClient
- ->expects($this->once())
- ->method('isAppStoreEnabled')
- ->will($this->returnValue(true));
- $this->ocsClient
- ->expects($this->once())
- ->method('getCategories')
- ->will($this->returnValue(
- [
- 'ownCloud Tools',
- 'Games',
- 'ownCloud Productivity',
- 'Multimedia',
- ]
- ));
+ ->willReturn(json_decode('[{"id":"auth","translations":{"cs":{"name":"Autentizace & autorizace","description":"Aplikace poskytujÃcà služby dodateÄného ověřenà nebo pÅ™ihlášenÃ"},"hu":{"name":"AzonosÃtás és hitelesÃtés","description":"Apps that provide additional authentication or authorization services"},"de":{"name":"Authentifizierung & Authorisierung","description":"Apps die zusätzliche Autentifizierungs- oder Autorisierungsdienste bereitstellen"},"nl":{"name":"Authenticatie & authorisatie","description":"Apps die aanvullende authenticatie- en autorisatiediensten bieden"},"nb":{"name":"PÃ¥logging og tilgangsstyring","description":"Apper for Ã¥ tilby ekstra pÃ¥logging eller tilgangsstyring"},"it":{"name":"Autenticazione e autorizzazione","description":"Apps that provide additional authentication or authorization services"},"fr":{"name":"Authentification et autorisations","description":"Applications qui fournissent des services d\'authentification ou d\'autorisations additionnels."},"ru":{"name":"ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¸ авторизациÑ","description":"Apps that provide additional authentication or authorization services"},"en":{"name":"Authentication & authorization","description":"Apps that provide additional authentication or authorization services"}}},{"id":"customization","translations":{"cs":{"name":"PÅ™izpůsobenÃ","description":"Motivy a aplikace mÄ›nÃcà rozvrženà a uživatelské rozhranÃ"},"it":{"name":"Personalizzazione","description":"Applicazioni di temi, modifiche della disposizione e UX"},"de":{"name":"Anpassung","description":"Apps zur Änderung von Themen, Layout und Benutzererfahrung"},"hu":{"name":"Személyre szabás","description":"Témák, elrendezések felhasználói felület módosÃtó alkalmazások"},"nl":{"name":"Maatwerk","description":"Thema\'s, layout en UX aanpassingsapps"},"nb":{"name":"Tilpasning","description":"Apper for Ã¥ endre Tema, utseende og brukeropplevelse"},"fr":{"name":"Personalisation","description":"Thèmes, apparence et applications modifiant l\'expérience utilisateur"},"ru":{"name":"ÐаÑтройка","description":"Themes, layout and UX change apps"},"en":{"name":"Customization","description":"Themes, layout and UX change apps"}}},{"id":"files","translations":{"cs":{"name":"Soubory","description":"Aplikace rozÅ¡iÅ™ujÃcà správu souborů nebo aplikaci Soubory"},"it":{"name":"File","description":"Applicazioni di gestione dei file ed estensione dell\'applicazione FIle"},"de":{"name":"Dateien","description":"Dateimanagement sowie Erweiterungs-Apps für die Dateien-App"},"hu":{"name":"Fájlok","description":"Fájl kezelÅ‘ és kiegészÃtÅ‘ alkalmazások"},"nl":{"name":"Bestanden","description":"Bestandebeheer en uitbreidingen van bestand apps"},"nb":{"name":"Filer","description":"Apper for filhÃ¥ndtering og filer"},"fr":{"name":"Fichiers","description":"Applications de gestion de fichiers et extensions à l\'application Fichiers"},"ru":{"name":"Файлы","description":"РаÑширение: файлы и управление файлами"},"en":{"name":"Files","description":"File management and Files app extension apps"}}},{"id":"integration","translations":{"it":{"name":"Integrazione","description":"Applicazioni che collegano Nextcloud con altri servizi e piattaforme"},"hu":{"name":"Integráció","description":"Apps that connect Nextcloud with other services and platforms"},"nl":{"name":"Integratie","description":"Apps die Nextcloud verbinden met andere services en platformen"},"nb":{"name":"Integrasjon","description":"Apper som kobler Nextcloud med andre tjenester og plattformer"},"de":{"name":"Integration","description":"Apps die Nextcloud mit anderen Diensten und Plattformen verbinden"},"cs":{"name":"PropojenÃ","description":"Aplikace propojujÃcà NextCloud s dalÅ¡Ãmi službami a platformami"},"fr":{"name":"Intégration","description":"Applications qui connectent Nextcloud avec d\'autres services et plateformes"},"ru":{"name":"ИнтеграциÑ","description":"ПриложениÑ, ÑоединÑющие Nextcloud Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ Ñлужбами и платформами"},"en":{"name":"Integration","description":"Apps that connect Nextcloud with other services and platforms"}}},{"id":"monitoring","translations":{"nb":{"name":"OvervÃ¥king","description":"Apper for statistikk, systemdiagnose og aktivitet"},"it":{"name":"Monitoraggio","description":"Applicazioni di statistiche, diagnostica di sistema e attività "},"de":{"name":"Ãœberwachung","description":"Datenstatistiken-, Systemdiagnose- und Aktivitäten-Apps"},"hu":{"name":"Megfigyelés","description":"Data statistics, system diagnostics and activity apps"},"nl":{"name":"Monitoren","description":"Gegevensstatistiek, systeem diagnose en activiteit apps"},"cs":{"name":"Kontrola","description":"Datové statistiky, diagnózy systému a aktivity aplikacÃ"},"fr":{"name":"Surveillance","description":"Applications de statistiques sur les données, de diagnostics systèmes et d\'activité."},"ru":{"name":"Мониторинг","description":"СтатиÑтика данных, диагноÑтика ÑиÑтемы и активноÑÑ‚ÑŒ приложений"},"en":{"name":"Monitoring","description":"Data statistics, system diagnostics and activity apps"}}},{"id":"multimedia","translations":{"nb":{"name":"Multimedia","description":"Apper for lyd, film og bilde"},"it":{"name":"Multimedia","description":"Applicazioni per audio, video e immagini"},"de":{"name":"Multimedia","description":"Audio-, Video- und Bilder-Apps"},"hu":{"name":"Multimédia","description":"Hang, videó és kép alkalmazások"},"nl":{"name":"Multimedia","description":"Audio, video en afbeelding apps"},"en":{"name":"Multimedia","description":"Audio, video and picture apps"},"cs":{"name":"Multimédia","description":"Aplikace audia, videa a obrázků"},"fr":{"name":"Multimédia","description":"Applications audio, vidéo et image"},"ru":{"name":"Мультимедиа","description":"Приложение аудио, видео и изображениÑ"}}},{"id":"office","translations":{"nb":{"name":"Kontorstøtte og tekst","description":"Apper for Kontorstøtte og tekstbehandling"},"it":{"name":"Ufficio e testo","description":"Applicazione per ufficio ed elaborazione di testi"},"de":{"name":"Büro & Text","description":"Büro- und Textverarbeitungs-Apps"},"hu":{"name":"Iroda és szöveg","description":"Irodai és szöveg feldolgozó alkalmazások"},"nl":{"name":"Office & tekst","description":"Office en tekstverwerkingsapps"},"cs":{"name":"Kancelář a text","description":"Aplikace pro kancelář a zpracovánà textu"},"fr":{"name":"Bureautique & texte","description":"Applications de bureautique et de traitement de texte"},"en":{"name":"Office & text","description":"Office and text processing apps"}}},{"id":"organization","translations":{"nb":{"name":"Organisering","description":"Apper for tidsstyring, oppgaveliste og kalender"},"it":{"name":"Organizzazione","description":"Applicazioni di gestione del tempo, elenco delle cose da fare e calendario"},"hu":{"name":"Szervezet","description":"IdÅ‘beosztás, teendÅ‘ lista és naptár alkalmazások"},"nl":{"name":"Organisatie","description":"Tijdmanagement, takenlijsten en agenda apps"},"cs":{"name":"Organizace","description":"Aplikace pro správu Äasu, plánovánà a kalendáře"},"de":{"name":"Organisation","description":"Time management, Todo list and calendar apps"},"fr":{"name":"Organisation","description":"Applications de gestion du temps, de listes de tâches et d\'agendas"},"ru":{"name":"ОрганизациÑ","description":"ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ управлению временем, ÑпиÑок задач и календарь"},"en":{"name":"Organization","description":"Time management, Todo list and calendar apps"}}},{"id":"social","translations":{"nb":{"name":"Sosialt og kommunikasjon","description":"Apper for meldinger, kontakthÃ¥ndtering og sosiale medier"},"it":{"name":"Sociale e comunicazione","description":"Applicazioni di messaggistica, gestione dei contatti e reti sociali"},"de":{"name":"Kommunikation","description":"Nachrichten-, Kontaktverwaltungs- und Social-Media-Apps"},"hu":{"name":"Közösségi és kommunikáció","description":"ÃœzenetküldÅ‘, kapcsolat kezelÅ‘ és közösségi média alkalmazások"},"nl":{"name":"Sociaal & communicatie","description":"Messaging, contactbeheer en social media apps"},"cs":{"name":"Sociálnà sÃtÄ› a komunikace","description":"Aplikace pro zasÃlánà zpráv, správu kontaktů a sociálnà sÃtÄ›"},"fr":{"name":"Social & communication","description":"Applications de messagerie, de gestion de contacts et de réseaux sociaux"},"ru":{"name":"Социальное и ÑвÑзь","description":"Общение, управление контактами и Ñоциальное медиа-приложение"},"en":{"name":"Social & communication","description":"Messaging, contact management and social media apps"}}},{"id":"tools","translations":{"nb":{"name":"Verktøy","description":"Alt annet"},"it":{"name":"Strumenti","description":"Tutto il resto"},"hu":{"name":"Eszközök","description":"Minden más"},"nl":{"name":"Tools","description":"De rest"},"de":{"name":"Werkzeuge","description":"Alles Andere"},"en":{"name":"Tools","description":"Everything else"},"cs":{"name":"Nástroje","description":"VÅ¡e ostatnÃ"},"fr":{"name":"Outils","description":"Tout le reste"},"ru":{"name":"ПриложениÑ","description":"Что-то еще"}}}]', true));
- $this->assertSame($expected, $this->appSettingsController->listCategories());
+ $this->assertEquals($expected, $this->appSettingsController->listCategories());
}
public function testViewApps() {
$this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstore.experimental.enabled', false);
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->navigationManager
->expects($this->once())
- ->method('setActiveEntry')
- ->with('core_apps');
-
- $policy = new ContentSecurityPolicy();
- $policy->addAllowedImageDomain('https://apps.owncloud.com');
-
- $expected = new TemplateResponse('settings', 'apps', ['experimentalEnabled' => false, 'category' => 'enabled', 'appstoreEnabled' => true], 'user');
- $expected->setContentSecurityPolicy($policy);
-
- $this->assertEquals($expected, $this->appSettingsController->viewApps());
- }
-
- public function testViewAppsNotEnabled() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstore.experimental.enabled', false);
- $this->config
- ->expects($this->at(1))
->method('getSystemValue')
->with('appstoreenabled', true)
->will($this->returnValue(true));
@@ -259,21 +173,17 @@ class AppSettingsControllerTest extends TestCase {
->with('core_apps');
$policy = new ContentSecurityPolicy();
- $policy->addAllowedImageDomain('https://apps.owncloud.com');
+ $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
- $expected = new TemplateResponse('settings', 'apps', ['experimentalEnabled' => false, 'category' => 'disabled', 'appstoreEnabled' => true], 'user');
+ $expected = new TemplateResponse('settings', 'apps', ['category' => 'enabled', 'appstoreEnabled' => true], 'user');
$expected->setContentSecurityPolicy($policy);
- $this->assertEquals($expected, $this->appSettingsController->viewApps('disabled'));
+ $this->assertEquals($expected, $this->appSettingsController->viewApps());
}
public function testViewAppsAppstoreNotEnabled() {
$this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstore.experimental.enabled', false);
- $this->config
- ->expects($this->at(1))
+ ->expects($this->once())
->method('getSystemValue')
->with('appstoreenabled', true)
->will($this->returnValue(false));
@@ -283,9 +193,9 @@ class AppSettingsControllerTest extends TestCase {
->with('core_apps');
$policy = new ContentSecurityPolicy();
- $policy->addAllowedImageDomain('https://apps.owncloud.com');
+ $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
- $expected = new TemplateResponse('settings', 'apps', ['experimentalEnabled' => false, 'category' => 'enabled', 'appstoreEnabled' => false], 'user');
+ $expected = new TemplateResponse('settings', 'apps', ['category' => 'enabled', 'appstoreEnabled' => false], 'user');
$expected->setContentSecurityPolicy($policy);
$this->assertEquals($expected, $this->appSettingsController->viewApps());
diff --git a/tests/data/testapp.tar.gz b/tests/data/testapp.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b9184c8c378ccb7b3b170b337db4581078811b0c
Binary files /dev/null and b/tests/data/testapp.tar.gz differ
diff --git a/tests/data/testapp1.tar.gz b/tests/data/testapp1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..f864edb2a6d7fd64b9522ba7520deb97354d1477
Binary files /dev/null and b/tests/data/testapp1.tar.gz differ
diff --git a/tests/enable_all.php b/tests/enable_all.php
index afea5c89665a793fc57fa53f76dd0caa75e73af2..655597be7c8d0a7caeb5693936598439a5582e15 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -10,7 +10,7 @@ require_once __DIR__.'/../lib/base.php';
function enableApp($app) {
try {
- OC_App::enable($app);
+ (new \OC_App())->enable($app);
} catch (Exception $e) {
echo $e;
}
diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b0418a7ebafdc3f97ff12b16506db6e2bfc26e4
--- /dev/null
+++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\App\AppStore\Fetcher;
+
+use OC\App\AppStore\Fetcher\AppFetcher;
+
+class AppFetcherTest extends FetcherBase {
+ public function setUp() {
+ parent::setUp();
+ $this->fileName = 'apps.json';
+ $this->endpoint = 'https://apps.nextcloud.com/api/v1/platform/9.2.0/apps.json';
+
+ $this->fetcher = new AppFetcher(
+ $this->appData,
+ $this->clientService,
+ $this->timeFactory,
+ $this->config
+ );
+ }
+}
diff --git a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..db4354119a0d958c4657ecb7f8b103d986c1fc45
--- /dev/null
+++ b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\App\AppStore\Fetcher;
+
+use OC\App\AppStore\Fetcher\CategoryFetcher;
+
+class CategoryFetcherTest extends FetcherBase {
+ public function setUp() {
+ parent::setUp();
+ $this->fileName = 'categories.json';
+ $this->endpoint = 'https://apps.nextcloud.com/api/v1/categories.json';
+
+ $this->fetcher = new CategoryFetcher(
+ $this->appData,
+ $this->clientService,
+ $this->timeFactory
+ );
+ }
+}
diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
new file mode 100644
index 0000000000000000000000000000000000000000..66df81f1b2e7f5922df949146c468138760f3aca
--- /dev/null
+++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\App\AppStore\Fetcher;
+
+use OC\App\AppStore\Fetcher\AppFetcher;
+use OC\App\AppStore\Fetcher\Fetcher;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\IAppData;
+use OCP\Files\NotFoundException;
+use OCP\Files\SimpleFS\ISimpleFile;
+use OCP\Files\SimpleFS\ISimpleFolder;
+use OCP\Http\Client\IClient;
+use OCP\Http\Client\IClientService;
+use OCP\Http\Client\IResponse;
+use OCP\IConfig;
+use Test\TestCase;
+
+abstract class FetcherBase extends TestCase {
+ /** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */
+ protected $appData;
+ /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */
+ protected $clientService;
+ /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */
+ protected $timeFactory;
+ /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+ protected $config;
+ /** @var Fetcher */
+ protected $fetcher;
+ /** @var string */
+ protected $fileName;
+ /** @var string */
+ protected $endpoint;
+
+ public function setUp() {
+ parent::setUp();
+ $this->appData = $this->createMock(IAppData::class);
+ $this->clientService = $this->createMock(IClientService::class);
+ $this->timeFactory = $this->createMock(ITimeFactory::class);
+ $this->config = $this->createMock(IConfig::class);
+ }
+
+ public function testGetWithAlreadyExistingFileAndUpToDateTimestamp() {
+ $folder = $this->createMock(ISimpleFolder::class);
+ $file = $this->createMock(ISimpleFile::class);
+ $this->appData
+ ->expects($this->once())
+ ->method('getFolder')
+ ->with('/')
+ ->willReturn($folder);
+ $folder
+ ->expects($this->once())
+ ->method('getFile')
+ ->with($this->fileName)
+ ->willReturn($file);
+ $file
+ ->expects($this->once())
+ ->method('getContent')
+ ->willReturn('{"timestamp":1200,"data":[{"id":"MyApp"}]}');
+ $this->timeFactory
+ ->expects($this->once())
+ ->method('getTime')
+ ->willReturn(1499);
+
+ $expected = [
+ [
+ 'id' => 'MyApp',
+ ],
+ ];
+ $this->assertSame($expected, $this->fetcher->get());
+ }
+
+ public function testGetWithNotExistingFileAndUpToDateTimestamp() {
+ $folder = $this->createMock(ISimpleFolder::class);
+ $file = $this->createMock(ISimpleFile::class);
+ $this->appData
+ ->expects($this->once())
+ ->method('getFolder')
+ ->with('/')
+ ->willReturn($folder);
+ $folder
+ ->expects($this->at(0))
+ ->method('getFile')
+ ->with($this->fileName)
+ ->willThrowException(new NotFoundException());
+ $folder
+ ->expects($this->at(1))
+ ->method('newFile')
+ ->with($this->fileName)
+ ->willReturn($file);
+ $client = $this->createMock(IClient::class);
+ $this->clientService
+ ->expects($this->once())
+ ->method('newClient')
+ ->willReturn($client);
+ $response = $this->createMock(IResponse::class);
+ $client
+ ->expects($this->once())
+ ->method('get')
+ ->with($this->endpoint)
+ ->willReturn($response);
+ $response
+ ->expects($this->once())
+ ->method('getBody')
+ ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+ $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502}';
+ $file
+ ->expects($this->at(0))
+ ->method('putContent')
+ ->with($fileData);
+ $file
+ ->expects($this->at(1))
+ ->method('getContent')
+ ->willReturn($fileData);
+ $this->timeFactory
+ ->expects($this->at(0))
+ ->method('getTime')
+ ->willReturn(1502);
+
+ $expected = [
+ [
+ 'id' => 'MyNewApp',
+ 'foo' => 'foo',
+ ],
+ [
+ 'id' => 'bar',
+ ],
+ ];
+ $this->assertSame($expected, $this->fetcher->get());
+ }
+
+ public function testGetWithAlreadyExistingFileAndOutdatedTimestamp() {
+ $folder = $this->createMock(ISimpleFolder::class);
+ $file = $this->createMock(ISimpleFile::class);
+ $this->appData
+ ->expects($this->once())
+ ->method('getFolder')
+ ->with('/')
+ ->willReturn($folder);
+ $folder
+ ->expects($this->once())
+ ->method('getFile')
+ ->with($this->fileName)
+ ->willReturn($file);
+ $file
+ ->expects($this->at(0))
+ ->method('getContent')
+ ->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}');
+ $this->timeFactory
+ ->expects($this->at(0))
+ ->method('getTime')
+ ->willReturn(1501);
+ $client = $this->createMock(IClient::class);
+ $this->clientService
+ ->expects($this->once())
+ ->method('newClient')
+ ->willReturn($client);
+ $response = $this->createMock(IResponse::class);
+ $client
+ ->expects($this->once())
+ ->method('get')
+ ->with($this->endpoint)
+ ->willReturn($response);
+ $response
+ ->expects($this->once())
+ ->method('getBody')
+ ->willReturn('[{"id":"MyNewApp", "foo": "foo"}, {"id":"bar"}]');
+ $fileData = '{"data":[{"id":"MyNewApp","foo":"foo"},{"id":"bar"}],"timestamp":1502}';
+ $file
+ ->expects($this->at(1))
+ ->method('putContent')
+ ->with($fileData);
+ $file
+ ->expects($this->at(2))
+ ->method('getContent')
+ ->willReturn($fileData);
+ $this->timeFactory
+ ->expects($this->at(1))
+ ->method('getTime')
+ ->willReturn(1502);
+
+ $expected = [
+ [
+ 'id' => 'MyNewApp',
+ 'foo' => 'foo',
+ ],
+ [
+ 'id' => 'bar',
+ ],
+ ];
+ $this->assertSame($expected, $this->fetcher->get());
+ }
+
+ public function testGetWithExceptionInClient() {
+ $folder = $this->createMock(ISimpleFolder::class);
+ $file = $this->createMock(ISimpleFile::class);
+ $this->appData
+ ->expects($this->once())
+ ->method('getFolder')
+ ->with('/')
+ ->willReturn($folder);
+ $folder
+ ->expects($this->once())
+ ->method('getFile')
+ ->with($this->fileName)
+ ->willReturn($file);
+ $file
+ ->expects($this->at(0))
+ ->method('getContent')
+ ->willReturn('{"timestamp":1200,"data":{"MyApp":{"id":"MyApp"}}}');
+ $this->timeFactory
+ ->expects($this->at(0))
+ ->method('getTime')
+ ->willReturn(1501);
+ $client = $this->createMock(IClient::class);
+ $this->clientService
+ ->expects($this->once())
+ ->method('newClient')
+ ->willReturn($client);
+ $client
+ ->expects($this->once())
+ ->method('get')
+ ->with($this->endpoint)
+ ->willThrowException(new \Exception());
+
+ $this->assertSame([], $this->fetcher->get());
+ }
+}
diff --git a/tests/lib/App/AppStore/Version/VersionParserTest.php b/tests/lib/App/AppStore/Version/VersionParserTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ebfa98ade3918e5ebc1f1ff5598e17fdb0a46afb
--- /dev/null
+++ b/tests/lib/App/AppStore/Version/VersionParserTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\App\AppStore\Version;
+
+use OC\App\AppStore\Version\Version;
+use OC\App\AppStore\Version\VersionParser;
+use Test\TestCase;
+
+class VersionParserTest extends TestCase {
+ /** @var VersionParser */
+ private $versionParser;
+
+ public function setUp() {
+ parent::setUp();
+ $this->versionParser = new VersionParser();
+ }
+
+ /**
+ * @return array
+ */
+ public function versionProvider() {
+ return [
+ [
+ '*',
+ new Version('', ''),
+ ],
+ [
+ '<=8.1.2',
+ new Version('', '8.1.2'),
+ ],
+ [
+ '<=9',
+ new Version('', '9'),
+ ],
+ [
+ '>=9.3.2',
+ new Version('9.3.2', ''),
+ ],
+ [
+ '>=8.1.2 <=9.3.2',
+ new Version('8.1.2', '9.3.2'),
+ ],
+ [
+ '>=8.2 <=9.1',
+ new Version('8.2', '9.1'),
+ ],
+ [
+ '>=9 <=11',
+ new Version('9', '11'),
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider versionProvider
+ *
+ * @param string $input
+ * @param Version $expected
+ */
+ public function testGetVersion($input,
+ Version $expected) {
+ $this->assertEquals($expected, $this->versionParser->getVersion($input));
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Version cannot be parsed: BogusVersion
+ */
+ public function testGetVersionException() {
+ $this->versionParser->getVersion('BogusVersion');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Version cannot be parsed: >=8.2 <=9.1a
+ */
+ public function testGetVersionExceptionWithMultiple() {
+ $this->versionParser->getVersion('>=8.2 <=9.1a');
+ }
+}
diff --git a/tests/lib/App/AppStore/Version/VersionTest.php b/tests/lib/App/AppStore/Version/VersionTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..969c96a57a8c65d877d82211205412d360ce10d2
--- /dev/null
+++ b/tests/lib/App/AppStore/Version/VersionTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\App\AppStore\Version;
+
+use OC\App\AppStore\Version\Version;
+use Test\TestCase;
+
+class VersionTest extends TestCase {
+ public function testGetMinimumVersion() {
+ $version = new Version('9', '10');
+ $this->assertSame('9', $version->getMinimumVersion());
+ }
+
+ public function testGetMaximumVersion() {
+ $version = new Version('9', '10');
+ $this->assertSame('10', $version->getMaximumVersion());
+ }
+}
diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php
index c41829b796b3b3ebd5cc8d644c9d51818bedcec6..fd44954eaf4aef15f1ea7aea5c9a39a704e495f2 100644
--- a/tests/lib/App/DependencyAnalyzerTest.php
+++ b/tests/lib/App/DependencyAnalyzerTest.php
@@ -1,9 +1,10 @@
<?php
-
/**
* @author Thomas Müller
+ * @author Lukas Reschke
* @copyright 2014 Thomas Müller deepdiver@owncloud.com
- * later.
+ * @copyright 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
* See the COPYING-README file.
*/
@@ -187,7 +188,7 @@ class DependencyAnalyzerTest extends TestCase {
'dependencies' => array()
);
if (!is_null($oc)) {
- $app['dependencies']['owncloud'] = $oc;
+ $app['dependencies'] = $oc;
}
$missing = $this->analyser->analyze($app);
@@ -200,18 +201,216 @@ class DependencyAnalyzerTest extends TestCase {
* @return array
*/
function providesOC() {
- return array(
+ return [
// no version -> no missing dependency
- array(array(), null),
- array(array(), array('@attributes' => array('min-version' => '8', 'max-version' => '8'))),
- array(array(), array('@attributes' => array('min-version' => '8.0', 'max-version' => '8.0'))),
- array(array(), array('@attributes' => array('min-version' => '8.0.2', 'max-version' => '8.0.2'))),
- array(array('Server version 8.0.3 or higher is required.'), array('@attributes' => array('min-version' => '8.0.3'))),
- array(array('Server version 9 or higher is required.'), array('@attributes' => array('min-version' => '9'))),
- array(array('Server version 10 or higher is required.'), array('@attributes' => array('min-version' => '9.1'))),
- array(array('Server version 11 or higher is required.'), array('@attributes' => array('min-version' => '9.2'))),
- [['Server version 8.0.1 or lower is required.'], ['@attributes' => ['max-version' => '8.0.1']]],
- );
+ [
+ [],
+ null,
+ ],
+ [
+ [],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '8',
+ 'max-version' => '8',
+ ],
+ ],
+ ],
+ ],
+ [
+ [],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '8.0',
+ 'max-version' => '8.0',
+ ],
+ ],
+ ],
+ ],
+ [
+ [],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '8.0.2',
+ 'max-version' => '8.0.2'
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 8.0.3 or higher is required.',
+ ],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '8.0.3'
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 9 or higher is required.',
+ ],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '9'
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 10 or higher is required.',
+ ],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '10'
+ ],
+ ],
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '9'
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 10 or higher is required.',
+ ],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '9.1',
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 11 or higher is required.',
+ ],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '9.2',
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 8.0.1 or lower is required.',
+ ],
+ [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'max-version' => '8.0.1',
+ ],
+ ],
+ ],
+ ],
+ [
+ [],
+ [
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '8',
+ 'max-version' => '8',
+ ],
+ ],
+ ],
+ ],
+ [
+ [],
+ [
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '8.0',
+ 'max-version' => '8.0',
+ ],
+ ],
+ ],
+ ],
+ [
+ [],
+ [
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '8.0.2',
+ 'max-version' => '8.0.2'
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 8.0.3 or higher is required.',
+ ],
+ [
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '8.0.3'
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 9 or higher is required.',
+ ],
+ [
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '9'
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 10 or higher is required.',
+ ],
+ [
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '9.1',
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 11 or higher is required.',
+ ],
+ [
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '9.2',
+ ],
+ ],
+ ],
+ ],
+ [
+ [
+ 'Server version 8.0.1 or lower is required.',
+ ],
+ [
+ 'owncloud' => [
+ '@attributes' => [
+ 'max-version' => '8.0.1',
+ ],
+ ],
+ ],
+ ],
+ ];
}
/**
diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php
index b7263adb78ba72a1c4d832d77fe983d693063817..971d86cf6a4807b5d872a56b97a00485a5f8fead 100644
--- a/tests/lib/AppTest.php
+++ b/tests/lib/AppTest.php
@@ -264,6 +264,40 @@ class AppTest extends \Test\TestCase {
),
true
),
+ [
+ '9.2.0.0',
+ [
+ 'dependencies' => [
+ 'owncloud' => [
+ '@attributes' => [
+ 'min-version' => '9.0',
+ 'max-version' => '9.1',
+ ],
+ ],
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '9.1',
+ 'max-version' => '9.2',
+ ],
+ ],
+ ],
+ ],
+ true
+ ],
+ [
+ '9.2.0.0',
+ [
+ 'dependencies' => [
+ 'nextcloud' => [
+ '@attributes' => [
+ 'min-version' => '9.1',
+ 'max-version' => '9.2',
+ ],
+ ],
+ ],
+ ],
+ true
+ ],
);
}
diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php
index e1c17b841a27f77ee970a5b0d1cc0c3dc8589cee..1212d3d75592bb7ffcc84c8bd6dc19b209db1f0c 100644
--- a/tests/lib/InstallerTest.php
+++ b/tests/lib/InstallerTest.php
@@ -9,91 +9,572 @@
namespace Test;
+use OC\App\AppStore\Fetcher\AppFetcher;
+use OC\Archive\ZIP;
use OC\Installer;
+use OCP\Http\Client\IClient;
+use OCP\Http\Client\IClientService;
+use OCP\ILogger;
+use OCP\ITempManager;
class InstallerTest extends TestCase {
private static $appid = 'testapp';
private $appstore;
+ /** @var AppFetcher|\PHPUnit_Framework_MockObject_MockObject */
+ private $appFetcher;
+ /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */
+ private $clientService;
+ /** @var ITempManager|\PHPUnit_Framework_MockObject_MockObject */
+ private $tempManager;
+ /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
+ private $logger;
+
+ /** @var Installer */
+ private $installer;
protected function setUp() {
parent::setUp();
+ $this->appFetcher = $this->createMock(AppFetcher::class);
+ $this->clientService = $this->createMock(IClientService::class);
+ $this->tempManager = $this->createMock(ITempManager::class);
+ $this->logger = $this->createMock(ILogger::class);
+ $this->installer = new Installer(
+ $this->appFetcher,
+ $this->clientService,
+ $this->tempManager,
+ $this->logger
+ );
+
$config = \OC::$server->getConfig();
$this->appstore = $config->setSystemValue('appstoreenabled', true);
$config->setSystemValue('appstoreenabled', true);
- Installer::removeApp(self::$appid);
+ $installer = new Installer(
+ \OC::$server->getAppFetcher(),
+ \OC::$server->getHTTPClientService(),
+ \OC::$server->getTempManager(),
+ \OC::$server->getLogger()
+ );
+ $installer->removeApp(self::$appid);
}
protected function tearDown() {
- Installer::removeApp(self::$appid);
+ $installer = new Installer(
+ \OC::$server->getAppFetcher(),
+ \OC::$server->getHTTPClientService(),
+ \OC::$server->getTempManager(),
+ \OC::$server->getLogger()
+ );
+ $installer->removeApp(self::$appid);
\OC::$server->getConfig()->setSystemValue('appstoreenabled', $this->appstore);
parent::tearDown();
}
public function testInstallApp() {
- $pathOfTestApp = __DIR__;
- $pathOfTestApp .= '/../data/';
- $pathOfTestApp .= 'testapp.zip';
-
- $tmp = \OC::$server->getTempManager()->getTemporaryFile('.zip');
- \OC_Helper::copyr($pathOfTestApp, $tmp);
-
- $data = array(
- 'path' => $tmp,
- 'source' => 'path',
- 'appdata' => [
- 'id' => 'Bar',
- 'level' => 100,
- ]
- );
+ // Extract app
+ $pathOfTestApp = __DIR__ . '/../data/testapp.zip';
+ $tar = new ZIP($pathOfTestApp);
+ $tar->extract(\OC_App::getInstallPath());
- Installer::installApp($data);
+ // Install app
+ $installer = new Installer(
+ \OC::$server->getAppFetcher(),
+ \OC::$server->getHTTPClientService(),
+ \OC::$server->getTempManager(),
+ \OC::$server->getLogger()
+ );
+ $installer->installApp(self::$appid);
$isInstalled = Installer::isInstalled(self::$appid);
-
$this->assertTrue($isInstalled);
+ $installer->removeApp(self::$appid);
}
- public function testUpdateApp() {
- $pathOfOldTestApp = __DIR__;
- $pathOfOldTestApp .= '/../data/';
- $pathOfOldTestApp .= 'testapp.zip';
-
- $oldTmp = \OC::$server->getTempManager()->getTemporaryFile('.zip');
- \OC_Helper::copyr($pathOfOldTestApp, $oldTmp);
-
- $oldData = array(
- 'path' => $oldTmp,
- 'source' => 'path',
- 'appdata' => [
- 'id' => 'Bar',
- 'level' => 100,
- ]
- );
+ public function updateArrayProvider() {
+ return [
+ // Update available
+ [
+ [
+ [
+ 'id' => 'files',
+ 'releases' => [
+ [
+ 'version' => '1111.0'
+ ],
+ ],
+ ],
+ ],
+ '1111.0',
+ ],
+ // No update available
+ [
+ [
+ [
+ 'id' => 'files',
+ 'releases' => [
+ [
+ 'version' => '1.0'
+ ],
+ ],
+ ],
+ ],
+ false,
+ ],
+ ];
+ }
- $pathOfNewTestApp = __DIR__;
- $pathOfNewTestApp .= '/../data/';
- $pathOfNewTestApp .= 'testapp2.zip';
+ /**
+ * @dataProvider updateArrayProvider
+ * @param array $appArray
+ * @param string|bool $updateAvailable
+ */
+ public function testIsUpdateAvailable(array $appArray, $updateAvailable) {
+ $this->appFetcher
+ ->expects($this->once())
+ ->method('get')
+ ->willReturn($appArray);
- $newTmp = \OC::$server->getTempManager()->getTemporaryFile('.zip');
- \OC_Helper::copyr($pathOfNewTestApp, $newTmp);
+ $this->assertSame($updateAvailable, Installer::isUpdateAvailable('files', $this->appFetcher));
+ }
- $newData = array(
- 'path' => $newTmp,
- 'source' => 'path',
- 'appdata' => [
- 'id' => 'Bar',
- 'level' => 100,
- ]
- );
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Certificate "4112" has been revoked
+ */
+ public function testDownloadAppWithRevokedCertificate() {
+ $appArray = [
+ [
+ 'id' => 'news',
+ 'certificate' => '-----BEGIN CERTIFICATE-----
+MIIEAjCCAuoCAhAQMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
+VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
+MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
+dXRob3JpdHkwHhcNMTYxMDAzMTMyNDM3WhcNMjcwMTA5MTMyNDM3WjASMRAwDgYD
+VQQDDAdwYXNzbWFuMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApEt+
+KZGs+WqdZkHZflzqk+ophYWB8qB47XCzy+xdTGPFM84/9wXltRPbcQQWJJl5aOx0
+FPbsyTGhIt/IYZ2Vl0XrDRJjsaxzPcrofrwpJ2tqforXjGohl6mZUBA0ESzFiPzT
+SAZe8E14+Jk8rbF/ecrkqcWf2cTMV3Qfu9YvJo8WVs4lHc95r1F+Nalh/OLkHkzb
+fYPno2Z5cco6U7BXunFQG2gqy3wWQwmlhDxh5fwrCoFzPWm7WhwSyK+eMoSDz+Vp
+3kmtyijsqnda0zA9bfNzgW26czbJaObbnkdtDC2nfoAWXndlS/5YRI8yHd9miB5C
+u1OC8LUWToDGNa9+FOxBSj7Nk6iyjbVfRXcTqThdkVZdOOPaBRMsL9R4UYywCbhA
+yGNiQ0ahfXD8MZSb08rlQg8tAtcUZW1sYQcbtMGnu8OyC5J7N1efzv5mys4+9hBS
+5ECeyCuQTuOkF4H/XS2BMSFZWF2xh7wzhMLca+5yauDW4i8baFEv74QTeY1DADgI
+Lz29NJ6z9xYzEnPesjNrwIcJwIjV52EkdLTi+EIf83UjXLQdwDbLxu76qxqP7K0I
+oMmwbl7UNA0wzq7nmgRhvqhow5RoCaSJjTz0EYQVSa1xelwiKeJiSKj2G9Mgt5Ms
+Miuy3C3VAGvQJ2ocILPGOt54oVeNRFLpnCo1e3sCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAkGYtg21rGpUVT/AokGUfI0PeyYAkcXKy2yuBAzfRk+uIXnRR0vK+OMpx
+shBoYGR3JEGUHZcMTRh8wjAZ0wuyYlQONtJbFFF3bCfODXxCsw0Vm8/Ms+KCmE4Z
+SyQafWEQf1sdqNw4VS4DYS2mlpDgAl+U9UY6HQKuT3+GFIxCsQSdS0GTaiYVKPVE
+p/eKou739h+5dM4FEhIYZX+7PWlHmX6wPCFAjgNu3kiRGmF6LKmCNNXTySATEP86
+tczQMzLtVdTg5z8XMi//6TkAPxRPjYi8Vef/s2mLo7KystTmofxI/HZePSieJ9tj
+gLgK8d8sKL60JMmKHN3boHrsThKBVA==
+-----END CERTIFICATE-----',
+ ],
+ ];
+ $this->appFetcher
+ ->expects($this->once())
+ ->method('get')
+ ->willReturn($appArray);
+
+
+ $this->installer->downloadApp('news');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage App with id news has a certificate not issued by a trusted Code Signing Authority
+ */
+ public function testDownloadAppWithNotNextcloudCertificate() {
+ $appArray = [
+ [
+ 'id' => 'news',
+ 'certificate' => '-----BEGIN CERTIFICATE-----
+MIID8TCCAdkCAhAAMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVTMQ8wDQYD
+VQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xNTAzBgNVBAMMLG93
+bkNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MB4XDTE2
+MDIwMzE3NTE0OVoXDTI2MDEzMTE3NTE0OVowDzENMAsGA1UEAwwEY29yZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPHdSljnHI+ueQd27UyWPO9n4Lqt
+bK0kdekiC3si7Mee7uXXJaGuqXJozHEZYB1LIFLdCU/itCxEk9hyLcyNzeT+nRT/
+zDuOYdbLgCj7/A5bX+u3jc29UlCYybSFchfMdvn7a0njCna4dE+73b4yEj16tS2h
+S1EUygSzgicWlJqMD3Z9Qc+zLEpdhq9oDdDB8HURi2NW4KzIraVncSH+zF1QduOh
+nERDnF8x48D3FLdTxGA0W/Kg4gYsq4NRvU6g3DJNdp4YfqRSFMmLFDCgzDuhan7D
+wgRlI9NAeHbnyoUPtrDBUceI7shIbC/i87xk9ptqV0AyFonkJtK6lWwZjNkCAwEA
+ATANBgkqhkiG9w0BAQsFAAOCAgEAAMgymqZE1YaHYlRGwvTE7gGDY3gmFOMaxQL4
+E5m0CnkBz4BdIPRsQFFdOv3l/MIWkw5ED3vUB925VpQZYFSiEuv5NbnlPaHZlIMI
+n8AV/sTP5jue3LhtAN4EM63xNBhudAT6wVsvGwOuQOx9Xv+ptO8Po7sTuNYP0CMH
+EOQN+/q8tYlSm2VW+dAlaJ+zVZwZldhVjL+lSH4E9ktWn3PmgNQeKfcnJISUbus6
+ZtsYDF/X96/Z2ZQvMXOKksgvU6XlvIxllcyebC9Bxe/h0D63GCO2tqN5CWQzIIqn
+apUynPX8BlLaaExqYGERwlUi/yOGaUVPUjEPVehviOQYgAqxlrkJk1dWeCrwUori
+CXpi+IUYkidfgiJ9F88M3ElpwqIaXp7G3/4oHBuE2u6M+L+1/vqPJeTCAWUxxpJE
+yYmM+db6D4TySFpQPENNzPS8bpR6T8w2hRumkldC42HrnyJJbpjOieTXhXzjdPvZ
+IEP9JGtkhB2du6nBF2MNAq2TqRXpcfQrQEbnQ13aV9bl+roTwwO+SOWK/wgvdOMI
+STQ0Xk0sTGlmQjPYPkibVceaWMR3sX4cNt5c33YhJys5jxHoAh42km4nN9tfykR5
+crl5lBlKjXh2GP0+omSO3x1jX4+iQPCW2TWoyKkUdLu/hGHG2w8RrTeme+kATECH
+YSu356M=
+-----END CERTIFICATE-----',
+ ],
+ ];
+ $this->appFetcher
+ ->expects($this->once())
+ ->method('get')
+ ->willReturn($appArray);
+
+ $this->installer->downloadApp('news');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage App with id news has a cert issued to passman
+ */
+ public function testDownloadAppWithDifferentCN() {
+ $appArray = [
+ [
+ 'id' => 'news',
+ 'certificate' => '-----BEGIN CERTIFICATE-----
+MIIEAjCCAuoCAhAYMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
+VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
+MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
+dXRob3JpdHkwHhcNMTYxMDE5MTkzNTEyWhcNMjcwMTI1MTkzNTEyWjASMRAwDgYD
+VQQDDAdwYXNzbWFuMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1Jw1
+8F0DefogaLaBudGbhK2zcFIBSzxhh7dRWguZKHGE+rG00BOvFLIAo37Bfmy9WKLc
+3BFYvuFBowaVdaFOLxQJod0sOTmVMXhwoY5e3Xx+P+nsAw1/0gI10/LD1Vgl6i1u
+gMocmnbEYhKwr0NbdiQiMI9UB9Ge/51wt4WtAxwK7yJFl3+5qzvJgfX75Wt+8L1e
+Wk0LpVW23tUueJovjYZJXyAtohNaV3gwiST+QmKljCd4gwGX9abqfc76/lWtS+hI
+rKptuICc55ffH30rqVhAgCMouF/Ml5Qru8tDen5dSNtmAXz89OlDNisP+9HL4WDZ
+wvgps0mm/OYAUAQln24uXPDmAX/H2P5xIDHAa8avsqdgmHiqnLr4GYD8JYeb8GmB
+zZ38hEMjCr2F1k1h9T1+SyfRiDPDqqv1mBtcvNVc1JmZvSikMxhtQbU0C4/o2SBG
+RPCirknfPeKu8wBi6gvH4/SK0XTyuM8H58b9AKxzoo/wLbQ668+faLYyMSzCvsZD
+eeZkiO85y87Ax57WRY93arccCMaUeks/cTriNw3JrvdDyb2SeQOX9JUp0orUlC64
+AzK2xhXCpmkprVBGizT5g3brrknX6VDX1gXFAmH/daCRJAIHPX0S/ol0z9w/hCEl
+CpbiJPEphGtxqz4SfMv6IrIfneuDDKbF+w5MV/sCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAUKj+/GpnMn+0/u9SPHTNmX3U3Y/ldmud0CsU5ELzMf/3YPbC/qWziRik
+ewM2WyG8cwT9ayt9DxWGfu/zLv+ddyl8Wje1e/FIkRKXK0WW6OMz3e8Y45ONzpmu
+8ME75IpnMuZEqE/WayRg27dQT5QNnEe/uNLd4m9BfsQcHIx3OfHCu5Of6/BclgsJ
+VWp31zY8kcT0QN1GQxfB3eXnMyELneKCP3OH9DBhr4FUFb0vRHc8/1rdADFvSsdX
+hNm8iRq+s2n0F6OGBofYT8ZyCnDUSQAoKMTIHcz+dDGyP4BfPY5w0ZGUfuaYATvm
+cR92p/PYCFXkAKP3OO0RPlf6dXNKTw==
+-----END CERTIFICATE-----',
+ ],
+ ];
+ $this->appFetcher
+ ->expects($this->once())
+ ->method('get')
+ ->willReturn($appArray);
+
+ $this->installer->downloadApp('news');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage App with id passman has invalid signature
+ */
+ public function testDownloadAppWithInvalidSignature() {
+ $appArray = [
+ [
+ 'id' => 'passman',
+ 'certificate' => '-----BEGIN CERTIFICATE-----
+MIIEAjCCAuoCAhAYMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
+VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
+MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
+dXRob3JpdHkwHhcNMTYxMDE5MTkzNTEyWhcNMjcwMTI1MTkzNTEyWjASMRAwDgYD
+VQQDDAdwYXNzbWFuMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1Jw1
+8F0DefogaLaBudGbhK2zcFIBSzxhh7dRWguZKHGE+rG00BOvFLIAo37Bfmy9WKLc
+3BFYvuFBowaVdaFOLxQJod0sOTmVMXhwoY5e3Xx+P+nsAw1/0gI10/LD1Vgl6i1u
+gMocmnbEYhKwr0NbdiQiMI9UB9Ge/51wt4WtAxwK7yJFl3+5qzvJgfX75Wt+8L1e
+Wk0LpVW23tUueJovjYZJXyAtohNaV3gwiST+QmKljCd4gwGX9abqfc76/lWtS+hI
+rKptuICc55ffH30rqVhAgCMouF/Ml5Qru8tDen5dSNtmAXz89OlDNisP+9HL4WDZ
+wvgps0mm/OYAUAQln24uXPDmAX/H2P5xIDHAa8avsqdgmHiqnLr4GYD8JYeb8GmB
+zZ38hEMjCr2F1k1h9T1+SyfRiDPDqqv1mBtcvNVc1JmZvSikMxhtQbU0C4/o2SBG
+RPCirknfPeKu8wBi6gvH4/SK0XTyuM8H58b9AKxzoo/wLbQ668+faLYyMSzCvsZD
+eeZkiO85y87Ax57WRY93arccCMaUeks/cTriNw3JrvdDyb2SeQOX9JUp0orUlC64
+AzK2xhXCpmkprVBGizT5g3brrknX6VDX1gXFAmH/daCRJAIHPX0S/ol0z9w/hCEl
+CpbiJPEphGtxqz4SfMv6IrIfneuDDKbF+w5MV/sCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEAUKj+/GpnMn+0/u9SPHTNmX3U3Y/ldmud0CsU5ELzMf/3YPbC/qWziRik
+ewM2WyG8cwT9ayt9DxWGfu/zLv+ddyl8Wje1e/FIkRKXK0WW6OMz3e8Y45ONzpmu
+8ME75IpnMuZEqE/WayRg27dQT5QNnEe/uNLd4m9BfsQcHIx3OfHCu5Of6/BclgsJ
+VWp31zY8kcT0QN1GQxfB3eXnMyELneKCP3OH9DBhr4FUFb0vRHc8/1rdADFvSsdX
+hNm8iRq+s2n0F6OGBofYT8ZyCnDUSQAoKMTIHcz+dDGyP4BfPY5w0ZGUfuaYATvm
+cR92p/PYCFXkAKP3OO0RPlf6dXNKTw==
+-----END CERTIFICATE-----',
+ 'releases' => [
+ [
+ 'download' => 'https://example.com',
+ 'signature' => 'MySignature',
+ ],
+ [
+ 'download' => 'https://nextcloud.com',
+ ],
+ ],
+ ],
+ ];
+ $this->appFetcher
+ ->expects($this->once())
+ ->method('get')
+ ->willReturn($appArray);
+ $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+ copy(__DIR__ . '/../data/testapp.tar.gz', $realTmpFile);
+ $this->tempManager
+ ->expects($this->at(0))
+ ->method('getTemporaryFile')
+ ->with('.tar.gz')
+ ->willReturn($realTmpFile);
+ $client = $this->createMock(IClient::class);
+ $client
+ ->expects($this->once())
+ ->method('get')
+ ->with('https://example.com', ['save_to' => $realTmpFile]);
+ $this->clientService
+ ->expects($this->once())
+ ->method('newClient')
+ ->willReturn($client);
+
+ $this->installer->downloadApp('passman');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Extracted app testapp has more than 1 folder
+ */
+ public function testDownloadAppWithMoreThanOneFolderDownloaded() {
+ $appArray = [
+ [
+ 'id' => 'testapp',
+ 'certificate' => '-----BEGIN CERTIFICATE-----
+MIIEAjCCAuoCAhAbMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
+VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
+MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
+dXRob3JpdHkwHhcNMTYxMDMxMTgxNTI2WhcNMjcwMjA2MTgxNTI2WjASMRAwDgYD
+VQQDEwd0ZXN0YXBwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqa0x
+FcVa0YcO/ABqSNdbf7Bzp2PBBJzVM9gI4/HzzBKU/NY9/RibBBpNjAIWEFAbTI4j
+ilFSoxHDQ8HrboFOeKCrOIdp9ATQ8SnYVNIQ12Ym3LA/XxcG0gG0H7DeS9C0uACe
+svN8fwD1wnKnLLU9GBzO77jwYkneed85wwKG4waHd3965gxQWq0N5gnYS0TTn7Yr
+l1veRiw+ryefXvfWI0cN1WBZJ/4XAkwVlpG1HP60AunIpcwn9bfG4XCka+7x26E4
+6Hw0Ot7D7j0yzVzimJDPB2h2buEtPVd6m+oNPueVvKGta+p6cEEaHlFVh2Pa9DI+
+me3nb6aXE2kABWXav3BmK18A5Rg4ZY4VFYvmHmxkOhT/ulGZRqy6TccL/optqs52
+KQ6P0e5dfmhLeoCvJObD+ZYKv+kJCRFtX1Hve/R4IHG6XSFKUfrRjyor9b6TX2L/
+l2vV0mFjmy4g3l05vWHg1Edtq7M29S/xNA3/hF29NjBq6NoMbLGcBtFced1iK07Z
+yHLjXRZRfURP671Svqqg8pjxuDqkJ2vIj/Vpod4kF2jeiZYXcfmNKhEhxpkccSe0
+dI6p76Ne7XSUpf8yCPiSnWZLadqKZdEulcB4SlrZO2+/pycgqrqihofDrvDeWeeg
+gQyvbZZKl4ylRNj6IRKnosKLVXNqMHQxLmxLHeUCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEALkKQwa40HfuP4Q6ShwBFJbXLyodIAXCT014kBVjReDKNl5oHtMXRjPxj
+nj9doKu+3bLNuLCv9uU3H5+t/GFogReV3Av3z/fCqJ6wHv/KX+lacj31dWXZGD8G
+z+RYibrxKkPN0V6q1mSvkg3hJOOE+/4FPIdc8PNlgratv3WS4dT8QwGSUavHW2Kx
+89nIdnwtLEFpgML/bTG0dm8BH57xER8LCYixW1VmpV6A4IsoKVsnB7KUCRTK3iUJ
+Zh8Xg8UMNrOtXc1Wx1Wmjaa4ZE9dY6/KkU2ny2UWyDHKU/9VE8QQ4HN93gxU4+H7
+cUg0V1uAxqUvKytKkMfcyPWsz/AINA==
+-----END CERTIFICATE-----',
+ 'releases' => [
+ [
+ 'download' => 'https://example.com',
+ 'signature' => 'h8H3tUy2dDlwrV/hY/ZxqYqe8Vue+IINluLtAt1HxX2cjz3vdoVHJRINRkMYYcdz
+VlndvHyKdqJHDAACphR8tVV6EFrPermn7gEgWk7a51LbUM7sAN7RV7ijEooUo+TQ
+jNW9Ch48Wg3jvebMwWNr5t5U4MEXTP5f0YX/kxvkJoUrG3a3spt7ziEuHaq8IPvt
+Jj/JSDFhvRNpom7yNNcI1Ijoq8yC11sg7RJBNfrHdGPHPZVz2SyBiY9OcvgGSpUU
+bfvzhIZDCl/RRi5fs39jLLupAP69Ez6+jylNXEMsNwM0YL5+egSXFtkCvgOw8UBg
+ZqNZZojcS22acuvHRnoa6PDDhwHdCH+zpifXSOhSQvue5n6q+FVX6aeD1LnCQkYB
+D2wvNyZWwdADJtvDj03DKhm21g+TPy63XC94q4IqvjQ94pV8U+qrBBfkQ62NGjaC
+oOU6y5sEmQeAdVRpWVo0Hewmjp4Adoj5JRwuqCVEynTC6DXHs3HvHxYlmib1F05a
+GqEhdDmOHsxNaeJ08Hlptq5yLv3+0wEdtriVjgAZNVduHG1F1FkhPIrDHaB6pd67
+0AFvO/pZgMSHDRHD+safBgaLb5dBZ895Qvudbq3RQevVnO+YZQYZkpmjoF/+TQ7/
+YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
+ ],
+ [
+ 'download' => 'https://nextcloud.com',
+ ],
+ ],
+ ],
+ ];
+ $this->appFetcher
+ ->expects($this->once())
+ ->method('get')
+ ->willReturn($appArray);
+ $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+ copy(__DIR__ . '/../data/testapp1.tar.gz', $realTmpFile);
+ $this->tempManager
+ ->expects($this->at(0))
+ ->method('getTemporaryFile')
+ ->with('.tar.gz')
+ ->willReturn($realTmpFile);
+ $realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+ mkdir($realTmpFolder . '/testfolder');
+ $this->tempManager
+ ->expects($this->at(1))
+ ->method('getTemporaryFolder')
+ ->willReturn($realTmpFolder);
+ $client = $this->createMock(IClient::class);
+ $client
+ ->expects($this->once())
+ ->method('get')
+ ->with('https://example.com', ['save_to' => $realTmpFile]);
+ $this->clientService
+ ->expects($this->once())
+ ->method('newClient')
+ ->willReturn($client);
+
+ $this->installer->downloadApp('testapp');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage App for id testapp has a wrong app ID in info.xml: testapp1
+ */
+ public function testDownloadAppWithMismatchingIdentifier() {
+ $appArray = [
+ [
+ 'id' => 'testapp',
+ 'certificate' => '-----BEGIN CERTIFICATE-----
+MIIEAjCCAuoCAhAbMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
+VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
+MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
+dXRob3JpdHkwHhcNMTYxMDMxMTgxNTI2WhcNMjcwMjA2MTgxNTI2WjASMRAwDgYD
+VQQDEwd0ZXN0YXBwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqa0x
+FcVa0YcO/ABqSNdbf7Bzp2PBBJzVM9gI4/HzzBKU/NY9/RibBBpNjAIWEFAbTI4j
+ilFSoxHDQ8HrboFOeKCrOIdp9ATQ8SnYVNIQ12Ym3LA/XxcG0gG0H7DeS9C0uACe
+svN8fwD1wnKnLLU9GBzO77jwYkneed85wwKG4waHd3965gxQWq0N5gnYS0TTn7Yr
+l1veRiw+ryefXvfWI0cN1WBZJ/4XAkwVlpG1HP60AunIpcwn9bfG4XCka+7x26E4
+6Hw0Ot7D7j0yzVzimJDPB2h2buEtPVd6m+oNPueVvKGta+p6cEEaHlFVh2Pa9DI+
+me3nb6aXE2kABWXav3BmK18A5Rg4ZY4VFYvmHmxkOhT/ulGZRqy6TccL/optqs52
+KQ6P0e5dfmhLeoCvJObD+ZYKv+kJCRFtX1Hve/R4IHG6XSFKUfrRjyor9b6TX2L/
+l2vV0mFjmy4g3l05vWHg1Edtq7M29S/xNA3/hF29NjBq6NoMbLGcBtFced1iK07Z
+yHLjXRZRfURP671Svqqg8pjxuDqkJ2vIj/Vpod4kF2jeiZYXcfmNKhEhxpkccSe0
+dI6p76Ne7XSUpf8yCPiSnWZLadqKZdEulcB4SlrZO2+/pycgqrqihofDrvDeWeeg
+gQyvbZZKl4ylRNj6IRKnosKLVXNqMHQxLmxLHeUCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEALkKQwa40HfuP4Q6ShwBFJbXLyodIAXCT014kBVjReDKNl5oHtMXRjPxj
+nj9doKu+3bLNuLCv9uU3H5+t/GFogReV3Av3z/fCqJ6wHv/KX+lacj31dWXZGD8G
+z+RYibrxKkPN0V6q1mSvkg3hJOOE+/4FPIdc8PNlgratv3WS4dT8QwGSUavHW2Kx
+89nIdnwtLEFpgML/bTG0dm8BH57xER8LCYixW1VmpV6A4IsoKVsnB7KUCRTK3iUJ
+Zh8Xg8UMNrOtXc1Wx1Wmjaa4ZE9dY6/KkU2ny2UWyDHKU/9VE8QQ4HN93gxU4+H7
+cUg0V1uAxqUvKytKkMfcyPWsz/AINA==
+-----END CERTIFICATE-----',
+ 'releases' => [
+ [
+ 'download' => 'https://example.com',
+ 'signature' => 'h8H3tUy2dDlwrV/hY/ZxqYqe8Vue+IINluLtAt1HxX2cjz3vdoVHJRINRkMYYcdz
+VlndvHyKdqJHDAACphR8tVV6EFrPermn7gEgWk7a51LbUM7sAN7RV7ijEooUo+TQ
+jNW9Ch48Wg3jvebMwWNr5t5U4MEXTP5f0YX/kxvkJoUrG3a3spt7ziEuHaq8IPvt
+Jj/JSDFhvRNpom7yNNcI1Ijoq8yC11sg7RJBNfrHdGPHPZVz2SyBiY9OcvgGSpUU
+bfvzhIZDCl/RRi5fs39jLLupAP69Ez6+jylNXEMsNwM0YL5+egSXFtkCvgOw8UBg
+ZqNZZojcS22acuvHRnoa6PDDhwHdCH+zpifXSOhSQvue5n6q+FVX6aeD1LnCQkYB
+D2wvNyZWwdADJtvDj03DKhm21g+TPy63XC94q4IqvjQ94pV8U+qrBBfkQ62NGjaC
+oOU6y5sEmQeAdVRpWVo0Hewmjp4Adoj5JRwuqCVEynTC6DXHs3HvHxYlmib1F05a
+GqEhdDmOHsxNaeJ08Hlptq5yLv3+0wEdtriVjgAZNVduHG1F1FkhPIrDHaB6pd67
+0AFvO/pZgMSHDRHD+safBgaLb5dBZ895Qvudbq3RQevVnO+YZQYZkpmjoF/+TQ7/
+YwDVP+QmNRzx72jtqAN/Kc3CvQ9nkgYhU65B95aX0xA=',
+ ],
+ [
+ 'download' => 'https://nextcloud.com',
+ ],
+ ],
+ ],
+ ];
+ $this->appFetcher
+ ->expects($this->once())
+ ->method('get')
+ ->willReturn($appArray);
+ $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+ copy(__DIR__ . '/../data/testapp1.tar.gz', $realTmpFile);
+ $this->tempManager
+ ->expects($this->at(0))
+ ->method('getTemporaryFile')
+ ->with('.tar.gz')
+ ->willReturn($realTmpFile);
+ $realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+ $this->tempManager
+ ->expects($this->at(1))
+ ->method('getTemporaryFolder')
+ ->willReturn($realTmpFolder);
+ $client = $this->createMock(IClient::class);
+ $client
+ ->expects($this->once())
+ ->method('get')
+ ->with('https://example.com', ['save_to' => $realTmpFile]);
+ $this->clientService
+ ->expects($this->once())
+ ->method('newClient')
+ ->willReturn($client);
+
+ $this->installer->downloadApp('testapp');
+ }
- Installer::installApp($oldData);
- $oldVersionNumber = \OC_App::getAppVersion(self::$appid);
+ public function testDownloadAppSuccessful() {
+ $appArray = [
+ [
+ 'id' => 'testapp',
+ 'certificate' => '-----BEGIN CERTIFICATE-----
+MIIEAjCCAuoCAhAbMA0GCSqGSIb3DQEBCwUAMHsxCzAJBgNVBAYTAkRFMRswGQYD
+VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxFzAVBgNVBAoMDk5leHRjbG91ZCBHbWJI
+MTYwNAYDVQQDDC1OZXh0Y2xvdWQgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBB
+dXRob3JpdHkwHhcNMTYxMDMxMTgxNTI2WhcNMjcwMjA2MTgxNTI2WjASMRAwDgYD
+VQQDEwd0ZXN0YXBwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqa0x
+FcVa0YcO/ABqSNdbf7Bzp2PBBJzVM9gI4/HzzBKU/NY9/RibBBpNjAIWEFAbTI4j
+ilFSoxHDQ8HrboFOeKCrOIdp9ATQ8SnYVNIQ12Ym3LA/XxcG0gG0H7DeS9C0uACe
+svN8fwD1wnKnLLU9GBzO77jwYkneed85wwKG4waHd3965gxQWq0N5gnYS0TTn7Yr
+l1veRiw+ryefXvfWI0cN1WBZJ/4XAkwVlpG1HP60AunIpcwn9bfG4XCka+7x26E4
+6Hw0Ot7D7j0yzVzimJDPB2h2buEtPVd6m+oNPueVvKGta+p6cEEaHlFVh2Pa9DI+
+me3nb6aXE2kABWXav3BmK18A5Rg4ZY4VFYvmHmxkOhT/ulGZRqy6TccL/optqs52
+KQ6P0e5dfmhLeoCvJObD+ZYKv+kJCRFtX1Hve/R4IHG6XSFKUfrRjyor9b6TX2L/
+l2vV0mFjmy4g3l05vWHg1Edtq7M29S/xNA3/hF29NjBq6NoMbLGcBtFced1iK07Z
+yHLjXRZRfURP671Svqqg8pjxuDqkJ2vIj/Vpod4kF2jeiZYXcfmNKhEhxpkccSe0
+dI6p76Ne7XSUpf8yCPiSnWZLadqKZdEulcB4SlrZO2+/pycgqrqihofDrvDeWeeg
+gQyvbZZKl4ylRNj6IRKnosKLVXNqMHQxLmxLHeUCAwEAATANBgkqhkiG9w0BAQsF
+AAOCAQEALkKQwa40HfuP4Q6ShwBFJbXLyodIAXCT014kBVjReDKNl5oHtMXRjPxj
+nj9doKu+3bLNuLCv9uU3H5+t/GFogReV3Av3z/fCqJ6wHv/KX+lacj31dWXZGD8G
+z+RYibrxKkPN0V6q1mSvkg3hJOOE+/4FPIdc8PNlgratv3WS4dT8QwGSUavHW2Kx
+89nIdnwtLEFpgML/bTG0dm8BH57xER8LCYixW1VmpV6A4IsoKVsnB7KUCRTK3iUJ
+Zh8Xg8UMNrOtXc1Wx1Wmjaa4ZE9dY6/KkU2ny2UWyDHKU/9VE8QQ4HN93gxU4+H7
+cUg0V1uAxqUvKytKkMfcyPWsz/AINA==
+-----END CERTIFICATE-----',
+ 'releases' => [
+ [
+ 'download' => 'https://example.com',
+ 'signature' => 'O5UWFRnSx4mSdEX83Uh9u7KW+Gl1OWU4uaFg6aYY19zc+lWP4rKCbAUH7Jo1Bohf
+qxQbhXs4cMqGmoL8dW4zeFUqSJCRk52LA+ciLezjPFv275q+BxEgyWOylLnbhBaz
++v6lXLaeG0J/ry8wEdg+rwP8FCYPsvKlXSVbFjgubvCR/owKJJf5iL0B93noBwBN
+jfbcxi7Kh16HAKy6f/gVZ6hf/4Uo7iEFMCPEHjidope+ejUpqbd8XhQg5/yh7TQ7
+VKR7pkdDG2eFr5c3CpaECdNg5ZIGRbQNJHBXHT/wliorWpYJtwtNAQJ4xC635gLP
+4klkKN4XtSj8bJUaJC6aaksLFgRSeKXaYAHai/XP6BkeyNzlSbsmyZk8cZbySx8F
+gVOzPok1c94UGT57FjeW5eqRjtmzbYivQdP89Ouz6et7PY69yOCqiRFQanrqzwoX
+MPLX6f5V9tCJtlH6ztmEcDROfvuVc0U3rEhqx2hphoyo+MZrPFpdcJL8KkIdMKbY
+7yQWrsV7QvAzygAOFsC0TlSNJbmMCljouUk9di4CUZ+xsQ6n6TZtE7gsdljlKjPS
+3Ys+e3V1HUaVzv8SaSmKwjRoQxQxHWLtXpJS2Yq+i+gq7LuC+aStzxAzV/h2plDW
+358picx/PobNDi71Q97+/CAOq+4wDOwhKwls7lwudIs=',
+ ],
+ [
+ 'download' => 'https://nextcloud.com',
+ ],
+ ],
+ ],
+ ];
+ $this->appFetcher
+ ->expects($this->once())
+ ->method('get')
+ ->willReturn($appArray);
+ $realTmpFile = \OC::$server->getTempManager()->getTemporaryFile('.tar.gz');
+ copy(__DIR__ . '/../data/testapp.tar.gz', $realTmpFile);
+ $this->tempManager
+ ->expects($this->at(0))
+ ->method('getTemporaryFile')
+ ->with('.tar.gz')
+ ->willReturn($realTmpFile);
+ $realTmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+ $this->tempManager
+ ->expects($this->at(1))
+ ->method('getTemporaryFolder')
+ ->willReturn($realTmpFolder);
+ $client = $this->createMock(IClient::class);
+ $client
+ ->expects($this->once())
+ ->method('get')
+ ->with('https://example.com', ['save_to' => $realTmpFile]);
+ $this->clientService
+ ->expects($this->once())
+ ->method('newClient')
+ ->willReturn($client);
- Installer::updateApp($newData);
- $newVersionNumber = \OC_App::getAppVersion(self::$appid);
+ $this->installer->downloadApp('testapp');
- $this->assertNotEquals($oldVersionNumber, $newVersionNumber);
+ $this->assertTrue(file_exists(__DIR__ . '/../../apps/testapp/appinfo/info.xml'));
+ $this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
}
}
diff --git a/tests/lib/OCSClientTest.php b/tests/lib/OCSClientTest.php
deleted file mode 100644
index d4bfd77e87126b3530e106d0ae97e63598ca841d..0000000000000000000000000000000000000000
--- a/tests/lib/OCSClientTest.php
+++ /dev/null
@@ -1,1132 +0,0 @@
-<?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 Test;
-
-use OC\OCSClient;
-use OCP\Http\Client\IClient;
-use OCP\Http\Client\IClientService;
-use OCP\Http\Client\IResponse;
-use OCP\IConfig;
-use OCP\ILogger;
-
-/**
- * Class OCSClientTest
- */
-class OCSClientTest extends \Test\TestCase {
- /** @var OCSClient */
- private $ocsClient;
- /** @var IConfig */
- private $config;
- /** @var IClientService */
- private $clientService;
- /** @var ILogger */
- private $logger;
-
- public function setUp() {
- parent::setUp();
-
- $this->config = $this->getMockBuilder('\OCP\IConfig')
- ->disableOriginalConstructor()->getMock();
- $this->clientService = $this->createMock(IClientService::class);
- $this->logger = $this->createMock(ILogger::class);
-
- $this->ocsClient = new OCSClient(
- $this->clientService,
- $this->config,
- $this->logger
- );
- }
-
- public function testIsAppStoreEnabledSuccess() {
- $this->config
- ->expects($this->once())
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->assertTrue($this->ocsClient->isAppStoreEnabled());
- }
-
- public function testIsAppStoreEnabledFail() {
- $this->config
- ->expects($this->once())
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(false));
- $this->assertFalse($this->ocsClient->isAppStoreEnabled());
- }
-
- public function testGetAppStoreUrl() {
- $this->config
- ->expects($this->once())
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
- $this->assertSame('https://api.owncloud.com/v1', self::invokePrivate($this->ocsClient, 'getAppStoreUrl'));
- }
-
- public function testGetCategoriesDisabledAppStore() {
- $this->config
- ->expects($this->once())
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(false));
- $this->assertNull($this->ocsClient->getCategories([8, 1, 0, 7]));
- }
-
- public function testGetCategoriesExceptionClient() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/categories',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->throwException(new \Exception('TheErrorMessage')));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->logger
- ->expects($this->once())
- ->method('error')
- ->with(
- 'Could not get categories: TheErrorMessage',
- [
- 'app' => 'core',
- ]
- );
-
- $this->assertNull($this->ocsClient->getCategories([8, 1, 0, 7]));
- }
-
- public function testGetCategoriesParseError() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('MyInvalidXml'));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/categories',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->logger
- ->expects($this->once())
- ->method('error')
- ->with(
- 'Could not get categories, content was no valid XML',
- [
- 'app' => 'core',
- ]
- );
-
- $this->assertNull($this->ocsClient->getCategories([8, 1, 0, 7]));
- }
-
- public function testGetCategoriesSuccessful() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('<?xml version="1.0"?>
- <ocs>
- <meta>
- <status>ok</status>
- <statuscode>100</statuscode>
- <message></message>
- <totalitems>6</totalitems>
- </meta>
- <data>
- <category>
- <id>920</id>
- <name>ownCloud Multimedia</name>
- </category>
- <category>
- <id>921</id>
- <name>ownCloud PIM</name>
- </category>
- <category>
- <id>922</id>
- <name>ownCloud Productivity</name>
- </category>
- <category>
- <id>923</id>
- <name>ownCloud Game</name>
- </category>
- <category>
- <id>924</id>
- <name>ownCloud Tool</name>
- </category>
- <category>
- <id>925</id>
- <name>ownCloud other</name>
- </category>
- </data>
- </ocs>
- '));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/categories',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $expected = [
- 920 => 'ownCloud Multimedia',
- 921 => 'ownCloud PIM',
- 922 => 'ownCloud Productivity',
- 923 => 'ownCloud Game',
- 924 => 'ownCloud Tool',
- 925 => 'ownCloud other',
- ];
- $this->assertSame($expected, $this->ocsClient->getCategories([8, 1, 0, 7]));
- }
-
- public function testGetApplicationsDisabledAppStore() {
- $this->config
- ->expects($this->once())
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(false));
- $this->assertSame([], $this->ocsClient->getApplications([], 1, 'approved', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationsExceptionClient() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/data',
- [
- 'timeout' => 20,
- 'query' => [
- 'version' => implode('x', [8, 1, 0, 7]),
- 'filter' => 'approved',
- 'categories' => '815x1337',
- 'sortmode' => 'new',
- 'page' => 1,
- 'pagesize' => 100,
- 'approved' => 'approved',
- ],
- ]
- )
- ->will($this->throwException(new \Exception('TheErrorMessage')));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->logger
- ->expects($this->once())
- ->method('error')
- ->with(
- 'Could not get applications: TheErrorMessage',
- [
- 'app' => 'core',
- ]
- );
-
- $this->assertSame([], $this->ocsClient->getApplications([815, 1337], 1, 'approved', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationsParseError() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('MyInvalidXml'));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/data',
- [
- 'timeout' => 20,
- 'query' => [
- 'version' => implode('x', [8, 1, 0, 7]),
- 'filter' => 'approved',
- 'categories' => '815x1337',
- 'sortmode' => 'new',
- 'page' => 1,
- 'pagesize' => 100,
- 'approved' => 'approved',
- ],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->logger
- ->expects($this->once())
- ->method('error')
- ->with(
- 'Could not get applications, content was no valid XML',
- [
- 'app' => 'core',
- ]
- );
-
- $this->assertSame([], $this->ocsClient->getApplications([815, 1337], 1, 'approved', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationsSuccessful() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('<?xml version="1.0"?>
- <ocs>
- <meta>
- <status>ok</status>
- <statuscode>100</statuscode>
- <message></message>
- <totalitems>2</totalitems>
- <itemsperpage>100</itemsperpage>
- </meta>
- <data>
- <content details="summary">
- <id>168707</id>
- <name>Calendar 8.0</name>
- <version>0.6.4</version>
- <label>recommended</label>
- <changed>2015-02-09T15:23:56+01:00</changed>
- <created>2015-01-26T04:35:19+01:00</created>
- <typeid>921</typeid>
- <typename>ownCloud PIM</typename>
- <language></language>
- <personid>owncloud</personid>
- <profilepage>http://opendesktop.org/usermanager/search.php?username=owncloud</profilepage>
- <downloads>5393</downloads>
- <score>60</score>
- <description>Calendar App for ownCloud</description>
- <comments>7</comments>
- <fans>10</fans>
- <licensetype>16</licensetype>
- <approved>0</approved>
- <category>1</category>
- <license>AGPL</license>
- <preview1></preview1>
- <detailpage>https://apps.owncloud.com/content/show.php?content=168707</detailpage>
- <downloadtype1></downloadtype1>
- <downloadway1>0</downloadway1>
- <downloadprice1>0</downloadprice1>
- <downloadlink1>http://apps.owncloud.com/content/download.php?content=168707&id=1</downloadlink1>
- <downloadgpgsignature1></downloadgpgsignature1>
- <downloadgpgfingerprint1></downloadgpgfingerprint1>
- <downloadpackagename1></downloadpackagename1>
- <downloadrepository1></downloadrepository1>
- <downloadname1></downloadname1>
- <downloadsize1>885</downloadsize1>
- </content>
- <content details="summary">
- <id>168708</id>
- <name>Contacts 8.0</name>
- <version>0.3.0.18</version>
- <label>recommended</label>
- <changed>2015-02-09T15:18:58+01:00</changed>
- <created>2015-01-26T04:45:17+01:00</created>
- <typeid>921</typeid>
- <typename>ownCloud PIM</typename>
- <language></language>
- <personid>owncloud</personid>
- <profilepage>http://opendesktop.org/usermanager/search.php?username=owncloud</profilepage>
- <downloads>4237</downloads>
- <score>58</score>
- <description></description>
- <comments>3</comments>
- <fans>6</fans>
- <licensetype>16</licensetype>
- <approved>200</approved>
- <category>1</category>
- <license>AGPL</license>
- <preview1></preview1>
- <detailpage>https://apps.owncloud.com/content/show.php?content=168708</detailpage>
- <downloadtype1></downloadtype1>
- <downloadway1>0</downloadway1>
- <downloadprice1>0</downloadprice1>
- <downloadlink1>http://apps.owncloud.com/content/download.php?content=168708&id=1</downloadlink1>
- <downloadgpgsignature1></downloadgpgsignature1>
- <downloadgpgfingerprint1></downloadgpgfingerprint1>
- <downloadpackagename1></downloadpackagename1>
- <downloadrepository1></downloadrepository1>
- <downloadname1></downloadname1>
- <downloadsize1>1409</downloadsize1>
- </content>
- </data>
- </ocs> '));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/data',
- [
- 'timeout' => 20,
- 'query' => [
- 'version' => implode('x', [8, 1, 0, 7]),
- 'filter' => 'approved',
- 'categories' => '815x1337',
- 'sortmode' => 'new',
- 'page' => 1,
- 'pagesize' => 100,
- 'approved' => 'approved',
- ],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $expected = [
- [
- 'id' => '168707',
- 'name' => 'Calendar 8.0',
- 'label' => 'recommended',
- 'version' => '0.6.4',
- 'type' => '921',
- 'typename' => 'ownCloud PIM',
- 'personid' => 'owncloud',
- 'license' => 'AGPL',
- 'detailpage' => 'https://apps.owncloud.com/content/show.php?content=168707',
- 'preview' => '',
- 'preview-full' => '',
- 'changed' => 1423491836,
- 'description' => 'Calendar App for ownCloud',
- 'score' => '60',
- 'downloads' => 5393,
- 'level' => 0,
- 'profilepage' => 'http://opendesktop.org/usermanager/search.php?username=owncloud',
- ],
- [
- 'id' => '168708',
- 'name' => 'Contacts 8.0',
- 'label' => 'recommended',
- 'version' => '0.3.0.18',
- 'type' => '921',
- 'typename' => 'ownCloud PIM',
- 'personid' => 'owncloud',
- 'license' => 'AGPL',
- 'detailpage' => 'https://apps.owncloud.com/content/show.php?content=168708',
- 'preview' => '',
- 'preview-full' => '',
- 'changed' => 1423491538,
- 'description' => '',
- 'score' => '58',
- 'downloads' => 4237,
- 'level' => 200,
- 'profilepage' => 'http://opendesktop.org/usermanager/search.php?username=owncloud',
- ],
- ];
- $this->assertEquals($expected, $this->ocsClient->getApplications([815, 1337], 1, 'approved', [8, 1, 0, 7]));
- }
-
- public function tesGetApplicationDisabledAppStore() {
- $this->config
- ->expects($this->once())
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(false));
- $this->assertNull($this->ocsClient->getApplication('MyId', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationExceptionClient() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/data/MyId',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->throwException(new \Exception('TheErrorMessage')));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->logger
- ->expects($this->once())
- ->method('error')
- ->with(
- 'Could not get application: TheErrorMessage',
- [
- 'app' => 'core',
- ]
- );
-
- $this->assertNull($this->ocsClient->getApplication('MyId', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationParseError() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('MyInvalidXml'));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/data/MyId',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->logger
- ->expects($this->once())
- ->method('error')
- ->with(
- 'Could not get application, content was no valid XML',
- [
- 'app' => 'core',
- ]
- );
-
- $this->assertNull($this->ocsClient->getApplication('MyId', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationSuccessful() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('<?xml version="1.0"?>
- <ocs>
- <meta>
- <status>ok</status>
- <statuscode>100</statuscode>
- <message></message>
- </meta>
- <data>
- <content details="full">
- <id>166053</id>
- <name>Versioning</name>
- <version>0.0.1</version>
- <label>recommended</label>
- <typeid>925</typeid>
- <typename>ownCloud other</typename>
- <language></language>
- <personid>owncloud</personid>
- <profilepage>http://opendesktop.org/usermanager/search.php?username=owncloud</profilepage>
- <created>2014-07-07T16:34:40+02:00</created>
- <changed>2014-07-07T16:34:40+02:00</changed>
- <downloads>140</downloads>
- <score>50</score>
- <description>Placeholder for future updates</description>
- <summary></summary>
- <feedbackurl></feedbackurl>
- <changelog></changelog>
- <homepage></homepage>
- <homepagetype></homepagetype>
- <homepage2></homepage2>
- <homepagetype2></homepagetype2>
- <homepage3></homepage3>
- <homepagetype3></homepagetype3>
- <homepage4></homepage4>
- <homepagetype4></homepagetype4>
- <homepage5></homepage5>
- <homepagetype5></homepagetype5>
- <homepage6></homepage6>
- <homepagetype6></homepagetype6>
- <homepage7></homepage7>
- <homepagetype7></homepagetype7>
- <homepage8></homepage8>
- <homepagetype8></homepagetype8>
- <homepage9></homepage9>
- <homepagetype9></homepagetype9>
- <homepage10></homepage10>
- <homepagetype10></homepagetype10>
- <licensetype>16</licensetype>
- <license>AGPL</license>
- <donationpage></donationpage>
- <comments>0</comments>
- <commentspage>http://apps.owncloud.com/content/show.php?content=166053</commentspage>
- <fans>0</fans>
- <fanspage>http://apps.owncloud.com/content/show.php?action=fan&content=166053</fanspage>
- <knowledgebaseentries>0</knowledgebaseentries>
- <knowledgebasepage>http://apps.owncloud.com/content/show.php?action=knowledgebase&content=166053</knowledgebasepage>
- <depend>ownCloud 7</depend>
- <preview1></preview1>
- <preview2></preview2>
- <preview3></preview3>
- <previewpic1></previewpic1>
- <previewpic2></previewpic2>
- <previewpic3></previewpic3>
- <picsmall1></picsmall1>
- <picsmall2></picsmall2>
- <picsmall3></picsmall3>
- <detailpage>https://apps.owncloud.com/content/show.php?content=166053</detailpage>
- <downloadtype1></downloadtype1>
- <downloadprice1>0</downloadprice1>
- <downloadlink1>http://apps.owncloud.com/content/download.php?content=166053&id=1</downloadlink1>
- <downloadname1></downloadname1>
- <downloadgpgfingerprint1></downloadgpgfingerprint1>
- <downloadgpgsignature1></downloadgpgsignature1>
- <downloadpackagename1></downloadpackagename1>
- <downloadrepository1></downloadrepository1>
- <downloadsize1>1</downloadsize1>
- <approved>200</approved>
- </content>
- </data>
- </ocs>
- '));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/data/166053',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $expected = [
- 'id' => 166053,
- 'name' => 'Versioning',
- 'version' => '0.0.1',
- 'type' => '925',
- 'label' => 'recommended',
- 'typename' => 'ownCloud other',
- 'personid' => 'owncloud',
- 'profilepage' => 'http://opendesktop.org/usermanager/search.php?username=owncloud',
- 'detailpage' => 'https://apps.owncloud.com/content/show.php?content=166053',
- 'preview1' => '',
- 'preview2' => '',
- 'preview3' => '',
- 'changed' => 1404743680,
- 'description' => 'Placeholder for future updates',
- 'score' => 50,
- 'level' => 200,
- ];
- $this->assertSame($expected, $this->ocsClient->getApplication(166053, [8, 1, 0, 7]));
- }
-
- public function testGetApplicationSuccessfulWithOldId() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('<?xml version="1.0"?>
- <ocs>
- <meta>
- <status>ok</status>
- <statuscode>100</statuscode>
- <message></message>
- </meta>
- <data>
- <content details="full">
- <id>1337</id>
- <name>Versioning</name>
- <version>0.0.1</version>
- <label>recommended</label>
- <typeid>925</typeid>
- <typename>ownCloud other</typename>
- <language></language>
- <personid>owncloud</personid>
- <profilepage>http://opendesktop.org/usermanager/search.php?username=owncloud</profilepage>
- <created>2014-07-07T16:34:40+02:00</created>
- <changed>2014-07-07T16:34:40+02:00</changed>
- <downloads>140</downloads>
- <score>50</score>
- <description>Placeholder for future updates</description>
- <summary></summary>
- <feedbackurl></feedbackurl>
- <changelog></changelog>
- <homepage></homepage>
- <homepagetype></homepagetype>
- <homepage2></homepage2>
- <homepagetype2></homepagetype2>
- <homepage3></homepage3>
- <homepagetype3></homepagetype3>
- <homepage4></homepage4>
- <homepagetype4></homepagetype4>
- <homepage5></homepage5>
- <homepagetype5></homepagetype5>
- <homepage6></homepage6>
- <homepagetype6></homepagetype6>
- <homepage7></homepage7>
- <homepagetype7></homepagetype7>
- <homepage8></homepage8>
- <homepagetype8></homepagetype8>
- <homepage9></homepage9>
- <homepagetype9></homepagetype9>
- <homepage10></homepage10>
- <homepagetype10></homepagetype10>
- <licensetype>16</licensetype>
- <license>AGPL</license>
- <donationpage></donationpage>
- <comments>0</comments>
- <commentspage>http://apps.owncloud.com/content/show.php?content=166053</commentspage>
- <fans>0</fans>
- <fanspage>http://apps.owncloud.com/content/show.php?action=fan&content=166053</fanspage>
- <knowledgebaseentries>0</knowledgebaseentries>
- <knowledgebasepage>http://apps.owncloud.com/content/show.php?action=knowledgebase&content=166053</knowledgebasepage>
- <depend>ownCloud 7</depend>
- <preview1></preview1>
- <preview2></preview2>
- <preview3></preview3>
- <previewpic1></previewpic1>
- <previewpic2></previewpic2>
- <previewpic3></previewpic3>
- <picsmall1></picsmall1>
- <picsmall2></picsmall2>
- <picsmall3></picsmall3>
- <detailpage>https://apps.owncloud.com/content/show.php?content=166053</detailpage>
- <downloadtype1></downloadtype1>
- <downloadprice1>0</downloadprice1>
- <downloadlink1>http://apps.owncloud.com/content/download.php?content=166053&id=1</downloadlink1>
- <downloadname1></downloadname1>
- <downloadgpgfingerprint1></downloadgpgfingerprint1>
- <downloadgpgsignature1></downloadgpgsignature1>
- <downloadpackagename1></downloadpackagename1>
- <downloadrepository1></downloadrepository1>
- <downloadsize1>1</downloadsize1>
- <approved>200</approved>
- </content>
- </data>
- </ocs>
- '));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/data/166053',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $expected = [
- 'id' => 166053,
- 'name' => 'Versioning',
- 'version' => '0.0.1',
- 'type' => '925',
- 'label' => 'recommended',
- 'typename' => 'ownCloud other',
- 'personid' => 'owncloud',
- 'profilepage' => 'http://opendesktop.org/usermanager/search.php?username=owncloud',
- 'detailpage' => 'https://apps.owncloud.com/content/show.php?content=166053',
- 'preview1' => '',
- 'preview2' => '',
- 'preview3' => '',
- 'changed' => 1404743680,
- 'description' => 'Placeholder for future updates',
- 'score' => 50,
- 'level' => 200,
- ];
- $this->assertSame($expected, $this->ocsClient->getApplication(166053, [8, 1, 0, 7]));
- }
-
- public function testGetApplicationEmptyXml() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('<?xml version="1.0"?>
- <ocs>
- <meta>
- <status>ok</status>
- <statuscode>100</statuscode>
- <message></message>
- </meta>
- </ocs>
- '));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/data/MyId',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->assertSame(null, $this->ocsClient->getApplication('MyId', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationDownloadDisabledAppStore() {
- $this->config
- ->expects($this->once())
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(false));
- $this->assertNull($this->ocsClient->getApplicationDownload('MyId', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationDownloadExceptionClient() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/download/MyId/1',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->throwException(new \Exception('TheErrorMessage')));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->logger
- ->expects($this->once())
- ->method('error')
- ->with(
- 'Could not get application download URL: TheErrorMessage',
- [
- 'app' => 'core',
- ]
- );
-
- $this->assertNull($this->ocsClient->getApplicationDownload('MyId', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationDownloadParseError() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('MyInvalidXml'));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/download/MyId/1',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $this->logger
- ->expects($this->once())
- ->method('error')
- ->with(
- 'Could not get application download URL, content was no valid XML',
- [
- 'app' => 'core',
- ]
- );
-
- $this->assertNull($this->ocsClient->getApplicationDownload('MyId', [8, 1, 0, 7]));
- }
-
- public function testGetApplicationDownloadUrlSuccessful() {
- $this->config
- ->expects($this->at(0))
- ->method('getSystemValue')
- ->with('appstoreenabled', true)
- ->will($this->returnValue(true));
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('appstoreurl', 'https://api.owncloud.com/v1')
- ->will($this->returnValue('https://api.owncloud.com/v1'));
-
- $response = $this->createMock(IResponse::class);
- $response
- ->expects($this->once())
- ->method('getBody')
- ->will($this->returnValue('<?xml version="1.0"?>
- <ocs>
- <meta>
- <status>ok</status>
- <statuscode>100</statuscode>
- <message></message>
- </meta>
- <data>
- <content details="download">
- <downloadlink>https://apps.owncloud.com/CONTENT/content-files/166052-files_trashbin.zip</downloadlink>
- <mimetype>application/zip</mimetype>
- <gpgfingerprint></gpgfingerprint>
- <gpgsignature></gpgsignature>
- <packagename></packagename>
- <repository></repository>
- </content>
- </data>
- </ocs>
- '));
-
- $client = $this->createMock(IClient::class);
- $client
- ->expects($this->once())
- ->method('get')
- ->with(
- 'https://api.owncloud.com/v1/content/download/MyId/1',
- [
- 'timeout' => 20,
- 'query' => ['version' => '8x1x0x7'],
- ]
- )
- ->will($this->returnValue($response));
-
- $this->clientService
- ->expects($this->once())
- ->method('newClient')
- ->will($this->returnValue($client));
-
- $expected = [
- 'downloadlink' => 'https://apps.owncloud.com/CONTENT/content-files/166052-files_trashbin.zip',
- ];
- $this->assertSame($expected, $this->ocsClient->getApplicationDownload('MyId', [8, 1, 0, 7]));
- }
-}
diff --git a/tests/lib/ServerTest.php b/tests/lib/ServerTest.php
index 2e5900c4ce51fe93f9ecdb8f098d36e82811d4ba..02fccee628e02674433d6b31f6dc7b51fca617ec 100644
--- a/tests/lib/ServerTest.php
+++ b/tests/lib/ServerTest.php
@@ -23,6 +23,8 @@
*/
namespace Test;
+use OC\App\AppStore\Fetcher\AppFetcher;
+use OC\App\AppStore\Fetcher\CategoryFetcher;
/**
* Class Server
@@ -50,6 +52,7 @@ class ServerTest extends \Test\TestCase {
['AllConfig', '\OCP\IConfig'],
['AppConfig', '\OC\AppConfig'],
['AppConfig', '\OCP\IAppConfig'],
+ ['AppFetcher', AppFetcher::class],
['AppHelper', '\OC\AppHelper'],
['AppHelper', '\OCP\IHelper'],
['AppManager', '\OC\App\AppManager'],
@@ -59,6 +62,7 @@ class ServerTest extends \Test\TestCase {
['AvatarManager', '\OC\AvatarManager'],
['AvatarManager', '\OCP\IAvatarManager'],
+ ['CategoryFetcher', CategoryFetcher::class],
['CapabilitiesManager', '\OC\CapabilitiesManager'],
['ContactsManager', '\OC\ContactsManager'],
['ContactsManager', '\OCP\Contacts\IManager'],
@@ -122,8 +126,6 @@ class ServerTest extends \Test\TestCase {
['UserCache', '\OC\Cache\File'],
['UserCache', '\OCP\ICache'],
- ['OcsClient', '\OC\OCSClient'],
-
['PreviewManager', '\OC\PreviewManager'],
['PreviewManager', '\OCP\IPreview'],
diff --git a/tests/lib/StreamWrappersTest.php b/tests/lib/StreamWrappersTest.php
index c0ecb5e738bda4e0659342adfea807d5044752ee..eb35fd54454fb885a76307298d9502959ad011dd 100644
--- a/tests/lib/StreamWrappersTest.php
+++ b/tests/lib/StreamWrappersTest.php
@@ -38,7 +38,7 @@ class StreamWrappersTest extends \Test\TestCase {
public static function tearDownAfterClass() {
if (self::$trashBinStatus) {
- \OC_App::enable('files_trashbin');
+ (new \OC_App())->enable('files_trashbin');
}
}