Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for CIDR ranges on API

Browse source
This commit is contained in:
Dane Everitt 2016-01-16 20:17:46 -05:00
parent 317698a84a
commit c701aa0825
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Middleware/APISecretToken.php
View file

@ -3,6 +3,8 @@
namespace Pterodactyl\Http\Middleware; namespace Pterodactyl\Http\Middleware;
use Crypt; use Crypt;
use IPTools\IP;
use IPTools\Range;
use Pterodactyl\Models\APIKey; use Pterodactyl\Models\APIKey;
use Pterodactyl\Models\APIPermission; use Pterodactyl\Models\APIPermission;
@ -49,8 +51,15 @@ class APISecretToken extends Authorization
// Check for Resource Permissions // Check for Resource Permissions
if (!empty($request->route()->getName())) { if (!empty($request->route()->getName())) {
if(!is_null($key->allowed_ips)) { if(!is_null($key->allowed_ips)) {
if (!in_array($request->ip(), json_decode($key->allowed_ips))) { $inRange = false;
throw new AccessDeniedHttpException('This IP address does not have permission to use this API key.'); foreach(json_decode($key->allowed_ips) as $ip) {
if (Range::parse($ip)->contains(new IP($request->ip()))) {
$inRange = true;
break;
}
}
if (!$inRange) {
throw new AccessDeniedHttpException('This IP address <' . $request->ip() . '> does not have permission to use this API key.');
} }
} }