lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop dependency on alt-three throttle (#3469)

Browse Source 
I've just pulled in the subset of the features we were actually using.
This commit is contained in:
Graham Campbell
2019-02-15 10:26:39 +00:00
committed by GitHub
parent 8b02bfc04e
commit 37389ef55f
15 changed files with 154 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Kernel.php
View File

@@ -11,7 +11,6 @@
namespace CachetHQ\Cachet\Http; namespace CachetHQ\Cachet\Http;
use AltThree\Throttle\ThrottlingMiddleware;
use Barryvdh\Cors\HandleCors; use Barryvdh\Cors\HandleCors;
use CachetHQ\Cachet\Http\Middleware\Admin; use CachetHQ\Cachet\Http\Middleware\Admin;
use CachetHQ\Cachet\Http\Middleware\ApiAuthentication; use CachetHQ\Cachet\Http\Middleware\ApiAuthentication;
@@ -21,6 +20,7 @@ use CachetHQ\Cachet\Http\Middleware\ReadyForUse;
use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated; use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated;
use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted; use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted;
use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured; use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured;
use CachetHQ\Cachet\Http\Middleware\Throttler;
use CachetHQ\Cachet\Http\Middleware\TrustProxies; use CachetHQ\Cachet\Http\Middleware\TrustProxies;
use Illuminate\Auth\Middleware\Authorize; use Illuminate\Auth\Middleware\Authorize;
use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Kernel as HttpKernel;
@@ -54,6 +54,6 @@ class Kernel extends HttpKernel
'ready' => ReadyForUse::class, 'ready' => ReadyForUse::class,
'setup' => SetupAlreadyCompleted::class, 'setup' => SetupAlreadyCompleted::class,
'subscribers' => SubscribersConfigured::class, 'subscribers' => SubscribersConfigured::class,
'throttle' => ThrottlingMiddleware::class, 'throttle' => Throttler::class,
]; ];
} }

2
app/Http/Middleware/Acceptable.php
View File

@@ -18,7 +18,7 @@ use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
/** /**
* This is the acceptable middleware class. * This is the acceptable middleware class.
* *
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
*/ */
class Acceptable class Acceptable

2
app/Http/Middleware/Admin.php
View File

@@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
* This is the admin middleware class. * This is the admin middleware class.
* *
* @author Joseph Cohen <joe@alt-three.com> * @author Joseph Cohen <joe@alt-three.com>
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
*/ */
class Admin class Admin

2
app/Http/Middleware/ApiAuthentication.php
View File

@@ -22,7 +22,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
* This is the api authentication middleware class. * This is the api authentication middleware class.
* *
* @author Joseph Cohen <joe@alt-three.com> * @author Joseph Cohen <joe@alt-three.com>
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
*/ */
class ApiAuthentication class ApiAuthentication

2
app/Http/Middleware/Authenticate.php
View File

@@ -20,7 +20,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
* This is the authenticate middleware class. * This is the authenticate middleware class.
* *
* @author Joseph Cohen <joe@alt-three.com> * @author Joseph Cohen <joe@alt-three.com>
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
*/ */
class Authenticate class Authenticate

2
app/Http/Middleware/Localize.php
View File

