From 03dba1a00acbbb7cf3fafe5540d05d309271f01d Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Fri, 4 Oct 2019 01:14:47 -0400 Subject: [PATCH 1/7] Fixed has servers error message Fixed "Nest has active servers error" --- app/Services/Nests/NestDeletionService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/Nests/NestDeletionService.php b/app/Services/Nests/NestDeletionService.php index 6bdaf8de2..0f01a5e58 100644 --- a/app/Services/Nests/NestDeletionService.php +++ b/app/Services/Nests/NestDeletionService.php @@ -51,7 +51,7 @@ class NestDeletionService { $count = $this->serverRepository->findCountWhere([['nest_id', '=', $nest]]); if ($count > 0) { - throw new HasActiveServersException(trans('exceptions.service.delete_has_servers')); + throw new HasActiveServersException(trans('exceptions.nest.delete_has_servers')); } return $this->repository->delete($nest); From 771d30cc11b053d4388d99bea94e13fe795a852f Mon Sep 17 00:00:00 2001 From: Arnaud Lier Date: Tue, 15 Oct 2019 01:50:58 +0200 Subject: [PATCH 2/7] Fix Nest deletion service unit test (#1721) --- tests/Unit/Services/Nests/NestDeletionServiceTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/Services/Nests/NestDeletionServiceTest.php b/tests/Unit/Services/Nests/NestDeletionServiceTest.php index 28fcc7517..29fd9d559 100644 --- a/tests/Unit/Services/Nests/NestDeletionServiceTest.php +++ b/tests/Unit/Services/Nests/NestDeletionServiceTest.php @@ -73,7 +73,7 @@ class NestDeletionServiceTest extends TestCase $this->service->handle(1); } catch (PterodactylException $exception) { $this->assertInstanceOf(HasActiveServersException::class, $exception); - $this->assertEquals(trans('exceptions.service.delete_has_servers'), $exception->getMessage()); + $this->assertEquals(trans('exceptions.nest.delete_has_servers'), $exception->getMessage()); } } From 1922db60dbdb5c44827cc92ed63a291dcabd0e0f Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Mon, 21 Oct 2019 18:23:33 -0400 Subject: [PATCH 3/7] Update new.blade.php (#1732) --- resources/themes/pterodactyl/admin/nodes/new.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/themes/pterodactyl/admin/nodes/new.blade.php b/resources/themes/pterodactyl/admin/nodes/new.blade.php index 94ecb609f..eff033265 100644 --- a/resources/themes/pterodactyl/admin/nodes/new.blade.php +++ b/resources/themes/pterodactyl/admin/nodes/new.blade.php @@ -106,7 +106,7 @@
-
+

Enter the directory where server files should be stored. If you use OVH you should check your partition scheme. You may need to use /home/daemon-data to have enough space.

@@ -177,4 +177,4 @@ -@endsection \ No newline at end of file +@endsection From 88c5bb4f97b94e6f5689825b3f2428798d6f9a3d Mon Sep 17 00:00:00 2001 From: Arnaud Lier Date: Mon, 11 Nov 2019 18:01:38 +0100 Subject: [PATCH 4/7] Added a return in DatabaseController when a error occurs (#1742) * Added a return in DatabaseController when a error occurs * add return on database update too --- app/Http/Controllers/Admin/DatabaseController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/DatabaseController.php b/app/Http/Controllers/Admin/DatabaseController.php index 777b27792..4fecbbccf 100644 --- a/app/Http/Controllers/Admin/DatabaseController.php +++ b/app/Http/Controllers/Admin/DatabaseController.php @@ -131,7 +131,7 @@ class DatabaseController extends Controller sprintf('There was an error while trying to connect to the host or while executing a query: "%s"', $exception->getMessage()) )->flash(); - redirect()->route('admin.databases')->withInput($request->validated()); + return redirect()->route('admin.databases')->withInput($request->validated()); } else { throw $exception; } @@ -165,7 +165,7 @@ class DatabaseController extends Controller $this->alert->danger( sprintf('There was an error while trying to connect to the host or while executing a query: "%s"', $exception->getMessage()) )->flash(); - $redirect->withInput($request->normalize()); + return $redirect->withInput($request->normalize()); } else { throw $exception; } From 741ae27f18992968a4057419105220e33a301b36 Mon Sep 17 00:00:00 2001 From: Oreo Oreoniv <28255085+zKoz210@users.noreply.github.com> Date: Sat, 28 Dec 2019 22:10:39 +0300 Subject: [PATCH 5/7] Fixed TooManyLoginAttempts not work correctly (#1668) --- app/Http/Controllers/Auth/LoginController.php | 28 ++++++++++++------- config/auth.php | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index c18b004b4..d5141c8d2 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -20,8 +20,6 @@ class LoginController extends Controller { use AuthenticatesUsers; - const USER_INPUT_FIELD = 'user'; - /** * @var \Illuminate\Auth\AuthManager */ @@ -64,14 +62,14 @@ class LoginController extends Controller * * @var int */ - protected $lockoutTime; + protected $decayMinutes; /** * After how many attempts should logins be throttled and locked. * * @var int */ - protected $maxLoginAttempts; + protected $maxAttempts; /** * LoginController constructor. @@ -98,8 +96,8 @@ class LoginController extends Controller $this->google2FA = $google2FA; $this->repository = $repository; - $this->lockoutTime = $this->config->get('auth.lockout.time'); - $this->maxLoginAttempts = $this->config->get('auth.lockout.attempts'); + $this->decayMinutes = $this->config->get('auth.lockout.time'); + $this->maxAttempts = $this->config->get('auth.lockout.attempts'); } /** @@ -112,7 +110,7 @@ class LoginController extends Controller */ public function login(Request $request) { - $username = $request->input(self::USER_INPUT_FIELD); + $username = $request->input($this->username()); $useColumn = $this->getField($username); if ($this->hasTooManyLoginAttempts($request)) { @@ -209,20 +207,30 @@ class LoginController extends Controller { $this->incrementLoginAttempts($request); $this->fireFailedLoginEvent($user, [ - $this->getField($request->input(self::USER_INPUT_FIELD)) => $request->input(self::USER_INPUT_FIELD), + $this->getField($request->input($this->username())) => $request->input($this->username()), ]); - $errors = [self::USER_INPUT_FIELD => trans('auth.failed')]; + $errors = [$this->username() => trans('auth.failed')]; if ($request->expectsJson()) { return response()->json($errors, 422); } return redirect()->route('auth.login') - ->withInput($request->only(self::USER_INPUT_FIELD)) + ->withInput($request->only($this->username())) ->withErrors($errors); } + /** + * Get the login username to be used by the controller. + * + * @return string + */ + public function username() + { + return 'user'; + } + /** * Determine if the user is logging in using an email or username,. * diff --git a/config/auth.php b/config/auth.php index e83406286..02f4807e4 100644 --- a/config/auth.php +++ b/config/auth.php @@ -12,7 +12,7 @@ return [ | */ 'lockout' => [ - 'time' => 120, + 'time' => 2, 'attempts' => 3, ], From 86e6daf0aa8aab13b2ff0d3b7843a61baf991cad Mon Sep 17 00:00:00 2001 From: rtm516 Date: Sat, 28 Dec 2019 19:10:59 +0000 Subject: [PATCH 6/7] Update list.blade.php (#1674) --- resources/themes/pterodactyl/server/files/list.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/pterodactyl/server/files/list.blade.php b/resources/themes/pterodactyl/server/files/list.blade.php index f8abc5a7b..e6a252e5f 100644 --- a/resources/themes/pterodactyl/server/files/list.blade.php +++ b/resources/themes/pterodactyl/server/files/list.blade.php @@ -141,7 +141,7 @@ @if(in_array($file['mime'], $editableMime)) @can('edit-files', $server) - {{ $file['entry'] }} + {{ $file['entry'] }} @else {{ $file['entry'] }} @endcan From c377be2a7c0fc7ba0581946b2d0578cecb0080cd Mon Sep 17 00:00:00 2001 From: Stepan Fedotov Date: Sat, 28 Dec 2019 21:12:01 +0200 Subject: [PATCH 7/7] Include the egg name in egg model's response from the application API (#1684) --- CHANGELOG.md | 4 ++++ app/Transformers/Api/Application/EggTransformer.php | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22858333d..1d2edc870 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa This project follows [Semantic Versioning](http://semver.org) guidelines. +## v0.7.16 (Derelict Dermodactylus) +### Added +* The application API now includes the egg's name in the egg model's response. + ## v0.7.15 (Derelict Dermodactylus) ### Fixed * Fixes support for PHP 7.3 when running `composer install` commands due to a dependency that needed updating. diff --git a/app/Transformers/Api/Application/EggTransformer.php b/app/Transformers/Api/Application/EggTransformer.php index 98765bf4c..a3686341e 100644 --- a/app/Transformers/Api/Application/EggTransformer.php +++ b/app/Transformers/Api/Application/EggTransformer.php @@ -41,6 +41,7 @@ class EggTransformer extends BaseTransformer return [ 'id' => $model->id, 'uuid' => $model->uuid, + 'name' => $model->name, 'nest' => $model->nest_id, 'author' => $model->author, 'description' => $model->description,