From a10db204abe816c9017625e1f9c187db07f13391 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 26 Nov 2017 13:26:38 -0600 Subject: [PATCH] Misc fixes --- CHANGELOG.md | 1 + app/Http/Middleware/API/AuthenticateIPAccess.php | 3 ++- resources/lang/en/base.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fd5a82e8..825277fb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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]` — 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. + ### 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. diff --git a/app/Http/Middleware/API/AuthenticateIPAccess.php b/app/Http/Middleware/API/AuthenticateIPAccess.php index b3d1d5c37..aa0af7e2e 100644 --- a/app/Http/Middleware/API/AuthenticateIPAccess.php +++ b/app/Http/Middleware/API/AuthenticateIPAccess.php @@ -28,8 +28,9 @@ class AuthenticateIPAccess return $next($request); } + $find = new IP($request->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); } } diff --git a/resources/lang/en/base.php b/resources/lang/en/base.php index 234452da7..579ac3410 100644 --- a/resources/lang/en/base.php +++ b/resources/lang/en/base.php @@ -33,7 +33,7 @@ return [ 'header_sub' => 'Manage your API access keys.', 'list' => 'API Keys', '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' => [ 'header' => 'New API Key',