@@ -22,7 +22,7 @@ use Jenssegers\Date\Date;
* *
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
* @author Joseph Cohen <joe@alt-three.com> * @author Joseph Cohen <joe@alt-three.com>
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
*/ */
class Localize class Localize
{ {

2
app/Http/Middleware/ReadyForUse.php
View File

@@ -18,7 +18,7 @@ use Illuminate\Http\Request;
/** /**
* This is the ready for use middleware class. * This is the ready for use middleware class.
* *
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
* @author Joseph Cohen <joe@alt-three.com> * @author Joseph Cohen <joe@alt-three.com>
*/ */

2
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -18,7 +18,7 @@ use Illuminate\Http\Request;
/** /**
* This is the redirect if authenticated middleware class. * This is the redirect if authenticated middleware class.
* *
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
* @author Joseph Cohen <joe@alt-three.com> * @author Joseph Cohen <joe@alt-three.com>
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
*/ */

2
app/Http/Middleware/SetupAlreadyCompleted.php
View File

@@ -19,7 +19,7 @@ use Illuminate\Http\Request;
/** /**
* This is the setup already completed middelware class. * This is the setup already completed middelware class.
* *
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
* @author Joseph Cohen <joe@alt-three.com> * @author Joseph Cohen <joe@alt-three.com>
*/ */

2
app/Http/Middleware/SubscribersConfigured.php
View File

@@ -19,7 +19,7 @@ use Illuminate\Http\Request;
* This is the subscribers configured middleware class. * This is the subscribers configured middleware class.
* *
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
*/ */
class SubscribersConfigured class SubscribersConfigured
{ {

125
app/Http/Middleware/Throttler.php Normal file
View File

@@ -0,0 +1,125 @@
<?php
/*
* This file is part of Cachet.
*
* (c) Alt Three Services Limited
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace CachetHQ\Cachet\Http\Middleware;
use Closure;
use Illuminate\Cache\RateLimiter;
use Illuminate\Http\Request;
use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
/**
* This is the throttler middleware class.
*
* @author Graham Campbell <graham@alt-three.com>
*/
class Throttler
{
/**
* The rate limiter instance.
*
* @var \Illuminate\Cache\RateLimiter
*/
protected $limiter;
/**
* Create a new throttler middleware instance.
*
* @param \Illuminate\Cache\RateLimiter $limiter
*
* @return void
*/
public function __construct(RateLimiter $limiter)
{
$this->limiter = $limiter;
}
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param int|string $limit
* @param int|string $decay
*
* @throws \Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException
*
* @return mixed
*/
public function handle(Request $request, Closure $next, $limit = 60, $decay = 1)
{
return $this->safeHandle($request, $next, (int) $limit, (int) $decay);
}
/**
* Handle an incoming request, with correct types.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param int $limit
* @param int $decay
*
* @throws \Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException
*
* @return mixed
*/
protected function safeHandle(Request $request, Closure $next, int $limit, int $decay)
{
$key = $request->fingerprint();
if ($this->limiter->tooManyAttempts($key, $limit, $decay)) {
throw $this->buildException($key, $limit);
}
$this->limiter->hit($key, $decay);
$response = $next($request);
$response->headers->add($this->getHeaders($key, $limit));
return $response;
}
/**
* Create a too many requests http exception.
*
* @param string $key
* @param int $limit
*
* @return \Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException
*/
protected function buildException(string $key, int $limit)
{
$after = $this->limiter->availableIn($key);
$exception = new TooManyRequestsHttpException($after, 'Rate limit exceeded.');
$exception->setHeaders($this->getHeaders($key, $limit, $after, $exception->getHeaders()));
return $exception;
}
/**
* Get the limit header information.
*
* @param string $key
* @param int $limit
* @param int|null $after
* @param array $merge
*
* @return array
*/
protected function getHeaders(string $key, int $limit, int $after = null, array $merge = [])
{
$remaining = $after === null ? $this->limiter->retriesLeft($key, $limit) : 0;
$headers = ['X-RateLimit-Limit' => $limit, 'X-RateLimit-Remaining' => $remaining];
return array_merge($headers, $merge);
}
}

2
app/Http/Middleware/Timezone.php
View File

@@ -19,7 +19,7 @@ use Illuminate\Http\Request;
* This is the timezone middleware class. * This is the timezone middleware class.
* *
* @author James Brooks <james@alt-three.com> * @author James Brooks <james@alt-three.com>
* @author Graham Campbell <james@alt-three.com> * @author Graham Campbell <graham@alt-three.com>
*/ */
class Timezone class Timezone
{ {

5
app/Http/Middleware/VerifyCsrfToken.php
View File

@@ -13,6 +13,11 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
/**
* This is the verify csrf token middleware class.
*
* @author James Brooks <james@alt-three.com>
*/
class VerifyCsrfToken extends Middleware class VerifyCsrfToken extends Middleware
{ {
/** /**

1
composer.json
View File

@@ -36,7 +36,6 @@
"alt-three/badger": "^5.1", "alt-three/badger": "^5.1",
"alt-three/bus": "^4.1", "alt-three/bus": "^4.1",
"alt-three/emoji": "^7.0", "alt-three/emoji": "^7.0",
"alt-three/throttle": "^3.1",
"alt-three/twitter": "^3.1", "alt-three/twitter": "^3.1",
"alt-three/validator": "^4.1", "alt-three/validator": "^4.1",
"aws/aws-sdk-php": "^3.7", "aws/aws-sdk-php": "^3.7",

79
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "3af019a3c33715f7f196fd405978e49d", "content-hash": "0aaa508129681e69c71b9c7f7380cf81",
"packages": [ "packages": [
{ {
"name": "alt-three/badger", "name": "alt-three/badger",
@@ -187,61 +187,6 @@
], ],
"time": "2018-12-28T16:34:12+00:00" "time": "2018-12-28T16:34:12+00:00"
}, },
{
"name": "alt-three/throttle",
"version": "v3.1.0",
"source": {
"type": "git",
"url": "https://github.com/AltThree/Throttle.git",
"reference": "6f85d5dac57ad1092983b64bb59650e9096c9385"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/AltThree/Throttle/zipball/6f85d5dac57ad1092983b64bb59650e9096c9385",
"reference": "6f85d5dac57ad1092983b64bb59650e9096c9385",
"shasum": ""
},
"require": {
"illuminate/cache": "5.5.*|5.6.*|5.7.*",
"illuminate/http": "5.5.*|5.6.*|5.7.*",
"php": "^7.1.3"
},
"require-dev": {
"graham-campbell/analyzer": "^2.1",
"graham-campbell/testbench": "^5.1",
"phpunit/phpunit": "^6.5|^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.1-dev"
}
},
"autoload": {
"psr-4": {
"AltThree\\Throttle\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Alt Three",
"email": "support@alt-three.com"
}
],
"description": "A request rate limiter for Laravel 5.2+",
"keywords": [
"Alt Three",
"http",
"rate limit",
"rate limiter",
"throttle"
],
"time": "2018-09-29T10:43:47+00:00"
},
{ {
"name": "alt-three/twitter", "name": "alt-three/twitter",
"version": "v3.1.0", "version": "v3.1.0",
@@ -410,16 +355,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.87.5", "version": "3.87.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "77bbcf213972b7e9ddf4fd101ef5f521adac9f7f" "reference": "28f117c221ee53dc2486ffcbf7288a9af6d21612"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/77bbcf213972b7e9ddf4fd101ef5f521adac9f7f", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/28f117c221ee53dc2486ffcbf7288a9af6d21612",
"reference": "77bbcf213972b7e9ddf4fd101ef5f521adac9f7f", "reference": "28f117c221ee53dc2486ffcbf7288a9af6d21612",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -488,7 +433,7 @@
"s3", "s3",
"sdk" "sdk"
], ],
"time": "2019-02-06T23:17:08+00:00" "time": "2019-02-11T23:07:51+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@@ -5520,16 +5465,16 @@
}, },
{ {
"name": "mockery/mockery", "name": "mockery/mockery",
"version": "1.2.0", "version": "1.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mockery/mockery.git", "url": "https://github.com/mockery/mockery.git",
"reference": "100633629bf76d57430b86b7098cd6beb996a35a" "reference": "dc4f10b6b1148744facb784015e4b339d7feec23"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a", "url": "https://api.github.com/repos/mockery/mockery/zipball/dc4f10b6b1148744facb784015e4b339d7feec23",
"reference": "100633629bf76d57430b86b7098cd6beb996a35a", "reference": "dc4f10b6b1148744facb784015e4b339d7feec23",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -5538,7 +5483,7 @@
"php": ">=5.6.0" "php": ">=5.6.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~5.7.10|~6.5|~7.0" "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@@ -5581,7 +5526,7 @@
"test double", "test double",
"testing" "testing"
], ],
"time": "2018-10-02T21:52:37+00:00" "time": "2019-02-08T14:43:54+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",