Merge pull request pterodactyl#248 from Pterodactyl/feature/service-changes

Feature/service changes

Author: DaneEveritt

.editorconfig

@@ -1,11 +1,12 @@
 root = true
 
 [*]
+end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false

CHANGELOG.md

@@ -3,6 +3,21 @@ 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.6.0-pre.1
+### Added
+* Remote routes for daemon to contact in order to allow Daemon to retrieve updated service configuration files on boot. Centralizes services to the panel rather than to each daemon.
+* Basic service pack implementation to allow assignment of modpacks or software to a server to pre-install applications and allow users to update.
+* Users can now have a username as well as client name assigned to thier account.
+
+### Fixed
+* Bug causing error logs to be spammed if someone timed out on an ajax based page.
+
+### Changed
+* Admin API and base routes for user management now define the fields that should be passed to repositories rather than passing all fields.
+* User model now defines mass assignment fields using `$fillable` rather than `$guarded`.
+
+### Deprecated
+
 ## v0.5.6 (Bodacious Boreopterus)
 ### Added
 * Added the following languages: Estonian `et`, Dutch `nl`, Norwegian `nb` (partial), Romanian `ro`, and Russian `ru`. Interested in helping us translate the panel into more languages, or improving existing translations? Contact us on Discord and let us know.

app/Console/Commands/CleanServiceBackup.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Console\Commands;
+
+use Carbon;
+use Storage;
+use Illuminate\Console\Command;
+
+class CleanServiceBackup extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'pterodactyl:cleanservices';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Cleans .bak files assocaited with service backups whene editing files through the panel.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $files = Storage::files('services/.bak');
+
+        foreach ($files as $file) {
+            $lastModified = Carbon::createFromTimestamp(Storage::lastModified($file));
+            if ($lastModified->diffInMinutes(Carbon::now()) > 5) {
+                $this->info('Deleting ' . $file);
+                Storage::delete($file);
+            }
+        }
+    }
+}

app/Console/Kernel.php

@@ -21,6 +21,7 @@ class Kernel extends ConsoleKernel
         \Pterodactyl\Console\Commands\ClearTasks::class,
         \Pterodactyl\Console\Commands\ClearServices::class,
         \Pterodactyl\Console\Commands\UpdateEmailSettings::class,
+        \Pterodactyl\Console\Commands\CleanServiceBackup::class,
     ];
 
     /**
@@ -33,5 +34,6 @@ protected function schedule(Schedule $schedule)
     {
         $schedule->command('pterodactyl:tasks')->everyMinute()->withoutOverlapping();
         $schedule->command('pterodactyl:tasks:clearlog')->twiceDaily(3, 15);
+        $schedule->command('pterodactyl:cleanservices')->twiceDaily(1, 13);
     }
 }

app/Exceptions/Handler.php

@@ -46,13 +46,12 @@ public function report(Exception $exception)
      */
     public function render($request, Exception $exception)
     {
-        if ($request->isXmlHttpRequest() || $request->ajax() || $request->is('remote/*')) {
+        if ($request->expectsJson()) {
             $response = response()->json([
                 'error' => ($exception instanceof DisplayException) ? $exception->getMessage() : 'An unhandled error occured while attempting to process this request.',
-            ], 500);
+            ], ($this->isHttpException($exception)) ? $e->getStatusCode() : 500);
 
-            // parent::render() will log it, we are bypassing it in this case.
-            Log::error($exception);
+            parent::report($exception);
         }
 
         return (isset($response)) ? $response : parent::render($request, $exception);

app/Http/Controllers/API/UserController.php

@@ -122,6 +122,9 @@ public function create(Request $request)
     {
         try {
             $user = new UserRepository;
+            $create = $user->create($request->only([
+                'email', 'username', 'name_first', 'name_last', 'password', 'root_admin', 'custom_id',
+            ]));
             $create = $user->create($request->input('email'), $request->input('password'), $request->input('admin'), $request->input('custom_id'));
 
             return ['id' => $create];
@@ -156,7 +159,9 @@ public function update(Request $request, $id)
     {
         try {
             $user = new UserRepository;
-            $user->update($id, $request->all());
+            $user->update($id, $request->only([
+                'username', 'email', 'name_first', 'name_last', 'password', 'root_admin', 'language',
+            ]));
 
             return Models\User::findOrFail($id);
         } catch (DisplayValidationException $ex) {