aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-02-09 19:58:29 +0100
committerLukas Reschke <lukas@owncloud.com>2016-02-09 20:28:30 +0100
commitb9e3ed14680bea2626d90c5dfc48d7f61d7e437f (patch)
treec3c73f2aa403c5a0b1ece641ee9000e78af1d70b
parenta39c7591d6b0bfcb323cd14a5c1164576eaf7559 (diff)
downloadnextcloud-server-b9e3ed14680bea2626d90c5dfc48d7f61d7e437f.tar.gz
nextcloud-server-b9e3ed14680bea2626d90c5dfc48d7f61d7e437f.zip
Add SSO for updater application
Allows logging-in into the updater application by visiting the admin panel and pressing "Open updater".
-rw-r--r--.gitignore1
-rw-r--r--apps/updatenotification/admin.php25
-rw-r--r--apps/updatenotification/appinfo/app.php2
-rw-r--r--apps/updatenotification/appinfo/application.php46
-rw-r--r--apps/updatenotification/appinfo/info.xml2
-rw-r--r--apps/updatenotification/appinfo/routes.php27
-rw-r--r--apps/updatenotification/controller/admincontroller.php85
-rw-r--r--apps/updatenotification/js/admin.js42
-rw-r--r--apps/updatenotification/lib/resettokenbackgroundjob.php75
-rw-r--r--apps/updatenotification/templates/admin.php8
-rw-r--r--apps/updatenotification/tests/ResetTokenBackgroundJobTest.php81
-rw-r--r--apps/updatenotification/tests/controller/AdminControllerTest.php98
12 files changed, 491 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index a2fb67ef429..73f57989a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
!/apps/user_ldap
!/apps/provisioning_api
!/apps/systemtags
+!/apps/updatenotification
/apps/files_external/3rdparty/irodsphp/PHPUnitTest
/apps/files_external/3rdparty/irodsphp/web
/apps/files_external/3rdparty/irodsphp/prods/test
diff --git a/apps/updatenotification/admin.php b/apps/updatenotification/admin.php
new file mode 100644
index 00000000000..768d887800c
--- /dev/null
+++ b/apps/updatenotification/admin.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+$app = new \OCA\UpdateNotification\AppInfo\Application();
+/** @var OCA\UpdateNotification\Controller\AdminController $controller */
+$controller = $app->getContainer()->query('AdminController');
+return $controller->displayPanel()->render();
diff --git a/apps/updatenotification/appinfo/app.php b/apps/updatenotification/appinfo/app.php
index d5e973be528..99df99ac7c9 100644
--- a/apps/updatenotification/appinfo/app.php
+++ b/apps/updatenotification/appinfo/app.php
@@ -36,4 +36,6 @@ if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
}
}
+
+ \OC_App::registerAdmin('updatenotification', 'admin');
}
diff --git a/apps/updatenotification/appinfo/application.php b/apps/updatenotification/appinfo/application.php
new file mode 100644
index 00000000000..ae3317c1b54
--- /dev/null
+++ b/apps/updatenotification/appinfo/application.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\UpdateNotification\AppInfo;
+
+use OC\AppFramework\Utility\TimeFactory;
+use OCA\UpdateNotification\Controller\AdminController;
+use OCP\AppFramework\App;
+use OCP\AppFramework\IAppContainer;
+
+class Application extends App {
+ public function __construct (array $urlParams = array()) {
+ parent::__construct('updatenotification', $urlParams);
+ $container = $this->getContainer();
+
+ $container->registerService('AdminController', function(IAppContainer $c) {
+ return new AdminController(
+ $c->query('AppName'),
+ $c->query('Request'),
+ $c->getServer()->getJobList(),
+ $c->getServer()->getSecureRandom(),
+ $c->getServer()->getConfig(),
+ new TimeFactory()
+ );
+ });
+ }
+
+}
diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index 0bfdd861a2f..2991829e19b 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -2,7 +2,7 @@
<info>
<id>updatenotification</id>
<name>Update notification</name>
- <description>Displays update notifications for ownCloud.</description>
+ <description>Displays update notifications for ownCloud and provides the SSO for the updater.</description>
<licence>AGPL</licence>
<author>Lukas Reschke</author>
<version>0.1.0</version>
diff --git a/apps/updatenotification/appinfo/routes.php b/apps/updatenotification/appinfo/routes.php
new file mode 100644
index 00000000000..2cf43c89769
--- /dev/null
+++ b/apps/updatenotification/appinfo/routes.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\UpdateNotification\AppInfo;
+
+$application = new Application();
+$application->registerRoutes($this, ['routes' => [
+ ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
+]]);
diff --git a/apps/updatenotification/controller/admincontroller.php b/apps/updatenotification/controller/admincontroller.php
new file mode 100644
index 00000000000..ec1cc45075c
--- /dev/null
+++ b/apps/updatenotification/controller/admincontroller.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\UpdateNotification\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\IJobList;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\Security\ISecureRandom;
+
+class AdminController extends Controller {
+ /** @var IJobList */
+ private $jobList;
+ /** @var ISecureRandom */
+ private $secureRandom;
+ /** @var IConfig */
+ private $config;
+ /** @var ITimeFactory */
+ private $timeFactory;
+
+ /**
+ * @param string $appName
+ * @param IRequest $request
+ * @param IJobList $jobList
+ * @param ISecureRandom $secureRandom
+ * @param IConfig $config
+ * @param ITimeFactory $timeFactory
+ */
+ public function __construct($appName,
+ IRequest $request,
+ IJobList $jobList,
+ ISecureRandom $secureRandom,
+ IConfig $config,
+ ITimeFactory $timeFactory) {
+ parent::__construct($appName, $request);
+ $this->jobList = $jobList;
+ $this->secureRandom = $secureRandom;
+ $this->config = $config;
+ $this->timeFactory = $timeFactory;
+ }
+
+ /**
+ * @return TemplateResponse
+ */
+ public function displayPanel() {
+ return new TemplateResponse($this->appName, 'admin', [], '');
+ }
+
+ /**
+ * @return DataResponse
+ */
+ public function createCredentials() {
+ // Create a new job and store the creation date
+ $this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
+ $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
+
+ // Create a new token
+ $newToken = $this->secureRandom->generate(32);
+ $this->config->setSystemValue('updater.secret', $newToken);
+
+ return new DataResponse($newToken);
+ }
+}
diff --git a/apps/updatenotification/js/admin.js b/apps/updatenotification/js/admin.js
new file mode 100644
index 00000000000..df021fe2e97
--- /dev/null
+++ b/apps/updatenotification/js/admin.js
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2016 ownCloud Inc
+ *
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/**
+ * Creates a new authentication token and loads the updater URL
+ */
+var loginToken = '';
+$(document).ready(function(){
+ $('#oca_updatenotification').click(function() {
+ // Load the new token
+ $.ajax({
+ url: OC.generateUrl('/apps/updatenotification/credentials')
+ }).success(function(data) {
+ loginToken = data;
+ $.ajax({
+ url: OC.webroot+'/updater/',
+ headers: {
+ 'Authorization': loginToken
+ },
+ method: 'POST',
+ success: function(data){
+ if(data !== 'false') {
+ var body = $('body');
+ $('head').remove();
+ body.html(data);
+ body.removeAttr('id');
+ body.attr('id', 'body-settings');
+ }
+ }
+ });
+ });
+ });
+});
diff --git a/apps/updatenotification/lib/resettokenbackgroundjob.php b/apps/updatenotification/lib/resettokenbackgroundjob.php
new file mode 100644
index 00000000000..0b737f681b6
--- /dev/null
+++ b/apps/updatenotification/lib/resettokenbackgroundjob.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\UpdateNotification;
+
+use OC\AppFramework\Utility\TimeFactory;
+use OC\BackgroundJob\TimedJob;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IConfig;
+
+/**
+ * Class ResetTokenBackgroundJob deletes any configured token all 24 hours for
+ *
+ *
+ * @package OCA\UpdateNotification
+ */
+class ResetTokenBackgroundJob extends TimedJob {
+ /** @var IConfig */
+ private $config;
+ /** @var ITimeFactory */
+ private $timeFactory;
+
+ /**
+ * @param IConfig|null $config
+ * @param ITimeFactory|null $timeFactory
+ */
+ public function __construct(IConfig $config = null,
+ ITimeFactory $timeFactory = null) {
+ // Run all 10 minutes
+ $this->setInterval(60 * 10);
+
+ if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
+ $this->config = $config;
+ $this->timeFactory = $timeFactory;
+ } else {
+ $this->fixDIForJobs();
+ }
+ }
+
+ /**
+ * DI for jobs
+ */
+ private function fixDIForJobs() {
+ $this->config = \OC::$server->getConfig();
+ $this->timeFactory = new TimeFactory();
+ }
+
+ /**
+ * @param $argument
+ */
+ protected function run($argument) {
+ if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 86400) {
+ $this->config->deleteSystemValue('updater.secret');
+ }
+ }
+
+}
diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php
new file mode 100644
index 00000000000..647c88dea17
--- /dev/null
+++ b/apps/updatenotification/templates/admin.php
@@ -0,0 +1,8 @@
+<?php script('updatenotification', 'admin') ?>
+<form id="oca_updatenotification" class="section">
+ <h2><?php p($l->t('Updater')); ?></h2>
+ <p>
+ <?php p($l->t('For security reasons the built-in ownCloud updater is using additional credentials. To visit the updater page please click the following button.')) ?>
+ </p>
+ <input type="button" id="oca_updatenotification" value="<?php p($l->t('Open updater')) ?>">
+</form>
diff --git a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
new file mode 100644
index 00000000000..f3d64814ec9
--- /dev/null
+++ b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\UpdateNotification\Tests;
+
+use OCA\UpdateNotification\ResetTokenBackgroundJob;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IConfig;
+use Test\TestCase;
+
+class ResetTokenBackgroundJobTest extends TestCase {
+ /** @var IConfig */
+ private $config;
+ /** @var ResetTokenBackgroundJob */
+ private $resetTokenBackgroundJob;
+ /** @var ITimeFactory */
+ private $timeFactory;
+
+ public function setUp() {
+ parent::setUp();
+ $this->config = $this->getMock('\\OCP\\IConfig');
+ $this->timeFactory = $this->getMock('\\OCP\\AppFramework\\Utility\\ITimeFactory');
+ $this->resetTokenBackgroundJob = new ResetTokenBackgroundJob($this->config, $this->timeFactory);
+ }
+
+ public function testRunWithNotExpiredToken() {
+ $this->timeFactory
+ ->expects($this->any())
+ ->method('getTime')
+ ->willReturn(123);
+ $this->config
+ ->expects($this->once())
+ ->method('getAppValue')
+ ->with('core', 'updater.secret.created', 123);
+ $this->config
+ ->expects($this->never())
+ ->method('deleteSystemValue')
+ ->with('updater.secret');
+
+ $this->invokePrivate($this->resetTokenBackgroundJob, 'run', ['']);
+ }
+
+ public function testRunWithExpiredToken() {
+ $this->timeFactory
+ ->expects($this->at(0))
+ ->method('getTime')
+ ->willReturn(1455131633);
+ $this->timeFactory
+ ->expects($this->at(1))
+ ->method('getTime')
+ ->willReturn(1455045234);
+ $this->config
+ ->expects($this->once())
+ ->method('getAppValue')
+ ->with('core', 'updater.secret.created', 1455045234);
+ $this->config
+ ->expects($this->once())
+ ->method('deleteSystemValue')
+ ->with('updater.secret');
+
+ $this->invokePrivate($this->resetTokenBackgroundJob, 'run', ['']);
+ }
+}
diff --git a/apps/updatenotification/tests/controller/AdminControllerTest.php b/apps/updatenotification/tests/controller/AdminControllerTest.php
new file mode 100644
index 00000000000..01801626000
--- /dev/null
+++ b/apps/updatenotification/tests/controller/AdminControllerTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\UpdateNotification\Tests\Controller;
+
+use OCA\UpdateNotification\Controller\AdminController;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\IJobList;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\Security\ISecureRandom;
+use Test\TestCase;
+
+class AdminControllerTest extends TestCase {
+ /** @var IRequest */
+ private $request;
+ /** @var IJobList */
+ private $jobList;
+ /** @var ISecureRandom */
+ private $secureRandom;
+ /** @var IConfig */
+ private $config;
+ /** @var AdminController */
+ private $adminController;
+ /** @var ITimeFactory */
+ private $timeFactory;
+
+ public function setUp() {
+ parent::setUp();
+
+ $this->request = $this->getMock('\\OCP\\IRequest');
+ $this->jobList = $this->getMock('\\OCP\\BackgroundJob\\IJobList');
+ $this->secureRandom = $this->getMock('\\OCP\\Security\\ISecureRandom');
+ $this->config = $this->getMock('\\OCP\\IConfig');
+ $this->timeFactory = $this->getMock('\\OCP\\AppFramework\\Utility\\ITimeFactory');
+
+ $this->adminController = new AdminController(
+ 'updatenotification',
+ $this->request,
+ $this->jobList,
+ $this->secureRandom,
+ $this->config,
+ $this->timeFactory
+ );
+ }
+
+ public function testDisplayPanel() {
+ $expected = new TemplateResponse('updatenotification', 'admin', [], '');
+ $this->assertEquals($expected, $this->adminController->displayPanel());
+ }
+
+ public function testCreateCredentials() {
+ $this->jobList
+ ->expects($this->once())
+ ->method('add')
+ ->with('OCA\UpdateNotification\ResetTokenBackgroundJob');
+ $this->secureRandom
+ ->expects($this->once())
+ ->method('generate')
+ ->with(32)
+ ->willReturn('MyGeneratedToken');
+ $this->config
+ ->expects($this->once())
+ ->method('setSystemValue')
+ ->with('updater.secret', 'MyGeneratedToken');
+ $this->timeFactory
+ ->expects($this->once())
+ ->method('getTime')
+ ->willReturn(12345);
+ $this->config
+ ->expects($this->once())
+ ->method('setAppValue')
+ ->with('core', 'updater.secret.created', 12345);
+
+ $expected = new DataResponse('MyGeneratedToken');
+ $this->assertEquals($expected, $this->adminController->createCredentials());
+ }
+}