summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-09-30 09:58:02 +0200
committerJoas Schilling <coding@schilljs.com>2016-09-30 10:21:08 +0200
commita1e4b17ff44cc4476574b8d335ac3fdf2c2dc561 (patch)
tree04629eb4b3a036b7e2a55a58f1bafd571ec6b50c /core
parent877cb06bfed4524beb62e4cc52f946406ef7d5ea (diff)
downloadnextcloud-server-a1e4b17ff44cc4476574b8d335ac3fdf2c2dc561.tar.gz
nextcloud-server-a1e4b17ff44cc4476574b8d335ac3fdf2c2dc561.zip
Remove unused endpoint
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'core')
-rw-r--r--core/Application.php1
-rw-r--r--core/Controller/TokenController.php105
-rw-r--r--core/routes.php1
3 files changed, 0 insertions, 107 deletions
diff --git a/core/Application.php b/core/Application.php
index 4fa83f09854..97b1e1d37f1 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -49,6 +49,5 @@ class Application extends App {
$container->registerService('defaultMailAddress', function() {
return Util::getDefaultEmailAddress('lostpassword-noreply');
});
- $container->registerAlias(IProvider::class, DefaultTokenProvider::class);
}
}
diff --git a/core/Controller/TokenController.php b/core/Controller/TokenController.php
deleted file mode 100644
index 865bae9665c..00000000000
--- a/core/Controller/TokenController.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@owncloud.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- *
- * @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\Core\Controller;
-
-use OC\AppFramework\Http;
-use OC\Authentication\Token\IProvider;
-use OC\Authentication\Token\IToken;
-use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\JSONResponse;
-use OCP\IRequest;
-use OCP\IUserManager;
-use OCP\Security\ISecureRandom;
-
-class TokenController extends Controller {
- /** @var IUserManager */
- private $userManager;
- /** @var IProvider */
- private $tokenProvider;
- /** @var TwoFactorAuthManager */
- private $twoFactorAuthManager;
- /** @var ISecureRandom */
- private $secureRandom;
-
- /**
- * @param string $appName
- * @param IRequest $request
- * @param IUserManager $userManager
- * @param IProvider $tokenProvider
- * @param TwoFactorAuthManager $twoFactorAuthManager
- * @param ISecureRandom $secureRandom
- */
- public function __construct($appName,
- IRequest $request,
- IUserManager $userManager,
- IProvider $tokenProvider,
- TwoFactorAuthManager $twoFactorAuthManager,
- ISecureRandom $secureRandom) {
- parent::__construct($appName, $request);
- $this->userManager = $userManager;
- $this->tokenProvider = $tokenProvider;
- $this->secureRandom = $secureRandom;
- $this->twoFactorAuthManager = $twoFactorAuthManager;
- }
-
- /**
- * Generate a new access token clients can authenticate with
- *
- * @PublicPage
- * @NoCSRFRequired
- *
- * @param string $user
- * @param string $password
- * @param string $name the name of the client
- * @return JSONResponse
- */
- public function generateToken($user, $password, $name = 'unknown client') {
- if (is_null($user) || is_null($password)) {
- $response = new JSONResponse();
- $response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
- return $response;
- }
- $loginName = $user;
- $user = $this->userManager->checkPassword($loginName, $password);
- if ($user === false) {
- $response = new JSONResponse();
- $response->setStatus(Http::STATUS_UNAUTHORIZED);
- return $response;
- }
-
- if ($this->twoFactorAuthManager->isTwoFactorAuthenticated($user)) {
- $resp = new JSONResponse();
- $resp->setStatus(Http::STATUS_UNAUTHORIZED);
- return $resp;
- }
-
- $token = $this->secureRandom->generate(128);
- $this->tokenProvider->generateToken($token, $user->getUID(), $loginName, $password, $name, IToken::PERMANENT_TOKEN);
- return new JSONResponse([
- 'token' => $token,
- ]);
- }
-
-}
diff --git a/core/routes.php b/core/routes.php
index b04b0db4ce7..337f6fb27c3 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -48,7 +48,6 @@ $application->registerRoutes($this, [
['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
- ['name' => 'token#generateToken', 'url' => '/token/generate', 'verb' => 'POST'],
['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],