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

Misc fixes

Browse source
This commit is contained in:
Dane Everitt 2017-11-26 13:26:38 -06:00
parent 80ddd5b659
commit a10db204ab
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -10,6 +10,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* `[beta.2]` — Fixes a bug that would throw a red page of death when submitting an invalid egg variable value for a server in the Admin CP. * `[beta.2]` — Fixes a bug that would throw a red page of death when submitting an invalid egg variable value for a server in the Admin CP.
* `[beta.2]` — Someone found a `@todo` that I never `@todid` and thus database hosts could not be created without being linked to a node. This is fixed... * `[beta.2]` — Someone found a `@todo` that I never `@todid` and thus database hosts could not be created without being linked to a node. This is fixed...
* `[beta.2]` — Fixes bug that caused incorrect rendering of CPU usage on server graphs due to missing variable. * `[beta.2]` — Fixes bug that caused incorrect rendering of CPU usage on server graphs due to missing variable.
### Changed ### Changed
* API keys have been changed to only use a single public key passed in a bearer token. All existing keys can continue being used, however only the first 32 characters should be sent. * API keys have been changed to only use a single public key passed in a bearer token. All existing keys can continue being used, however only the first 32 characters should be sent.

3
app/Http/Middleware/API/AuthenticateIPAccess.php
View file

@ -28,8 +28,9 @@ class AuthenticateIPAccess
return $next($request); return $next($request);
} }
$find = new IP($request->ip());
foreach ($model->allowed_ips as $ip) { foreach ($model->allowed_ips as $ip) {
if (Range::parse($ip)->contains(new IP($request->ip()))) { if (Range::parse($ip)->contains($find)) {
return $next($request); return $next($request);
} }
} }

2
resources/lang/en/base.php
View file

@ -33,7 +33,7 @@ return [
'header_sub' => 'Manage your API access keys.', 'header_sub' => 'Manage your API access keys.',
'list' => 'API Keys', 'list' => 'API Keys',
'create_new' => 'Create New API key', 'create_new' => 'Create New API key',
'keypair_created' => 'An API Key-Pair has been generated and is listed below.', 'keypair_created' => 'An API key has been successfully generated and is listed below.',
], ],
'new' => [ 'new' => [
'header' => 'New API Key', 'header' => 'New API Key',