Merge pull request #2170 from nextcloud/ocs_person_to_controller

OCS person to controller

5 files changed, 248 insertions, 57 deletions

diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index 13cc4d8ce2c..27ab9deb08a 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -22,8 +22,10 @@
 namespace OC\Core\Controller;
 
 use OC\CapabilitiesManager;
+use OC\Security\Bruteforce\Throttler;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
+use OCP\IUserManager;
 use OCP\IUserSession;
 
 class OCSController extends \OCP\AppFramework\OCSController {
@@ -34,6 +36,12 @@ class OCSController extends \OCP\AppFramework\OCSController {
 	/** @var IUserSession */
 	private $userSession;
 
+	/** @var IUserManager */
+	private $userManager;
+
+	/** @var Throttler */
+	private $throttler;
+
 	/**
 	 * OCSController constructor.
 	 *
@@ -41,15 +49,21 @@ class OCSController extends \OCP\AppFramework\OCSController {
 	 * @param IRequest $request
 	 * @param CapabilitiesManager $capabilitiesManager
 	 * @param IUserSession $userSession
+	 * @param IUserManager $userManager
+	 * @param Throttler $throttler
 	 */
 	public function __construct($appName,
 								IRequest $request,
 								CapabilitiesManager $capabilitiesManager,
-								IUserSession $userSession) {
+								IUserSession $userSession,
+								IUserManager $userManager,
+								Throttler $throttler) {
 		parent::__construct($appName, $request);
 
 		$this->capabilitiesManager = $capabilitiesManager;
 		$this->userSession = $userSession;
+		$this->userManager = $userManager;
+		$this->throttler = $throttler;
 	}
 
 	/**
@@ -102,4 +116,27 @@ class OCSController extends \OCP\AppFramework\OCSController {
 		];
 		return new DataResponse($data);
 	}
+
+	/**
+	 * @PublicPage
+	 *
+	 * @param string $login
+	 * @param string $password
+	 * @return DataResponse
+	 */
+	public function personCheck($login = '', $password = '') {
+		if ($login !== '' && $password !== '') {
+			$this->throttler->sleepDelay($this->request->getRemoteAddress());
+			if ($this->userManager->checkPassword($login, $password)) {
+				return new DataResponse([
+					'person' => [
+						'personid' => $login
+					]
+				]);
+			}
+			$this->throttler->registerAttempt('login', $this->request->getRemoteAddress());
+			return new DataResponse(null, 102);
+		}
+		return new DataResponse(null, 101);
+	}
 }
diff --git a/core/routes.php b/core/routes.php
index c890d232cfe..2ddd77c1445 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -59,6 +59,7 @@ $application->registerRoutes($this, [
 		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
 		['root' => '/cloud', 'name' => 'OCS#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
 		['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
+		['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
 	],
 ]);
 
diff --git a/lib/private/OCS/Person.php b/lib/private/OCS/Person.php
deleted file mode 100644
index d14465c5ce9..00000000000
--- a/lib/private/OCS/Person.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Tom Needham <tom@owncloud.com>
- *
- * @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\OCS;
-
-class Person {
-
-	public static function check() {
-		$login = isset($_POST['login']) ? $_POST['login'] : false;
-		$password = isset($_POST['password']) ? $_POST['password'] : false;
-		if($login && $password) {
-			$remoteIp = \OC::$server->getRequest()->getRemoteAddress();
-			\OC::$server->getBruteForceThrottler()->sleepDelay($remoteIp);
-			if(\OC_User::checkPassword($login, $password)) {
-				$xml['person']['personid'] = $login;
-				return new Result($xml);
-			} else {
-				\OC::$server->getBruteForceThrottler()->registerAttempt('login', $remoteIp);
-				return new Result(null, 102);
-			}
-		} else {
-			return new Result(null, 101);
-		}
-	}
-
-}
diff --git a/ocs/routes.php b/ocs/routes.php
index 3085cd9db65..932c4053013 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -29,14 +29,6 @@
 
 use OCP\API;
 
-// Person
-API::register(
-	'post',
-	'/person/check',
-	array('OC_OCS_Person', 'check'),
-	'core',
-	API::GUEST_AUTH
-	);
 // Privatedata
 API::register(
 	'get',
diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php
new file mode 100644
index 00000000000..38356483c95
--- /dev/null
+++ b/tests/Core/Controller/OCSControllerTest.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @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\Core\Controller;
+
+use OC\CapabilitiesManager;
+use OC\Security\Bruteforce\Throttler;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\IRequest;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use Test\TestCase;
+
+class OCSControllerTest extends TestCase {
+
+	/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
+	private $request;
+
+	/** @var CapabilitiesManager|\PHPUnit_Framework_MockObject_MockObject */
+	private $capabilitiesManager;
+
+	/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+	private $userSession;
+
+	/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+	private $userManager;
+
+	/** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */
+	private $throttler;
+
+	/** @var OCSController */
+	private $controller;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->request = $this->createMock(IRequest::class);
+		$this->capabilitiesManager = $this->createMock(CapabilitiesManager::class);
+		$this->userSession = $this->createMock(IUserSession::class);
+		$this->userManager = $this->createMock(IUserManager::class);
+		$this->throttler = $this->createMock(Throttler::class);
+
+		$this->controller = new OCSController(
+			'core',
+			$this->request,
+			$this->capabilitiesManager,
+			$this->userSession,
+			$this->userManager,
+			$this->throttler
+		);
+	}
+
+	public function testGetConfig() {
+		$this->request->method('getServerHost')
+			->willReturn('awesomehost.io');
+
+		$data = [
+			'version' => '1.7',
+			'website' => 'Nextcloud',
+			'host' => 'awesomehost.io',
+			'contact' => '',
+			'ssl' => 'false',
+		];
+
+		$expected = new DataResponse($data);
+		$this->assertEquals($expected, $this->controller->getConfig());
+
+		return new DataResponse($data);
+	}
+
+	public function testGetCapabilities() {
+		list($major, $minor, $micro) = \OCP\Util::getVersion();
+
+		$result = [];
+		$result['version'] = array(
+			'major' => $major,
+			'minor' => $minor,
+			'micro' => $micro,
+			'string' => \OC_Util::getVersionString(),
+			'edition' => '',
+		);
+
+		$capabilities = [
+			'foo' => 'bar',
+			'a' => [
+				'b' => true,
+				'c' => 11,
+			]
+		];
+		$this->capabilitiesManager->method('getCapabilities')
+			->willReturn($capabilities);
+
+		$result['capabilities'] = $capabilities;
+
+		$expected = new DataResponse($result);
+		$this->assertEquals($expected, $this->controller->getCapabilities());
+	}
+
+	public function testGetCurrentUser() {
+		$user = $this->createMock(IUser::class);
+		$user->method('getUID')->willReturn('uid');
+		$user->method('getDisplayName')->willReturn('displayName');
+		$user->method('getEMailAddress')->willReturn('e@mail.com');
+
+
+		$this->userSession->method('getUser')
+			->willReturn($user);
+
+		$expected = new DataResponse([
+			'id' => 'uid',
+			'display-name' => 'displayName',
+			'email' => 'e@mail.com',
+		]);
+		$this->assertEquals($expected, $this->controller->getCurrentUser());
+	}
+
+	public function testPersonCheckValid() {
+		$this->request->method('getRemoteAddress')
+			->willReturn('1.2.3.4');
+
+		$this->throttler->expects($this->once())
+			->method('sleepDelay')
+			->with('1.2.3.4');
+
+		$this->throttler->expects($this->never())
+			->method('registerAttempt');
+
+		$this->userManager->method('checkPassword')
+			->with(
+				$this->equalTo('user'),
+				$this->equalTo('pass')
+			)->willReturn($this->createMock(IUser::class));
+
+		$expected = new DataResponse([
+			'person' => [
+				'personid' => 'user'
+			]
+		]);
+
+		$this->assertEquals($expected, $this->controller->personCheck('user', 'pass'));
+	}
+
+	public function testPersonInvalid() {
+		$this->request->method('getRemoteAddress')
+			->willReturn('1.2.3.4');
+
+		$this->throttler->expects($this->once())
+			->method('sleepDelay')
+			->with('1.2.3.4');
+
+		$this->throttler->expects($this->once())
+			->method('registerAttempt')
+			->with(
+				$this->equalTo('login'),
+				$this->equalTo('1.2.3.4')
+			);
+
+		$this->userManager->method('checkPassword')
+			->with(
+				$this->equalTo('user'),
+				$this->equalTo('wrongpass')
+			)->willReturn(false);
+
+		$expected = new DataResponse(null, 102);
+
+		$this->assertEquals($expected, $this->controller->personCheck('user', 'wrongpass'));
+	}
+
+	public function testPersonNoLogin() {
+		$this->request->method('getRemoteAddress')
+			->willReturn('1.2.3.4');
+
+		$this->throttler->expects($this->never())
+			->method('sleepDelay');
+
+		$this->throttler->expects($this->never())
+			->method('registerAttempt');
+
+		$this->userManager->method('checkPassword')
+			->with(
+				$this->equalTo('user'),
+				$this->equalTo('wrongpass')
+			)->willReturn(false);
+
+		$expected = new DataResponse(null, 101);
+
+		$this->assertEquals($expected, $this->controller->personCheck('', ''));
+	}
+}