wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #12910 from nextcloud/td/oauth/strict

Browse source 
Make OAuth2 app strict
This commit is contained in:
Morris Jobke 2018-12-07 15:35:24 +01:00 committed by GitHub
commit f7e4718779
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/oauth2/lib/Controller/LoginRedirectorController.php
View file

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
@ -50,7 +51,7 @@ class LoginRedirectorController extends Controller {
* @param ISession $session
* @param IL10N $l
*/
public function __construct($appName,
public function __construct(string $appName,
IRequest $request,
IURLGenerator $urlGenerator,
ClientMapper $clientMapper,
@ -75,7 +76,7 @@ class LoginRedirectorController extends Controller {
*/
public function authorize($client_id,
$state,
$response_type) {
$response_type): Response {
try {
$client = $this->clientMapper->getByIdentifier($client_id);
} catch (ClientNotFoundException $e) {

16
apps/oauth2/lib/Controller/OauthApiController.php
View file

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
@ -53,18 +54,7 @@ class OauthApiController extends Controller {
/** @var Throttler */
private $throttler;
/**
* @param string $appName
* @param IRequest $request
* @param ICrypto $crypto
* @param AccessTokenMapper $accessTokenMapper
* @param ClientMapper $clientMapper
* @param TokenProvider $tokenProvider
* @param ISecureRandom $secureRandom
* @param ITimeFactory $time
* @param Throttler $throttler
*/
public function __construct($appName,
public function __construct(string $appName,
IRequest $request,
ICrypto $crypto,
AccessTokenMapper $accessTokenMapper,
@ -94,7 +84,7 @@ class OauthApiController extends Controller {
* @param string $client_secret
* @return JSONResponse
*/
public function getToken($grant_type, $code, $refresh_token, $client_id, $client_secret) {
public function getToken($grant_type, $code, $refresh_token, $client_id, $client_secret): JSONResponse {
// We only handle two types
if ($grant_type !== 'authorization_code' && $grant_type !== 'refresh_token') {

1
apps/oauth2/lib/Exceptions/AccessTokenNotFoundException.php
View file

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*

1
apps/oauth2/lib/Exceptions/ClientNotFoundException.php
View file

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*

3
apps/oauth2/lib/Migration/SetTokenExpiration.php
View file

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
*
@ -50,7 +51,7 @@ class SetTokenExpiration implements IRepairStep {
$this->tokenProvider = $tokenProvider;
}
public function getName() {
public function getName(): string {
return 'Update OAuth token expiration times';
}